fix(sql): preserve file associations and list selection

apps/desktop/src/stores/queryStore.ts

@@ -1692,7 +1692,7 @@ export const useQueryStore = defineStore("query", () => {
     });
   }
 
-  function openExternalSqlFile(connectionId: string, database: string, path: string, sql: string, version?: QueryTab["externalSqlFileVersion"]) {
+  function openExternalSqlFile(connectionId: string, database: string, path: string, sql: string, version?: QueryTab["externalSqlFileVersion"], catalog?: string) {
     const normalizedPath = normalizeExternalSqlPath(path);
     const existing = tabs.value.find((tab) => tab.mode === "query" && tab.externalSqlPath && normalizeExternalSqlPath(tab.externalSqlPath) === normalizedPath);
     if (existing) {
@@ -1709,6 +1709,7 @@ export const useQueryStore = defineStore("query", () => {
       customTitle: true,
       connectionId,
       database,
+      catalog,
       sql,
       originalSql: sql,
       externalSqlPath: path,
@@ -3081,6 +3082,7 @@ export const useQueryStore = defineStore("query", () => {
       .updateFileExecutionTarget(tab.savedSqlId, {
         connectionId: tab.connectionId,
         database: tab.database,
+        catalog: tab.catalog,
         schema: tab.schema,
       })
       .catch((error) => console.warn("[DBX][saved-sql:target:error]", error));

apps/desktop/src/stores/savedSqlStore.ts

@@ -21,6 +21,7 @@ interface SaveFileInput {
   folderId?: string;
   name: string;
   database: string;
+  catalog?: string;
   schema?: string;
   sql: string;
 }
@@ -28,6 +29,7 @@ interface SaveFileInput {
 interface SavedSqlExecutionTargetInput {
   connectionId: string;
   database: string;
+  catalog?: string;
   schema?: string;
 }
 
@@ -239,6 +241,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
           folderId: hasFolderIdInput ? input.folderId || undefined : existing.folderId,
           name: input.name,
           database: input.database,
+          catalog: input.catalog,
           schema: input.schema,
           sql: input.sql,
           sqlLoaded: true,
@@ -251,6 +254,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
           folderId: input.folderId || undefined,
           name: input.name,
           database: input.database,
+          catalog: input.catalog,
           schema: input.schema,
           sql: input.sql,
           sqlLoaded: true,
@@ -268,7 +272,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
   function updateFileExecutionTarget(id: string, target: SavedSqlExecutionTargetInput): Promise<SavedSqlFile | undefined> {
     const existing = getFile(id);
     if (!existing) return Promise.resolve(undefined);
-    if (existing.connectionId === target.connectionId && existing.database === target.database && existing.schema === target.schema) {
+    if (existing.connectionId === target.connectionId && existing.database === target.database && existing.catalog === target.catalog && existing.schema === target.schema) {
       return Promise.resolve(existing);
     }
 
@@ -276,6 +280,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
       persistedFileTargets.set(id, {
         connectionId: existing.connectionId,
         database: existing.database,
+        catalog: existing.catalog,
         schema: existing.schema,
         updatedAt: existing.updatedAt,
       });
@@ -308,6 +313,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
           persistedFileTargets.set(id, {
             connectionId: saved.connectionId,
             database: saved.database,
+            catalog: saved.catalog,
             schema: saved.schema,
             updatedAt: saved.updatedAt,
           });