Merge pull request #205 from codefori/fix/filter

Use `with` statement for filtering to work

Author: worksofliam

src/database/schemas.ts

@@ -124,7 +124,7 @@ export default class Schemas {
       }
     }
 
-    const query = `${selects.join(" UNION ALL ")} Order by QSYS2.DELIMIT_NAME(NAME) asc`;
+    const query = `with results as (${selects.join(" UNION ALL ")}) select * from results Order by QSYS2.DELIMIT_NAME(NAME) asc`;
 
     const objects: any[] = await JobManager.runSQL([
       query,

src/testing/database.ts

@@ -1,7 +1,7 @@
 import assert from "assert";
 import { TestSuite } from ".";
 import { JobManager } from "../config";
-import Database from "../database/schemas";
+import Database, { AllSQLTypes } from "../database/schemas";
 import Statement from "../database/statement";
 import Callable from "../database/callable";
 import { getInstance } from "../base";
@@ -97,6 +97,12 @@ export const DatabaseSuite: TestSuite = {
       assert.notStrictEqual(objects.length, 0);
     }},
 
+    {name: `Schema filter test`, test: async () => {
+      const objects = await Database.getObjects(systemLibrary, AllSQLTypes, {filter: `emp`});
+
+      assert.notStrictEqual(objects.length, 0);
+    }},
+
     {name: `Get tables, sqlSchema name`, test: async () => {
       const objects = await Database.getObjects(Statement.noQuotes(sqlSchema), [`tables`]);