fix(query): enable editing multi-table JOIN result sets
This commit is contained in:
16 files changed
+345
-22
No files matched your search
+9
-4
@@ -128,10 +128,15 @@ describe("queryStore multi-source result column comments", () => {
|
||||
const tab = store.tabs.find((item) => item.id === tabId)!;
|
||||
await vi.waitFor(() => expect(tab.resultColumnComments).toBeDefined());
|
||||
|
||||
// Multi-source results stay non-editable: no single tableMeta.
|
||||
expect(tab.tableMeta).toBeUndefined();
|
||||
expect(tab.queryEditabilityReason).toBe("complex-source");
|
||||
expect(tab.querySourceColumns).toBeUndefined();
|
||||
// Both sources return their primary key, so each has its own write target.
|
||||
expect(tab.queryEditabilityReason).toBeUndefined();
|
||||
expect(tab.queryAnalysis).toMatchObject({ multiSource: true, allowInsert: false, allowDelete: false });
|
||||
expect(tab.queryWriteTargets?.map((target) => target.tableMeta.tableName)).toEqual(["orders", "users"]);
|
||||
expect(tab.queryWriteTargets?.map((target) => target.tableMeta.primaryKeys)).toEqual([["id"], ["id"]]);
|
||||
expect(tab.queryWriteTargets?.map((target) => target.sourceColumns)).toEqual([
|
||||
["id", "user_id", undefined, undefined],
|
||||
[undefined, undefined, "id", "name"],
|
||||
]);
|
||||
|
||||
// Comments are indexed by result ordinal, so the second `id` (users.id)
|
||||
// keeps its own comment instead of first-source-wins on the name.
|
||||
|
||||
@@ -1462,6 +1462,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
tab.resultEstimatedBytes = undefined;
|
||||
tab.queryAnalysis = undefined;
|
||||
tab.querySourceColumns = undefined;
|
||||
tab.queryWriteTargets = undefined;
|
||||
tab.resultColumnComments = undefined;
|
||||
tab.queryDisplaySourceColumns = undefined;
|
||||
tab.queryEditabilityReason = undefined;
|
||||
@@ -1534,6 +1535,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
run.resultEstimatedBytes = undefined;
|
||||
run.queryAnalysis = undefined;
|
||||
run.querySourceColumns = undefined;
|
||||
run.queryWriteTargets = undefined;
|
||||
run.resultColumnComments = undefined;
|
||||
run.queryDisplaySourceColumns = undefined;
|
||||
run.queryEditabilityReason = undefined;
|
||||
@@ -1578,6 +1580,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
tab.resultEvicted = run.resultEvicted;
|
||||
tab.queryAnalysis = run.queryAnalysis;
|
||||
tab.querySourceColumns = run.querySourceColumns;
|
||||
tab.queryWriteTargets = run.queryWriteTargets;
|
||||
tab.resultColumnComments = run.resultColumnComments;
|
||||
tab.queryDisplaySourceColumns = run.queryDisplaySourceColumns;
|
||||
tab.queryEditabilityReason = run.queryEditabilityReason;
|
||||
@@ -1818,6 +1821,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
activeResultRunId: run.id,
|
||||
queryAnalysis: run.queryAnalysis,
|
||||
querySourceColumns: run.querySourceColumns,
|
||||
queryWriteTargets: run.queryWriteTargets,
|
||||
resultColumnComments: run.resultColumnComments,
|
||||
queryDisplaySourceColumns: run.queryDisplaySourceColumns,
|
||||
queryEditabilityReason: run.queryEditabilityReason,
|
||||
@@ -1899,6 +1903,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
resultEvicted: tab.resultEvicted,
|
||||
queryAnalysis: tab.queryAnalysis,
|
||||
querySourceColumns: tab.querySourceColumns,
|
||||
queryWriteTargets: tab.queryWriteTargets,
|
||||
resultColumnComments: tab.resultColumnComments,
|
||||
queryDisplaySourceColumns: tab.queryDisplaySourceColumns,
|
||||
queryEditabilityReason: tab.queryEditabilityReason,
|
||||
@@ -1999,6 +2004,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
resultEvicted: tab.resultEvicted,
|
||||
queryAnalysis: tab.queryAnalysis,
|
||||
querySourceColumns: tab.querySourceColumns,
|
||||
queryWriteTargets: tab.queryWriteTargets,
|
||||
resultColumnComments: tab.resultColumnComments,
|
||||
queryDisplaySourceColumns: tab.queryDisplaySourceColumns,
|
||||
queryEditabilityReason: tab.queryEditabilityReason,
|
||||
@@ -3699,6 +3705,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
tableMeta: original.tableMeta ? { ...original.tableMeta, columns: [...original.tableMeta.columns], primaryKeys: [...original.tableMeta.primaryKeys] } : undefined,
|
||||
queryAnalysis: original.queryAnalysis ? { ...original.queryAnalysis, sources: original.queryAnalysis.sources?.map((source) => ({ ...source })), columns: original.queryAnalysis.columns.map((c) => ({ ...c })) } : undefined,
|
||||
querySourceColumns: original.querySourceColumns ? [...original.querySourceColumns] : undefined,
|
||||
queryWriteTargets: original.queryWriteTargets?.map((target) => ({ ...target, sourceColumns: [...target.sourceColumns] })),
|
||||
resultColumnComments: original.resultColumnComments ? [...original.resultColumnComments] : undefined,
|
||||
queryDisplaySourceColumns: original.queryDisplaySourceColumns ? [...original.queryDisplaySourceColumns] : undefined,
|
||||
queryEditabilityReason: original.queryEditabilityReason,
|
||||
@@ -4569,7 +4576,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
return producedResult;
|
||||
}
|
||||
|
||||
type QueryMetadataPatch = Pick<QueryTab, "queryAnalysis" | "querySourceColumns" | "queryEditabilityReason" | "tableMeta" | "resultColumnComments" | "queryDisplaySourceColumns">;
|
||||
type QueryMetadataPatch = Pick<QueryTab, "queryAnalysis" | "querySourceColumns" | "queryWriteTargets" | "queryEditabilityReason" | "tableMeta" | "resultColumnComments" | "queryDisplaySourceColumns">;
|
||||
|
||||
type LoadedEditableSource = {
|
||||
source: EditableQuerySource;
|
||||
@@ -4658,6 +4665,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
function applyQueryMetadataPatch(tab: QueryTab, patch: QueryMetadataPatch) {
|
||||
tab.queryAnalysis = patch.queryAnalysis;
|
||||
tab.querySourceColumns = patch.querySourceColumns;
|
||||
tab.queryWriteTargets = patch.queryWriteTargets;
|
||||
tab.queryEditabilityReason = patch.queryEditabilityReason;
|
||||
tab.mongoEditTarget = undefined;
|
||||
tab.tableMeta = patch.tableMeta;
|
||||
@@ -5173,11 +5181,16 @@ export const useQueryStore = defineStore("query", () => {
|
||||
}
|
||||
|
||||
if (candidates.length > 1) {
|
||||
const target = candidates[0]!;
|
||||
return {
|
||||
queryAnalysis: undefined,
|
||||
querySourceColumns: undefined,
|
||||
queryEditabilityReason: "complex-source",
|
||||
tableMeta: undefined,
|
||||
queryAnalysis: { ...target.analysis, multiSource: true, allowInsert: false, allowDelete: false, allowInsertDelete: false },
|
||||
querySourceColumns: tab.result.columns.map((_, index) => {
|
||||
const owners = candidates.filter((candidate) => candidate.sourceColumns?.[index] !== undefined);
|
||||
return owners.length === 1 ? owners[0]!.sourceColumns![index] : undefined;
|
||||
}),
|
||||
queryWriteTargets: candidates.map((candidate) => ({ tableMeta: candidate.tableMeta, sourceColumns: candidate.sourceColumns! })),
|
||||
queryEditabilityReason: undefined,
|
||||
tableMeta: target.tableMeta,
|
||||
resultColumnComments: multiSourceInfo?.comments,
|
||||
queryDisplaySourceColumns: multiSourceInfo?.mapping,
|
||||
};
|
||||
@@ -5614,6 +5627,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
touchResult(current);
|
||||
current.queryAnalysis = undefined;
|
||||
current.querySourceColumns = undefined;
|
||||
current.queryWriteTargets = undefined;
|
||||
current.resultColumnComments = undefined;
|
||||
current.queryDisplaySourceColumns = undefined;
|
||||
current.queryEditabilityReason = undefined;
|
||||
@@ -5998,6 +6012,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
touchResult(current);
|
||||
current.queryAnalysis = undefined;
|
||||
current.querySourceColumns = undefined;
|
||||
current.queryWriteTargets = undefined;
|
||||
current.resultColumnComments = undefined;
|
||||
current.queryDisplaySourceColumns = undefined;
|
||||
current.queryEditabilityReason = undefined;
|
||||
@@ -6065,6 +6080,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
touchResult(current);
|
||||
current.queryAnalysis = undefined;
|
||||
current.querySourceColumns = undefined;
|
||||
current.queryWriteTargets = undefined;
|
||||
current.resultColumnComments = undefined;
|
||||
current.queryDisplaySourceColumns = undefined;
|
||||
current.queryEditabilityReason = undefined;
|
||||
@@ -6559,6 +6575,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
}
|
||||
current.queryAnalysis = undefined;
|
||||
current.querySourceColumns = undefined;
|
||||
current.queryWriteTargets = undefined;
|
||||
current.resultColumnComments = undefined;
|
||||
current.queryDisplaySourceColumns = undefined;
|
||||
current.queryEditabilityReason = undefined;
|
||||
@@ -7076,6 +7093,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
touchResult(tab, Date.now(), { reuseEstimatedBytes: true });
|
||||
tab.queryAnalysis = undefined;
|
||||
tab.querySourceColumns = undefined;
|
||||
tab.queryWriteTargets = undefined;
|
||||
tab.resultColumnComments = undefined;
|
||||
tab.queryDisplaySourceColumns = undefined;
|
||||
tab.queryEditabilityReason = undefined;
|
||||
@@ -7202,6 +7220,7 @@ export const useQueryStore = defineStore("query", () => {
|
||||
|
||||
tab.queryAnalysis = snapshot.queryAnalysis;
|
||||
tab.querySourceColumns = snapshot.querySourceColumns;
|
||||
tab.queryWriteTargets = snapshot.queryWriteTargets;
|
||||
tab.resultColumnComments = snapshot.resultColumnComments;
|
||||
tab.queryDisplaySourceColumns = snapshot.queryDisplaySourceColumns;
|
||||
tab.queryEditabilityReason = snapshot.queryEditabilityReason;
|
||||
|
||||
Reference in new issue
Block a user