Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(sql-editor): empty tree key for external-table columns crashes the editor (#20577)
Danny Xucb266f6054d5
diff --git a/frontend/src/react/components/sql-editor/SchemaPane/schemaTree.test.ts b/frontend/src/react/components/sql-editor/SchemaPane/schemaTree.test.tsindex 272ef7e960..66b0e591d5 100644--- a/frontend/src/react/components/sql-editor/SchemaPane/schemaTree.test.ts+++ b/frontend/src/react/components/sql-editor/SchemaPane/schemaTree.test.ts@@ -208,6 +208,28 @@ describe("keyForNodeTarget", () => {).toBe(`${DATABASE}/schemas/public/tables/users/columns/id`);});+ test("column under an external table joins under the external table", () => {+ expect(+ keyForNodeTarget("column", {+ database: DATABASE,+ schema: "public",+ externalTable: "remote_users",+ column: "id",+ })+ ).toBe(`${DATABASE}/schemas/public/externalTables/remote_users/columns/id`);+ });++ test("column under a view joins under the view", () => {+ expect(+ keyForNodeTarget("column", {+ database: DATABASE,+ schema: "public",+ view: "active_users",+ column: "id",+ })+ ).toBe(`${DATABASE}/schemas/public/views/active_users/columns/id`);+ });+test("expandable-text + error keys join type/id", () => {expect(keyForNodeTarget("expandable-text", {@@ -585,6 +607,36 @@ describe("buildDatabaseSchemaTree", () => {expect(tablesFolder!.children![0].meta.type).toBe("error");});+ test("every node key is non-empty and unique (react-arborist throws on falsy ids)", () => {+ const md = makeMetadata([+ makeSchema("public", {+ tables: [+ makeTable("users", {+ columns: ["id"],+ indexes: ["ix"],+ foreignKeys: ["fk"],+ checks: ["ck"],+ triggers: ["trg"],+ partitions: [makePartition("p1", ["sp1"])],+ }),+ ],+ externalTables: [makeExternalTable("ext", ["c1", "c2"])],+ views: [makeView("v", ["vc"])],+ procedures: ["proc"],+ functions: ["fn"],+ sequences: ["seq"],+ packages: ["pkg"],+ }),+ ]);+ const tree = buildDatabaseSchemaTree(makeDatabase(), md);+ const seen = new Set<string>();+ for (const { key, type } of walk(tree)) {+ expect(key, `falsy key on node type=${type}`).toBeTruthy();+ expect(seen.has(key), `duplicate key: ${key}`).toBe(false);+ seen.add(key);+ }+ });+test("external tables / views / procedures / functions / packages / sequences only appear when populated", () => {const md = makeMetadata([makeSchema("public", {diff --git a/frontend/src/react/components/sql-editor/SchemaPane/schemaTree.ts b/frontend/src/react/components/sql-editor/SchemaPane/schemaTree.tsindex 95501d4116..dd4af4f1cf 100644--- a/frontend/src/react/components/sql-editor/SchemaPane/schemaTree.ts+++ b/frontend/src/react/components/sql-editor/SchemaPane/schemaTree.ts@@ -307,28 +307,21 @@ export const keyForNodeTarget = <T extends NodeType>(].join("/");}case "column": {- const { column } = target as NodeTarget<"column">;- const key = `columns/${column}`;- if ("table" in target) {- return [- keyForNodeTarget("table", target as NodeTarget<"table">),- key,- ].join("/");- } else if ("external-table" in target) {- return [- keyForNodeTarget(- "external-table",- target as NodeTarget<"external-table">- ),- key,- ].join("/");- } else if ("view" in target) {- return [- keyForNodeTarget("view", target as NodeTarget<"view">),- key,- ].join("/");+ // No casts inside the branches: `in` narrows the union, so the+ // compiler verifies each property name against RichColumnMetadata's+ // members. A typo here fails the build instead of producing an+ // empty key (which would crash react-arborist at render).+ const columnTarget = target as NodeTarget<"column">;+ const key = `columns/${columnTarget.column}`;+ if ("externalTable" in columnTarget) {+ return [keyForNodeTarget("external-table", columnTarget), key].join(+ "/"+ );}- return "";+ if ("view" in columnTarget) {+ return [keyForNodeTarget("view", columnTarget), key].join("/");+ }+ return [keyForNodeTarget("table", columnTarget), key].join("/");}default: {const { id } = target as NodeTarget<"expandable-text" | "error">;