load field values logic moved to backend

packages/api/src/controllers/databaseConnections.js

@@ -151,34 +151,33 @@ module.exports = {
     return res.result;
   },
 
-  loadKeys_meta: true,
+  async loadDataCore(msgtype, {conid, database, ...args}) {
-  async loadKeys({ conid, database, root }) {
     const opened = await this.ensureOpened(conid, database);
-    const res = await this.sendRequest(opened, { msgtype: 'loadKeys', root });
+    const res = await this.sendRequest(opened, { msgtype, ...args });
     if (res.errorMessage) {
       console.error(res.errorMessage);
     }
     return res.result || null;
   },
 
+  loadKeys_meta: true,
+  async loadKeys({ conid, database, root }) {
+    return this.loadDataCore('loadKeys', { conid, database, root });
+  },
+
   loadKeyInfo_meta: true,
   async loadKeyInfo({ conid, database, key }) {
-    const opened = await this.ensureOpened(conid, database);
+    return this.loadDataCore('loadKeyInfo', { conid, database, key });
-    const res = await this.sendRequest(opened, { msgtype: 'loadKeyInfo', key });
-    if (res.errorMessage) {
-      console.error(res.errorMessage);
-    }
-    return res.result || null;
   },
 
   loadKeyTableRange_meta: true,
   async loadKeyTableRange({ conid, database, key, cursor, count }) {
-    const opened = await this.ensureOpened(conid, database);
+    return this.loadDataCore('loadKeyTableRange', { conid, database, key, cursor, count });
-    const res = await this.sendRequest(opened, { msgtype: 'loadKeyTableRange', key, cursor, count });
+  },
-    if (res.errorMessage) {
+
-      console.error(res.errorMessage);
+  loadFieldValues_meta: true,
-    }
+  async loadFieldValues({ conid, database, schemaName, pureName, field, search }) {
-    return res.result || null;
+    return this.loadDataCore('loadFieldValues', { conid, database, schemaName, pureName, field, search });
   },
 
   callMethod_meta: true,

packages/api/src/proc/databaseConnectionProcess.js

@@ -172,59 +172,41 @@ async function handleQueryData({ msgid, sql }) {
   }
 }
 
