Materialized views #123

packages/web/src/impexp/FormTablesSelect.svelte

@@ -5,6 +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';
 
   export let conidName;
@@ -15,19 +16,25 @@
   const { values, setFieldValue } = getFormContext();
   $: dbinfo = useDatabaseInfo({ conid: $values[conidName], database: $values[databaseName] });
 
-  $: tablesOptions = _.compact([...($dbinfo?.tables || []), ...($dbinfo?.views || []), ...($dbinfo?.collections || [])])
+  $: tablesOptions = _.compact([
+    ...($dbinfo?.tables || []),
+    ...($dbinfo?.views || []),
+    ...($dbinfo?.matviews || []),
+    ...($dbinfo?.collections || []),
+  ])
     .filter(x => !$values[schemaName] || x.schemaName == $values[schemaName])
     .map(x => ({
       value: x.pureName,
       label: x.pureName,
     }));
+
 </script>
 
 <div class="wrapper">
   <FormSelectField {...$$restProps} {name} options={tablesOptions} isMulti templateProps={{ noMargin: true }} />
 
   <div>
-    {#each ['tables', 'views', 'collections'] as field}
+    {#each ['tables', 'views', 'matviews', 'collections'] as field}
       {#if $dbinfo && $dbinfo[field]?.length > 0}
         <FormStyledButton
           type="button"
@@ -49,4 +56,5 @@
   .wrapper {
     margin: var(--dim-large-form-margin);
   }
+
 </style>

packages/web/src/modals/SqlGeneratorModal.svelte

@@ -31,6 +31,7 @@
   import openNewTab from '../utility/openNewTab';
   import ErrorInfo from '../elements/ErrorInfo.svelte';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
+  import { getObjectTypeFieldLabel } from '../utility/common';
 
   export let conid;
   export let database;
@@ -49,8 +50,6 @@
 
   export let initialObjects = null;
 
-  const OBJ_TYPE_LABELS = { Matview: 'Materialized view' };
-
   let busy = false;
   let managerSize;
   let objectsFilter = '';
@@ -156,7 +155,7 @@
             <AppObjectList
               list={objectList.map(x => ({ ...x, conid, database }))}
               module={databaseObjectAppObject}
-              groupFunc={data => _.startCase(data.objectTypeField)}
+              groupFunc={data => getObjectTypeFieldLabel(data.objectTypeField)}
               isExpandable={data => data.objectTypeField == 'tables' || data.objectTypeField == 'views'}
               filter={objectsFilter}
               disableContextMenu
@@ -215,8 +214,8 @@
 
                   <FormCheckboxField label="Truncate tables (delete all rows)" name="truncate" />
 
-                  {#each ['View', 'MatView', 'Procedure', 'Function', 'Trigger'] as objtype}
-                    <div class="obj-heading">{OBJ_TYPE_LABELS[objtype] || objtype}s</div>
+                  {#each ['View', 'Matview', 'Procedure', 'Function', 'Trigger'] as objtype}
+                    <div class="obj-heading">{getObjectTypeFieldLabel(objtype.toLowerCase() + 's')}s</div>
                     <FormCheckboxField label="Create" name={`create${objtype}s`} />
                     <FormCheckboxField label="Drop" name={`drop${objtype}s`} />
                     {#if values[`drop${objtype}s`]}

packages/web/src/utility/common.ts

@@ -1,4 +1,5 @@
 import { openedTabs } from '../stores';
+import _ from 'lodash';
 
 export class LoadingToken {
   isCanceled = false;
@@ -26,3 +27,8 @@ export function setSelectedTabFunc(files, tabid) {
 export function setSelectedTab(tabid) {
   openedTabs.update(tabs => setSelectedTabFunc(tabs, tabid));
 }
+
+export function getObjectTypeFieldLabel(objectTypeField) {
+  if (objectTypeField == 'matviews') return 'Materialized Views';
+  return _.startCase(objectTypeField);
+}

packages/web/src/widgets/SqlObjectList.svelte

@@ -12,6 +12,7 @@
   import ErrorInfo from '../elements/ErrorInfo.svelte';
   import axiosInstance from '../utility/axiosInstance';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
+import { getObjectTypeFieldLabel } from '../utility/common';
 
   export let conid;
   export let database;
@@ -36,8 +37,6 @@
     axiosInstance.post('database-connections/refresh', { conid, database });
   };
 
-  const OBJECT_TYPE_LABELS = { matviews: 'Materialized views' };
-
 </script>
 
 {#if $status && $status.name == 'error'}
@@ -65,7 +64,7 @@
       <AppObjectList
         list={objectList.map(x => ({ ...x, conid, database }))}
         module={databaseObjectAppObject}
-        groupFunc={data => OBJECT_TYPE_LABELS[data.objectTypeField] || _.startCase(data.objectTypeField)}
+        groupFunc={data => getObjectTypeFieldLabel(data.objectTypeField)}
         subItemsComponent={SubColumnParamList}
         isExpandable={data =>
           data.objectTypeField == 'tables' || data.objectTypeField == 'views' || data.objectTypeField == 'matviews'}