fix: table autocomplete should pass catalog (apache#28413)

xyb · May 9, 2024 · e516bba · e516bba
1 parent 307ebea
commit e516bba
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/superset-frontend/src/SqlLab/components/AceEditorWrapper/useKeywords.test.ts b/superset-frontend/src/SqlLab/components/AceEditorWrapper/useKeywords.test.ts
@@ -61,6 +61,7 @@ const fakeFunctionNamesApiResult = {
 };
 
 const expectDbId = 1;
+const expectCatalog = null;
 const expectSchema = 'schema1';
 
 beforeEach(() => {
@@ -228,7 +229,12 @@ test('returns column keywords among selected tables', async () => {
       ),
     );
     storeWithSqlLab.dispatch(
-      addTable({ id: expectQueryEditorId }, expectTable, expectSchema),
+      addTable(
+        { id: expectQueryEditorId },
+        expectTable,
+        expectCatalog,
+        expectSchema,
+      ),
     );
   });
 
@@ -267,7 +273,12 @@ test('returns column keywords among selected tables', async () => {
 
   act(() => {
     storeWithSqlLab.dispatch(
-      addTable({ id: expectQueryEditorId }, unexpectedTable, expectSchema),
+      addTable(
+        { id: expectQueryEditorId },
+        unexpectedTable,
+        expectCatalog,
+        expectSchema,
+      ),
     );
   });
 

diff --git a/superset-frontend/src/SqlLab/components/AceEditorWrapper/useKeywords.ts b/superset-frontend/src/SqlLab/components/AceEditorWrapper/useKeywords.ts
@@ -146,7 +146,9 @@ export function useKeywords(
 
   const insertMatch = useEffectEvent((editor: Editor, data: any) => {
     if (data.meta === 'table') {
-      dispatch(addTable({ id: queryEditorId, dbId }, data.value, schema));
+      dispatch(
+        addTable({ id: queryEditorId, dbId }, data.value, catalog, schema),
+      );
     }
 
     let { caption } = data;