From 1948c8ef89b569791012208af084f3cfa4095ce5 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 7 Oct 2024 08:22:35 +0200
Subject: [PATCH] fix export dialog for useSeparateSchemas=true

---
 packages/web/src/impexp/FormTablesSelect.svelte | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/web/src/impexp/FormTablesSelect.svelte b/packages/web/src/impexp/FormTablesSelect.svelte
index 9f9270778..e2c8f88fd 100644
--- a/packages/web/src/impexp/FormTablesSelect.svelte
+++ b/packages/web/src/impexp/FormTablesSelect.svelte
@@ -5,8 +5,7 @@
 
   import { getFormContext } from '../forms/FormProviderCore.svelte';
   import FormSelectField from '../forms/FormSelectField.svelte';
-import { getObjectTypeFieldLabel } from '../utility/common';
-  import { useDatabaseInfo, useDatabaseList } from '../utility/metadataLoaders';
+  import { useConnectionInfo, useDatabaseInfo } from '../utility/metadataLoaders';
 
   export let conidName;
   export let databaseName;
@@ -14,7 +13,12 @@ import { getObjectTypeFieldLabel } from '../utility/common';
   export let name;
 
   const { values, setFieldValue } = getFormContext();
-  $: dbinfo = useDatabaseInfo({ conid: $values[conidName], database: $values[databaseName] });
+
+  $: coninfo = useConnectionInfo({ conid: $values[conidName] });
+  $: dbinfo = useDatabaseInfo({
+    conid: $values[conidName],
+    database: $coninfo?.useSeparateSchemas ? `${$values[databaseName]}::${$values[schemaName]}` : $values[databaseName],
+  });
 
   $: tablesOptions = _.compact([
     ...($dbinfo?.tables || []),
@@ -27,7 +31,6 @@ import { getObjectTypeFieldLabel } from '../utility/common';
       value: x.pureName,
       label: x.pureName,
     }));
-
 </script>
 
 <div class="wrapper">
@@ -56,5 +59,4 @@ import { getObjectTypeFieldLabel } from '../utility/common';
   .wrapper {
     margin: var(--dim-large-form-margin);
   }
-
 </style>