Merge pull request #31 from isc-tleavitt/master

Fix intellisense for table names

Author: bdeboe

src/ls/driver.ts

@@ -148,13 +148,23 @@ export default class IRISDriver extends AbstractDriver<IRISdb, DriverOptions> im
    */
   public async searchItems(itemType: ContextValue, search: string, extraParams: any = {}): Promise<NSDatabase.SearchableItem[]> {
     switch (itemType) {
+      case ContextValue.DATABASE:
+        // Syntatically, a schema in IRIS SQL resembles a database in other databases.
+        // That's the simplest way to adapt IRIS SQL to the generic Hue parser vscode-sqltools uses.
+        return this.queryResults(this.queries.searchEverything({ search, showSystem: this.showSystem }));
       case ContextValue.TABLE:
       case ContextValue.FUNCTION:
       case ContextValue.VIEW:
-        return this.queryResults(this.queries.searchEverything({ search, showSystem: this.showSystem })).then(r => r.map(t => {
-          t.isView = toBool(t.isView);
-          return t;
-        }));
+        const searchParams = { search, showSystem: this.showSystem, itemType, ...extraParams };
+        if (extraParams['database']) {
+          searchParams['schema'] = extraParams['database'];
+        }
+        return this.queryResults(this.queries.searchEverything(searchParams)).then(r => r
+          .filter(r => r.type === itemType)
+          .map(t => {
+            t.isView = toBool(t.isView);
+            return t;
+          }));
       case ContextValue.COLUMN:
         return this.queryResults(this.queries.searchColumns({ search, ...extraParams }));
     }

src/ls/queries.ts

@@ -61,16 +61,36 @@ WHERE 1 = 1
 ${
   p => p.search
     ? `AND (
-    LOWER(T.name || '.' || C.name) LIKE '%${p.search.toLowerCase()}%'
-    OR LOWER(C.name) LIKE '%${p.search.toLowerCase()}%'
+    LOWER(TABLE_NAME || '.' || COLUMN_NAME) LIKE '%${p.search.toLowerCase()}%'
+    OR LOWER(COLUMN_NAME) LIKE '%${p.search.toLowerCase()}%'
   )`
     : ''
   }
+${
+  p => p.tables ? 'AND (' +
+    p.tables.map(t => `TABLE_NAME = '${t.label}' and TABLE_SCHEMA = '${t.database}'`).join(' OR ')
+    + ")" : ''
+}
 ORDER BY
   TABLE_NAME,
   ORDINAL_POSITION
 `;
 
+const treeFunctionFilter = function(p: { [key: string]: any }): string {
+  if (p.schema || p.search) {
+    let filter = ", '";
+    if (p.schema) {
+      filter += p.schema + ".";
+    }
+    if (p.search) {
+      filter += p.search;
+    }
+    filter += "*'";
+    return filter;
+  }
+  return "";
+}
+
 const fetchRecords: IQueries['fetchRecords'] = queryFactory`
 SELECT TOP ${p => p.limit || 50} *
 FROM ${p => p.table.schema}.${p => (p.table.label || p.table)}
@@ -100,7 +120,7 @@ SELECT
       '0:' || SCHEMA_NAME AS sortText
       `
   }
-FROM ${Functions[type]}(${p => p.showSystem ? 1 : 0}${p => p.search ? `, '*${p.search}*'` : p.schema ? `, '${p.schema}.*'` : ''})
+FROM ${Functions[type]}(${p => p.showSystem ? 1 : 0}${p => treeFunctionFilter(p)})
 ORDER BY
 ${p => p.schema || p.search && p.search.includes('.') ? ValueColumn[type] : 'SCHEMA_NAME'}
 `;
@@ -127,15 +147,15 @@ SELECT
       '0:' || SCHEMA_NAME AS sortText
       `
   }
-FROM ${Functions[type]}(${p.showSystem ? 1 : 0}${p.search ? `, '${p.search}*'` : p.schema ? `, '${p.schema}.*'` : ''})
+FROM ${Functions[type]}(${p.showSystem ? 1 : 0}${treeFunctionFilter(p)})
 `;
 
 const searchTables: IQueries['searchTables'] = queryFactory`
 ${p => searchHelper(p, ContextValue.TABLE)}
 ORDER BY sortText
 `;
 
-const searchEverything: IQueries['searchTables'] = queryFactory`
+const searchEverything: IQueries['searchEverything'] = queryFactory`
 ${p => searchHelper(p, ContextValue.TABLE)}
 UNION
 ${p => searchHelper(p, ContextValue.VIEW)}