-async function handleCollectionData({ msgid, options }) {
+async function handleDriverDataCore(msgid, callMethod) {
   await waitConnected();
   const driver = requireEngineDriver(storedConnection);
   try {
-    const result = await driver.readCollection(systemConnection, options);
+    const result = await callMethod(driver);
     process.send({ msgtype: 'response', msgid, result });
   } catch (err) {
     process.send({ msgtype: 'response', msgid, errorMessage: err.message });
   }
 }
 
+async function handleCollectionData({ msgid, options }) {
+  return handleDriverDataCore(msgid, driver => driver.readCollection(systemConnection, options));
+}
+
 async function handleLoadKeys({ msgid, root }) {
-  await waitConnected();
+  return handleDriverDataCore(msgid, driver => driver.loadKeys(systemConnection, root));
-  const driver = requireEngineDriver(storedConnection);
-  try {
-    const result = await driver.loadKeys(systemConnection, root);
-    process.send({ msgtype: 'response', msgid, result });
-  } catch (err) {
-    process.send({ msgtype: 'response', msgid, errorMessage: err.message });
-  }
 }
 
 async function handleLoadKeyInfo({ msgid, key }) {
-  await waitConnected();
+  return handleDriverDataCore(msgid, driver => driver.loadKeyInfo(systemConnection, key));
-  const driver = requireEngineDriver(storedConnection);
-  try {
-    const result = await driver.loadKeyInfo(systemConnection, key);
-    process.send({ msgtype: 'response', msgid, result });
-  } catch (err) {
-    process.send({ msgtype: 'response', msgid, errorMessage: err.message });
-  }
 }
 
 async function handleCallMethod({ msgid, method, args }) {
-  await waitConnected();
+  return handleDriverDataCore(msgid, driver => driver.callMethod(systemConnection, method, args));
-  const driver = requireEngineDriver(storedConnection);
-  try {
-    const result = await driver.callMethod(systemConnection, method, args);
-    process.send({ msgtype: 'response', msgid, result });
-  } catch (err) {
-    process.send({ msgtype: 'response', msgid, errorMessage: err.message });
-  }
 }
 
 async function handleLoadKeyTableRange({ msgid, key, cursor, count }) {
-  await waitConnected();
+  return handleDriverDataCore(msgid, driver => driver.loadKeyTableRange(systemConnection, key, cursor, count));
-  const driver = requireEngineDriver(storedConnection);
-  try {
-    const result = await driver.loadKeyTableRange(systemConnection, key, cursor, count);
-    process.send({ msgtype: 'response', msgid, result });
-  } catch (err) {
-    process.send({ msgtype: 'response', msgid, errorMessage: err.message });
 }
+
+async function handleLoadFieldValues({ msgid, schemaName, pureName, field, search }) {
+  return handleDriverDataCore(msgid, driver =>
+    driver.loadFieldValues(systemConnection, { schemaName, pureName }, field, search)
+  );
 }
 
 async function handleUpdateCollection({ msgid, changeSet }) {
@@ -300,6 +282,7 @@ const messageHandlers = {
   ping: handlePing,
   syncModel: handleSyncModel,
   generateDeploySql: handleGenerateDeploySql,
+  loadFieldValues: handleLoadFieldValues,
   // runCommand: handleRunCommand,
 };
 

packages/tools/package.json

@@ -26,6 +26,7 @@
   "devDependencies": {
     "@types/node": "^13.7.0",
     "dbgate-types": "^4.1.1",
+    "dbgate-sqltree": "^4.1.1",
     "jest": "^24.9.0",
     "ts-jest": "^25.2.1",
     "typescript": "^4.4.3"

packages/tools/src/driverBase.ts

@@ -1,5 +1,7 @@
+import _compact from 'lodash/compact'
 import { SqlDumper } from './SqlDumper';
 import { splitQuery } from 'dbgate-query-splitter';
+import { dumpSqlSelect } from 'dbgate-sqltree';
 
 const dialect = {
   limitSelect: true,
@@ -51,4 +53,56 @@ export const driverBase = {
     }
     return [];
   },
+  async loadFieldValues(pool, name, columnName, search) {
+    const dmp = this.createDumper();
+    const select = {
+      commandType: 'select',
+      distinct: true,
+      topRecords: 100,
+
+      from: {
+        name,
+      },
+      columns: [
+        {
+          exprType: 'column',
+          columnName,
+          alias: 'value',
+        },
+      ],
+      orderBy: [
+        {
+          exprType: 'column',
+          columnName,
+        },
+      ],
+    };
+
+    if (search) {
+      const tokens = _compact(search.split(' ').map(x => x.trim()));
+      if (tokens.length > 0) {
+        // @ts-ignore
+        select.where = {
+          conditionType: 'and',
+          conditions: tokens.map(token => ({
+            conditionType: 'like',
+            left: {
+              exprType: 'column',
+              columnName,
+            },
+            right: {
+              exprType: 'value',
+              value: `%${token}%`,
+            },
+          })),
+        };
+      }
+    }
+
+    // @ts-ignore
+    dumpSqlSelect(dmp, select);
+
+    const resp = await this.query(pool, dmp.s);
+    return resp.rows;
+  },
 };

packages/types/engines.d.ts

@@ -79,6 +79,7 @@ export interface EngineDriver {
   loadKeys(pool, root: string): Promise;
   loadKeyInfo(pool, key): Promise;
   loadKeyTableRange(pool, key, cursor, count): Promise;
+  loadFieldValues(pool: any, name: NamedObjectInfo, field: string, search: string): Promise;
   analyseFull(pool: any, serverVersion): Promise<DatabaseInfo>;
   analyseIncremental(pool: any, structure: DatabaseInfo, serverVersion): Promise<DatabaseInfo>;
   dialect: SqlDialect;

packages/web/src/datagrid/DataFilterControl.svelte

@@ -266,8 +266,8 @@
     class:isOk
     placeholder="Filter"
   />
-  {#if conid && database && driver && driver?.databaseEngineTypes?.includes('sql')}
+  {#if conid && database && driver}
-    {#if foreignKey}
+    {#if driver?.databaseEngineTypes?.includes('sql') && foreignKey}
       <InlineButton on:click={handleShowDictionary} narrow square>
         <FontIcon icon="icon dots-horizontal" />
       </InlineButton>

packages/web/src/modals/ValueLookupModal.svelte

@@ -34,64 +34,16 @@
   let checkedKeys = [];
 
   async function reload() {
-    const dmp = driver.createDumper();
-    const select = {
-      commandType: 'select',
-      distinct: true,
-      topRecords: 100,
-
-      from: {
-        name: {
-          schemaName,
-          pureName,
-        },
-      },
-      columns: [
-        {
-          exprType: 'column',
-          columnName,
-        },
-      ],
-      orderBy: [
-        {
-          exprType: 'column',
-          columnName,
-        },
-      ],
-    };
-
-    if (search) {
-      const tokens = _.compact(search.split(' ').map(x => x.trim()));
-      if (tokens.length > 0) {
-        // @ts-ignore
-        select.where = {
-          conditionType: 'and',
-          conditions: tokens.map(token => ({
-            conditionType: 'like',
-            left: {
-              exprType: 'column',
-              columnName,
-            },
-            right: {
-              exprType: 'value',
-              value: `%${token}%`,
-            },
-          })),
-        };
-      }
-    }
-
-    // @ts-ignore
-    dumpSqlSelect(dmp, select);
-
     isLoading = true;
-    const response = await apiCall('database-connections/query-data', {
+    rows = await apiCall('database-connections/load-field-values', {
       conid,
       database,
-      sql: dmp.s,
+      search,
+      schemaName,
+      pureName,
+      field: columnName,
     });
 
-    rows = response.rows;
     isLoading = false;
   }
 
@@ -124,7 +76,7 @@
           {rows}
           clickable
           on:clickrow={e => {
-            const value = e.detail[columnName];
+            const { value } = e.detail;
             if (multiselect) {
               if (checkedKeys.includes(value)) checkedKeys = checkedKeys.filter(x => x != value);
               else checkedKeys = [...checkedKeys, value];
@@ -143,7 +95,7 @@
             {
               fieldName: 'value',
               header: 'Value',
-              formatter: row => (row[columnName] == null ? '(NULL)' : row[columnName]),
+              formatter: row => (row.value == null ? '(NULL)' : row.value),
             },
           ]}
         >
@@ -151,9 +103,9 @@
             type="checkbox"
             let:row
             slot="1"
-            checked={checkedKeys.includes(row[columnName])}
+            checked={checkedKeys.includes(row['value'])}
             on:change={e => {
-              const value = row[columnName];
+              const value = row['value'];
               if (e.target.checked) {
                 if (!checkedKeys.includes(value)) checkedKeys = [...checkedKeys, value];
               } else {