Skip to content

Commit

Permalink
Merge pull request #205 from codefori/fix/filter
Browse files Browse the repository at this point in the history
Use `with` statement for filtering to work
  • Loading branch information
worksofliam authored Mar 5, 2024
2 parents 3bf975e + 627a8e8 commit 781b3c1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/database/schemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 7 additions & 1 deletion src/testing/database.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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`]);

Expand Down

0 comments on commit 781b3c1

Please sign in to comment.