Merge branch 'master' into develop

packages/web/src/appobj/DatabaseObjectAppObject.svelte

@@ -1,8 +1,8 @@
 <script lang="ts" context="module">
   export const extractKey = ({ schemaName, pureName }) => (schemaName ? `${schemaName}.${pureName}` : pureName);
-  export const createMatcher = ({ schemaName, pureName }) => filter => filterName(filter, pureName, schemaName);
+  export const createMatcher = ({ schemaName, pureName, columns }) => filter =>
+    filterName(filter, pureName, schemaName, ...(columns?.map(({ columnName }) => ({ childName: columnName })) || []));
   export const createTitle = ({ pureName }) => pureName;
-  const electron = getElectron();
 
   export const databaseObjectIcons = {
     tables: 'img table',
@@ -710,7 +710,6 @@
   import uuidv1 from 'uuid/v1';
   import SqlGeneratorModal from '../modals/SqlGeneratorModal.svelte';
   import getConnectionLabel from '../utility/getConnectionLabel';
-  import getElectron from '../utility/getElectron';
   import { exportQuickExportFile } from '../utility/exportFileTools';
   import createQuickExportMenu from '../utility/createQuickExportMenu';
   import ConfirmSqlModal from '../modals/ConfirmSqlModal.svelte';

packages/web/src/settings/ConnectionDriverFields.svelte

@@ -34,12 +34,12 @@
 </script>
 
 <FormSelectField
-  label="Database engine"
+  label="Connection type"
   name="engine"
   isNative
   disabled={isConnected}
   options={[
-    { label: '(select driver)', value: '' },
+    { label: '(select connection type)', value: '' },
     ...$extensions.drivers
       .filter(driver => !driver.isElectronOnly || electron)
       .map(driver => ({

packages/web/src/widgets/SqlObjectList.svelte

@@ -125,7 +125,7 @@
   </WidgetsInnerContainer>
 {:else}
   <SearchBoxWrapper>
-    <SearchInput placeholder="Search tables or objects" bind:value={filter} />
+    <SearchInput placeholder="Search in tables, objects, # prefix in columns" bind:value={filter} />
     <CloseSearchButton bind:filter />
     <DropDownButton icon="icon plus-thick" menu={createAddMenu} />
     <InlineButton on:click={handleRefreshDatabase} title="Refresh database connection and object list">