Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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