@bdkinc/knex-ibmi 0.0.21 → 0.0.22

package/dist/execution/ibmi-transaction.d.ts

@@ -0,0 +1,7 @@
+import Transaction from "knex/lib/execution/transaction";
+declare class IBMiTransaction extends Transaction {
+    begin(connection: any): Promise<any>;
+    rollback(connection: any): Promise<any>;
+    commit(connection: any): Promise<any>;
+}
+export default IBMiTransaction;

package/dist/execution/ibmi-transaction.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-ignore
+const transaction_1 = require("knex/lib/execution/transaction");
+class IBMiTransaction extends transaction_1.default {
+    async begin(connection) {
+        await connection.beginTransaction();
+        return connection;
+    }
+    async rollback(connection) {
+        await connection.rollback();
+        return connection;
+    }
+    async commit(connection) {
+        await connection.commit();
+        return connection;
+    }
+}
+exports.default = IBMiTransaction;
+//# sourceMappingURL=ibmi-transaction.js.map

package/dist/execution/ibmi-transaction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ibmi-transaction.js","sourceRoot":"","sources":["../../src/execution/ibmi-transaction.ts"],"names":[],"mappings":";;AAAA,aAAa;AACb,gEAAyD;AAEzD,MAAM,eAAgB,SAAQ,qBAAW;IACvC,KAAK,CAAC,KAAK,CAAC,UAAU;QACpB,MAAM,UAAU,CAAC,gBAAgB,EAAE,CAAC;QACpC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,UAAU;QACvB,MAAM,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC5B,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAU;QACrB,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAED,kBAAe,eAAe,CAAC"}

package/dist/index.d.ts

@@ -0,0 +1,58 @@
+import { Connection } from "odbc";
+import { knex, Knex } from "knex";
+import * as odbc from "odbc";
+import SchemaCompiler from "./schema/ibmi-compiler";
+import TableCompiler from "./schema/ibmi-tablecompiler";
+import ColumnCompiler from "./schema/ibmi-columncompiler";
+import QueryCompiler from "./query/ibmi-querycompiler";
+declare class DB2Client extends knex.Client {
+    constructor(config: any);
+    _driver(): typeof odbc;
+    printDebug(message: string): void;
+    acquireRawConnection(): Promise<any>;
+    destroyRawConnection(connection: Connection): Promise<void>;
+    _getConnectionString(connectionConfig: any): string;
+    _query(connection: any, obj: any): Promise<any>;
+    transaction(container: any, config: any, outerTx: any): Knex.Transaction;
+    schemaCompiler(): SchemaCompiler;
+    tableCompiler(): TableCompiler;
+    columnCompiler(): ColumnCompiler;
+    queryCompiler(): QueryCompiler;
+    processResponse(obj: any, runner: any): any;
+}
+interface DB2PoolConfig {
+    min: number;
+    max: number;
+}
+interface DB2ConnectionParams {
+    CMT?: number;
+    CONNTYPE?: number;
+    DBQ?: string;
+    MAXDECPREC?: 31 | 63;
+    MAXDECSCALE?: number;
+    MINDIVSCALE?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+    NAM?: 0 | 1;
+    DFT?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
+    DSP?: 0 | 1 | 2 | 3 | 4;
+    DEC?: 0 | 1;
+    DECFLOATERROROPTION?: 0 | 1;
+    DECFLOATROUNDMODE?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+    MAPDECIMALFLOATDESCRIBE?: 1 | 3;
+}
+interface DB2ConnectionConfig {
+    database: string;
+    host: string;
+    port: 50000 | number;
+    user: string;
+    password: string;
+    driver: "IBM i Access ODBC Driver" | string;
+    connectionStringParams?: DB2ConnectionParams;
+    pool?: DB2PoolConfig;
+}
+export interface DB2Config {
+    client: any;
+    connection: DB2ConnectionConfig;
+    pool?: DB2PoolConfig;
+}
+export declare const DB2Dialect: typeof DB2Client;
+export default DB2Client;

package/dist/index.js

@@ -0,0 +1,217 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DB2Dialect = void 0;
+const process = require("process");
+const knex_1 = require("knex");
+const odbc = require("odbc");
+const console = require("console");
+const ibmi_compiler_1 = require("./schema/ibmi-compiler");
+const ibmi_tablecompiler_1 = require("./schema/ibmi-tablecompiler");
+const ibmi_columncompiler_1 = require("./schema/ibmi-columncompiler");
+const ibmi_transaction_1 = require("./execution/ibmi-transaction");
+const ibmi_querycompiler_1 = require("./query/ibmi-querycompiler");
+class DB2Client extends knex_1.knex.Client {
+    constructor(config) {
+        super(config);
+        this.driverName = "odbc";
+        if (this.dialect && !this.config.client) {
+            // @ts-ignore
+            this.logger.warn(`Using 'this.dialect' to identify the client is deprecated and support for it will be removed in the future. Please use configuration option 'client' instead.`);
+        }
+        const dbClient = this.config.client || this.dialect;
+        if (!dbClient) {
+            throw new Error(`knex: Required configuration option 'client' is missing.`);
+        }
+        if (config.version) {
+            this.version = config.version;
+        }
+        if (this.driverName && config.connection) {
+            this.initializeDriver();
+            if (!config.pool || (config.pool && config.pool.max !== 0)) {
+                this.initializePool(config);
+            }
+        }
+        this.valueForUndefined = this.raw("DEFAULT");
+        if (config.useNullAsDefault) {
+            this.valueForUndefined = null;
+        }
+    }
+    _driver() {
+        return odbc;
+    }
+    printDebug(message) {
+        if (process.env.DEBUG === "true") {
+            // @ts-ignore
+            this.logger.debug(message);
+        }
+    }
+    // Get a raw connection, called by the pool manager whenever a new
+    // connection needs to be added to the pool.
+    async acquireRawConnection() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        this.printDebug("acquiring raw connection");
+        const connectionConfig = this.config.connection;
+        console.log(this._getConnectionString(connectionConfig));
+        // @ts-ignore
+        if ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.connection) === null || _b === void 0 ? void 0 : _b.pool) {
+            const poolConfig = {
+                connectionString: this._getConnectionString(connectionConfig),
+                connectionTimeout: 
+                // @ts-ignore
+                ((_d = (_c = this.config) === null || _c === void 0 ? void 0 : _c.connection) === null || _d === void 0 ? void 0 : _d.acquireConnectionTimeout) || 60000,
+                // @ts-ignore
+                initialSize: ((_g = (_f = (_e = this.config) === null || _e === void 0 ? void 0 : _e.connection) === null || _f === void 0 ? void 0 : _f.pool) === null || _g === void 0 ? void 0 : _g.min) || 2,
+                // @ts-ignore
+                maxSize: ((_k = (_j = (_h = this.config) === null || _h === void 0 ? void 0 : _h.connection) === null || _j === void 0 ? void 0 : _j.pool) === null || _k === void 0 ? void 0 : _k.max) || 10,
+                reuseConnection: true,
+            };
+            const pool = await this.driver.pool(poolConfig);
+            return await pool.connect();
+        }
+        return await this.driver.connect(this._getConnectionString(connectionConfig));
+    }
+    // Used to explicitly close a connection, called internally by the pool manager
+    // when a connection times out or the pool is shutdown.
+    async destroyRawConnection(connection) {
+        console.log("destroy connection");
+        return await connection.close();
+    }
+    _getConnectionString(connectionConfig) {
+        const connectionStringParams = connectionConfig.connectionStringParams || {};
+        const connectionStringExtension = Object.keys(connectionStringParams).reduce((result, key) => {
+            const value = connectionStringParams[key];
+            return `${result}${key}=${value};`;
+        }, "");
+        return `${`DRIVER=${connectionConfig.driver};SYSTEM=${connectionConfig.host};HOSTNAME=${connectionConfig.host};` +
+            `PORT=${connectionConfig.port};DATABASE=${connectionConfig.database};` +
+            `UID=${connectionConfig.user};PWD=${connectionConfig.password};`}${connectionStringExtension}`;
+    }
+    // Runs the query on the specified connection, providing the bindings
+    // and any other necessary prep work.
+    async _query(connection, obj) {
+        if (!obj || typeof obj == "string")
+            obj = { sql: obj };
+        const method = (obj.hasOwnProperty("method") && obj.method !== "raw"
+            ? obj.method
+            : obj.sql.split(" ")[0]).toLowerCase();
+        obj.sqlMethod = method;
+        // Different functions are used since query() doesn't return # of rows affected,
+        // which is needed for queries that modify the database
+        if (method === "select" || method === "first" || method === "pluck") {
+            const rows = await connection.query(obj.sql, obj.bindings);
+            if (rows) {
+                obj.response = { rows, rowCount: rows.length };
+            }
+        }
+        else {
+            await connection.beginTransaction();
+            console.log("transaction begun");
+            try {
+                const statement = await connection.createStatement();
+                await statement.prepare(obj.sql);
+                if (obj.bindings) {
+                    await statement.bind(obj.bindings);
+                }
+                const result = await statement.execute();
+                // this is hacky we check the SQL for the ID column
+                // most dialects return the ID of the inserted
+                // we check for the IDENTITY scalar function
+                // if that function is present, then we just return the value of the
+                // IDENTITY column
+                if (result.statement.includes("IDENTITY_VAL_LOCAL()")) {
+                    obj.response = {
+                        rows: result.map((row) => {
+                            var _a;
+                            return result.columns && ((_a = result.columns) === null || _a === void 0 ? void 0 : _a.length) > 0
+                                ? row[result.columns[0].name]
+                                : row;
+                        }),
+                        rowCount: result.count,
+                    };
+                }
+                else if (method === "update") {
+                    if (obj.selectReturning) {
+                        const returningSelect = await connection.query(obj.selectReturning);
+                        obj.response = {
+                            rows: returningSelect,
+                            rowCount: result.count,
+                        };
+                    }
+                    else {
+                        obj.response = {
+                            rows: result,
+                            rowCount: result.count,
+                        };
+                    }
+                }
+                else {
+                    obj.response = { rows: result, rowCount: result.count };
+                }
+            }
+            catch (err) {
+                console.error(err);
+                await connection.rollback();
+                throw new Error(err);
+            }
+            finally {
+                console.log("transaction committed");
+                await connection.commit();
+            }
+        }
+        console.log({ obj });
+        return obj;
+    }
+    transaction(container, config, outerTx) {
+        // @ts-ignore
+        return new ibmi_transaction_1.default(this, ...arguments);
+    }
+    schemaCompiler() {
+        // @ts-ignore
+        return new ibmi_compiler_1.default(this, ...arguments);
+    }
+    tableCompiler() {
+        // @ts-ignore
+        return new ibmi_tablecompiler_1.default(this, ...arguments);
+    }
+    columnCompiler() {
+        // @ts-ignore
+        return new ibmi_columncompiler_1.default(this, ...arguments);
+    }
+    queryCompiler() {
+        // @ts-ignore
+        return new ibmi_querycompiler_1.default(this, ...arguments);
+    }
+    processResponse(obj, runner) {
+        if (obj === null)
+            return null;
+        const resp = obj.response;
+        const method = obj.sqlMethod;
+        const { rows, rowCount } = resp;
+        if (obj.output)
+            return obj.output.call(runner, resp);
+        switch (method) {
+            case "select":
+                return rows;
+            case "pluck":
+                return rows.map(obj.pluck);
+            case "first":
+                return rows[0];
+            case "insert":
+                return rows;
+            case "del":
+            case "delete":
+            case "update":
+                if (obj.selectReturning) {
+                    return rows;
+                }
+                return rowCount;
+            case "counter":
+                return rowCount;
+            default:
+                return rows;
+        }
+    }
+}
+exports.DB2Dialect = DB2Client;
+exports.default = DB2Client;
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/query/ibmi-querycompiler.d.ts

@@ -0,0 +1,17 @@
+import QueryCompiler from "knex/lib/query/querycompiler";
+declare class IBMiQueryCompiler extends QueryCompiler {
+    insert(): "" | {
+        sql: string;
+        returning: any;
+    };
+    _buildInsertData(insertValues: any, returningSql: any): string;
+    _prepInsert(data: any): any;
+    update(): {
+        sql: string;
+        returning: any;
+        selectReturning: string;
+    };
+    _returning(method: any, value: any, withTrigger: any): string | undefined;
+    columnizeWithPrefix(prefix: any, target: any): string;
+}
+export default IBMiQueryCompiler;

package/dist/query/ibmi-querycompiler.js

@@ -0,0 +1,226 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-ignore
+const querycompiler_1 = require("knex/lib/query/querycompiler");
+const isObject_1 = require("lodash/isObject");
+const wrappingFormatter_1 = require("knex/lib/formatter/wrappingFormatter");
+const date_fns_1 = require("date-fns");
+const isEmpty_1 = require("lodash/isEmpty");
+const console = require("console");
+class IBMiQueryCompiler extends querycompiler_1.default {
+    insert() {
+        // @ts-ignore
+        const insertValues = this.single.insert || [];
+        // we need to return a value
+        // we need to wrap the insert statement in a select statement
+        // we use the "IDENTITY_VAL_LOCAL()" function to return the IDENTITY
+        // unless specified in a return
+        // @ts-ignore
+        let sql = `SELECT ${
+        // @ts-ignore
+        this.single.returning
+            ? // @ts-ignore
+                this.formatter.columnize(this.single.returning)
+            : "IDENTITY_VAL_LOCAL()"} FROM FINAL TABLE(`;
+        // @ts-ignore
+        sql += this.with() + `insert into ${this.tableName} `;
+        // @ts-ignore
+        const { returning } = this.single;
+        const returningSql = returning
+            ? // @ts-ignore
+                this._returning("insert", returning) + " "
+            : "";
+        if (Array.isArray(insertValues)) {
+            if (insertValues.length === 0) {
+                return "";
+            }
+        }
+        else if (typeof insertValues === "object" && (0, isEmpty_1.default)(insertValues)) {
+            return {
+                // @ts-ignore
+                sql: sql + returningSql + this._emptyInsertValue,
+                returning,
+            };
+        }
+        // @ts-ignore
+        sql += this._buildInsertData(insertValues, returningSql);
+        sql += ")";
+        return {
+            sql,
+            returning,
+        };
+    }
+    _buildInsertData(insertValues, returningSql) {
+        let sql = "";
+        const insertData = this._prepInsert(insertValues);
+        if (typeof insertData === "string") {
+            sql += insertData;
+        }
+        else {
+            if (insertData.columns.length) {
+                // @ts-ignore
+                sql += `(${this.formatter.columnize(insertData.columns)}`;
+                sql +=
+                    `) ${returningSql}values (` +
+                        // @ts-ignore
+                        this._buildInsertValues(insertData) +
+                        ")";
+            }
+            else if (insertValues.length === 1 && insertValues[0]) {
+                // @ts-ignore
+                sql += returningSql + this._emptyInsertValue;
+            }
+            else {
+                return "";
+            }
+        }
+        return sql;
+    }
+    _prepInsert(data) {
+        if ((0, isObject_1.default)(data)) {
+            if (data.hasOwnProperty("migration_time")) {
+                const parsed = new Date(data.migration_time);
+                data.migration_time = (0, date_fns_1.format)(parsed, "yyyy-MM-dd HH:mm:ss");
+            }
+        }
+        const isRaw = (0, wrappingFormatter_1.rawOrFn)(data, undefined, 
+        // @ts-ignore
+        this.builder, 
+        // @ts-ignore
+        this.client, 
+        // @ts-ignore
+        this.bindingsHolder);
+        if (isRaw)
+            return isRaw;
+        let columns = [];
+        const values = [];
+        if (!Array.isArray(data))
+            data = data ? [data] : [];
+        let i = -1;
+        while (++i < data.length) {
+            if (data[i] == null)
+                break;
+            if (i === 0)
+                columns = Object.keys(data[i]).sort();
+            const row = new Array(columns.length);
+            const keys = Object.keys(data[i]);
+            let j = -1;
+            while (++j < keys.length) {
+                const key = keys[j];
+                let idx = columns.indexOf(key);
+                if (idx === -1) {
+                    columns = columns.concat(key).sort();
+                    idx = columns.indexOf(key);
+                    let k = -1;
+                    while (++k < values.length) {
+                        values[k].splice(idx, 0, undefined);
+                    }
+                    row.splice(idx, 0, undefined);
+                }
+                row[idx] = data[i][key];
+            }
+            values.push(row);
+        }
+        return {
+            columns,
+            values,
+        };
+    }
+    update() {
+        // @ts-ignore
+        const withSQL = this.with();
+        // @ts-ignore
+        const updates = this._prepUpdate(this.single.update);
+        // @ts-ignore
+        const where = this.where();
+        // @ts-ignore
+        const order = this.order();
+        // @ts-ignore
+        const limit = this.limit();
+        // @ts-ignore
+        const { returning } = this.single;
+        // @ts-ignore
+        const values = Object.values(this.single.update)
+            .map((a) => `${a}`)
+            .join(", ");
+        // @ts-ignore
+        console.log({
+            returning,
+            // @ts-ignore
+            where,
+            // @ts-ignore
+            updates,
+            // @ts-ignore
+            single: this.single.update,
+            // @ts-ignore
+            grouped: this.grouped.where,
+            values,
+        });
+        // @ts-ignore
+        const moreWheres = 
+        // @ts-ignore
+        this.grouped.where && this.grouped.where.length > 0
+            ? // @ts-ignore
+                this.grouped.where.map((w) => {
+                    // @ts-ignore
+                    if (this.single.update.hasOwnProperty(w.column))
+                        return;
+                    if (!w.value)
+                        return;
+                    return `"${w.column}" ${w.not ? "!" : ""}${w.operator} ${w.value}`;
+                })
+            : [];
+        let selectReturning = returning
+            ? `select ${returning.map((a) => `"${a}"`).join(", ")} from ${
+            // @ts-ignore
+            this.tableName
+            // @ts-ignore
+            } where ${Object.entries(this.single.update)
+                .map(([key, value]) => `"${key}" = '${value}'`)
+                .join(" and ")}${moreWheres.length > 0 && " and "}${moreWheres.join(" and ")}`
+            : "";
+        console.log({ selectReturning });
+        const sql = withSQL +
+            // @ts-ignore
+            `update ${this.single.only ? "only " : ""}${this.tableName}` +
+            " set " +
+            // @ts-ignore
+            updates.join(", ") +
+            (where ? ` ${where}` : "") +
+            (order ? ` ${order}` : "") +
+            (limit ? ` ${limit}` : "");
+        return { sql, returning, selectReturning };
+    }
+    _returning(method, value, withTrigger) {
+        // currently a placeholder in case I need to update return values
+        console.log("_returning", value);
+        switch (method) {
+            case "update":
+            case "insert":
+                return value
+                    ? // @ts-ignore
+                        `${withTrigger ? " into #out" : ""}`
+                    : "";
+            case "del":
+                return value
+                    ? // @ts-ignore
+                        `${withTrigger ? " into #out" : ""}`
+                    : "";
+            case "rowcount":
+                return value ? "select @@rowcount" : "";
+        }
+    }
+    columnizeWithPrefix(prefix, target) {
+        const columns = typeof target === "string" ? [target] : target;
+        let str = "", i = -1;
+        while (++i < columns.length) {
+            if (i > 0)
+                str += ", ";
+            // @ts-ignore
+            str += prefix + this.wrap(columns[i]);
+        }
+        return str;
+    }
+}
+exports.default = IBMiQueryCompiler;
+//# sourceMappingURL=ibmi-querycompiler.js.map

package/dist/query/ibmi-querycompiler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ibmi-querycompiler.js","sourceRoot":"","sources":["../../src/query/ibmi-querycompiler.ts"],"names":[],"mappings":";;AAAA,aAAa;AACb,gEAAyD;AACzD,8CAAuC;AACvC,4EAA2E;AAC3E,uCAAkC;AAClC,4CAAqC;AACrC,mCAAmC;AAEnC,MAAM,iBAAkB,SAAQ,uBAAa;IAC3C,MAAM;QACJ,aAAa;QACb,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QAC9C,4BAA4B;QAC5B,6DAA6D;QAC7D,oEAAoE;QACpE,+BAA+B;QAC/B,aAAa;QACb,IAAI,GAAG,GAAG,UAAU;QAClB,aAAa;QACb,IAAI,CAAC,MAAM,CAAC,SAAS;YACnB,CAAC,CAAC,aAAa;gBACb,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YACjD,CAAC,CAAC,sBACN,oBAAoB,CAAC;QACrB,aAAa;QACb,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,eAAe,IAAI,CAAC,SAAS,GAAG,CAAC;QACtD,aAAa;QACb,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAClC,MAAM,YAAY,GAAG,SAAS;YAC5B,CAAC,CAAC,aAAa;gBACb,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,GAAG;YAC5C,CAAC,CAAC,EAAE,CAAC;QAEP,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YAC/B,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,OAAO,EAAE,CAAC;aACX;SACF;aAAM,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,IAAA,iBAAO,EAAC,YAAY,CAAC,EAAE;YACpE,OAAO;gBACL,aAAa;gBACb,GAAG,EAAE,GAAG,GAAG,YAAY,GAAG,IAAI,CAAC,iBAAiB;gBAChD,SAAS;aACV,CAAC;SACH;QAED,aAAa;QACb,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACzD,GAAG,IAAI,GAAG,CAAC;QAEX,OAAO;YACL,GAAG;YACH,SAAS;SACV,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,YAAY,EAAE,YAAY;QACzC,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAClD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,GAAG,IAAI,UAAU,CAAC;SACnB;aAAM;YACL,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE;gBAC7B,aAAa;gBACb,GAAG,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1D,GAAG;oBACD,KAAK,YAAY,UAAU;wBAC3B,aAAa;wBACb,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC;wBACnC,GAAG,CAAC;aACP;iBAAM,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE;gBACvD,aAAa;gBACb,GAAG,IAAI,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC;aAC9C;iBAAM;gBACL,OAAO,EAAE,CAAC;aACX;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,WAAW,CAAC,IAAI;QACd,IAAI,IAAA,kBAAQ,EAAC,IAAI,CAAC,EAAE;YAClB,IAAI,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE;gBACzC,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC7C,IAAI,CAAC,cAAc,GAAG,IAAA,iBAAM,EAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;aAC7D;SACF;QAED,MAAM,KAAK,GAAG,IAAA,2BAAQ,EACpB,IAAI,EACJ,SAAS;QACT,aAAa;QACb,IAAI,CAAC,OAAO;QACZ,aAAa;QACb,IAAI,CAAC,MAAM;QACX,aAAa;QACb,IAAI,CAAC,cAAc,CACpB,CAAC;QACF,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,IAAI,OAAO,GAAU,EAAE,CAAC;QACxB,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACX,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE;YACxB,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI;gBAAE,MAAM;YAC3B,IAAI,CAAC,KAAK,CAAC;gBAAE,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACnD,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACX,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE;gBACxB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC/B,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;oBACd,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;oBACrC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBAC3B,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBACX,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;wBAC1B,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;qBACrC;oBACD,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;iBAC/B;gBACD,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACzB;YACD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAClB;QACD,OAAO;YACL,OAAO;YACP,MAAM;SACP,CAAC;IACJ,CAAC;IAED,MAAM;QACJ,aAAa;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,aAAa;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrD,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC3B,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC3B,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC3B,aAAa;QACb,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAClC,aAAa;QACb,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;aAC7C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;aAClB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,aAAa;QACb,OAAO,CAAC,GAAG,CAAC;YACV,SAAS;YACT,aAAa;YACb,KAAK;YACL,aAAa;YACb,OAAO;YACP,aAAa;YACb,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,aAAa;YACb,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YAC3B,MAAM;SACP,CAAC,CAAC;QACH,aAAa;QACb,MAAM,UAAU;QACd,aAAa;QACb,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YACjD,CAAC,CAAC,aAAa;gBACb,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC3B,aAAa;oBACb,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;wBAAE,OAAO;oBACxD,IAAI,CAAC,CAAC,CAAC,KAAK;wBAAE,OAAO;oBACrB,OAAO,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;gBACrE,CAAC,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC;QAET,IAAI,eAAe,GAAG,SAAS;YAC7B,CAAC,CAAC,UAAU,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;YAC1D,aAAa;YACb,IAAI,CAAC,SAAS;YACd,aAAa;YACf,UAAU,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;iBACzC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,QAAQ,KAAK,GAAG,CAAC;iBAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,GAAG,UAAU,CAAC,IAAI,CACnE,OAAO,CACR,EAAE;YACL,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;QAEjC,MAAM,GAAG,GACP,OAAO;YACP,aAAa;YACb,UAAU,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE;YAC5D,OAAO;YACP,aAAa;YACb,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;YAClB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1B,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1B,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAE7B,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7C,CAAC;IAED,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,WAAW;QACnC,iEAAiE;QACjE,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACjC,QAAQ,MAAM,EAAE;YACd,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ;gBACX,OAAO,KAAK;oBACV,CAAC,CAAC,aAAa;wBACb,GAAG,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE;oBACtC,CAAC,CAAC,EAAE,CAAC;YACT,KAAK,KAAK;gBACR,OAAO,KAAK;oBACV,CAAC,CAAC,aAAa;wBACb,GAAG,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE;oBACtC,CAAC,CAAC,EAAE,CAAC;YACT,KAAK,UAAU;gBACb,OAAO,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3C;IACH,CAAC;IAED,mBAAmB,CAAC,MAAM,EAAE,MAAM;QAChC,MAAM,OAAO,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QAC/D,IAAI,GAAG,GAAG,EAAE,EACV,CAAC,GAAG,CAAC,CAAC,CAAC;QACT,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE;YAC3B,IAAI,CAAC,GAAG,CAAC;gBAAE,GAAG,IAAI,IAAI,CAAC;YACvB,aAAa;YACb,GAAG,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SACvC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAED,kBAAe,iBAAiB,CAAC"}

package/dist/schema/ibmi-columncompiler.d.ts

@@ -0,0 +1,7 @@
+import ColumnCompiler from "knex/lib/schema/columncompiler";
+declare class IBMiColumnCompiler extends ColumnCompiler {
+    increments(options?: {
+        primaryKey: boolean;
+    }): string;
+}
+export default IBMiColumnCompiler;

package/dist/schema/ibmi-columncompiler.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-ignore
+const columncompiler_1 = require("knex/lib/schema/columncompiler");
+class IBMiColumnCompiler extends columncompiler_1.default {
+    increments(options = { primaryKey: true }) {
+        return ("int not null generated always as identity (start with 1, increment by 1)" +
+            // @ts-ignore
+            (this.tableCompiler._canBeAddPrimaryKey(options) ? " primary key" : ""));
+    }
+}
+exports.default = IBMiColumnCompiler;
+//# sourceMappingURL=ibmi-columncompiler.js.map

package/dist/schema/ibmi-columncompiler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ibmi-columncompiler.js","sourceRoot":"","sources":["../../src/schema/ibmi-columncompiler.ts"],"names":[],"mappings":";;AAAA,aAAa;AACb,mEAA4D;AAE5D,MAAM,kBAAmB,SAAQ,wBAAc;IAC7C,UAAU,CAAC,OAAO,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE;QACvC,OAAO,CACL,0EAA0E;YAC1E,aAAa;YACb,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CACxE,CAAC;IACJ,CAAC;CACF;AAED,kBAAe,kBAAkB,CAAC"}

package/dist/schema/ibmi-compiler.d.ts

@@ -0,0 +1,6 @@
+import SchemaCompiler from "knex/lib/schema/compiler";
+declare class IBMiSchemaCompiler extends SchemaCompiler {
+    hasTable(tableName: any): void;
+    toSQL(): any;
+}
+export default IBMiSchemaCompiler;

package/dist/schema/ibmi-compiler.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-ignore
+const compiler_1 = require("knex/lib/schema/compiler");
+class IBMiSchemaCompiler extends compiler_1.default {
+    hasTable(tableName) {
+        // @ts-ignore
+        const formattedTable = this.client.parameter(
+        // @ts-ignore
+        prefixedTableName(this.schema, tableName), 
+        // @ts-ignore
+        this.builder, 
+        // @ts-ignore
+        this.bindingsHolder);
+        const bindings = [tableName];
+        let sql = `SELECT TABLE_NAME FROM QSYS2.SYSTABLES ` +
+            `where TYPE = 'T' and TABLE_NAME = ${formattedTable}`;
+        // @ts-ignore
+        if (this.schema) {
+            sql += " and TABLE_SCHEMA = ?";
+            // @ts-ignore
+            bindings.push(this.schema);
+        }
+        // @ts-ignore
+        this.pushQuery({
+            sql,
+            bindings,
+            output: (resp) => {
+                return resp.rowCount > 0;
+            },
+        });
+    }
+    toSQL() {
+        // @ts-ignore
+        const sequence = this.builder._sequence;
+        for (let i = 0, l = sequence.length; i < l; i++) {
+            const query = sequence[i];
+            this[query.method].apply(this, query.args);
+        }
+        // @ts-ignore
+        return this.sequence;
+    }
+}
+function prefixedTableName(prefix, table) {
+    return prefix ? `${prefix}.${table}` : table;
+}
+exports.default = IBMiSchemaCompiler;
+//# sourceMappingURL=ibmi-compiler.js.map

package/dist/schema/ibmi-compiler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ibmi-compiler.js","sourceRoot":"","sources":["../../src/schema/ibmi-compiler.ts"],"names":[],"mappings":";;AAAA,aAAa;AACb,uDAAsD;AAEtD,MAAM,kBAAmB,SAAQ,kBAAc;IAC7C,QAAQ,CAAC,SAAS;QAChB,aAAa;QACb,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS;QAC1C,aAAa;QACb,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC;QACzC,aAAa;QACb,IAAI,CAAC,OAAO;QACZ,aAAa;QACb,IAAI,CAAC,cAAc,CACpB,CAAC;QACF,MAAM,QAAQ,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7B,IAAI,GAAG,GACL,yCAAyC;YACzC,qCAAqC,cAAc,EAAE,CAAC;QACxD,aAAa;QACb,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,GAAG,IAAI,uBAAuB,CAAC;YAC/B,aAAa;YACb,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC5B;QAED,aAAa;QACb,IAAI,CAAC,SAAS,CAAC;YACb,GAAG;YACH,QAAQ;YACR,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACf,OAAO,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;YAC3B,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK;QACH,aAAa;QACb,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC/C,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;SAC5C;QACD,aAAa;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;AAED,SAAS,iBAAiB,CAAC,MAAM,EAAE,KAAK;IACtC,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AAC/C,CAAC;AAED,kBAAe,kBAAkB,CAAC"}

package/dist/schema/ibmi-tablecompiler.d.ts

@@ -0,0 +1,9 @@
+import TableCompiler from "knex/lib/schema/tablecompiler";
+declare class IBMiTableCompiler extends TableCompiler {
+    createQuery(columns: any, ifNot: any, like: any): void;
+    dropUnique(columns: any, indexName: any): void;
+    unique(columns: any, indexName: any): void;
+    addColumns(columns: any, prefix: any): void;
+    commit(conn: any): Promise<any>;
+}
+export default IBMiTableCompiler;

package/dist/schema/ibmi-tablecompiler.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-ignore
+const tablecompiler_1 = require("knex/lib/schema/tablecompiler");
+const isObject_1 = require("lodash/isObject");
+class IBMiTableCompiler extends tablecompiler_1.default {
+    createQuery(columns, ifNot, like) {
+        let createStatement = ifNot
+            // @ts-ignore
+            ? `if object_id('${this.tableName()}', 'U') is null `
+            : "";
+        if (like) {
+            // This query copy only columns and not all indexes and keys like other databases.
+            // @ts-ignore
+            createStatement += `SELECT * INTO ${this.tableName()} FROM ${this.tableNameLike()} WHERE 0=1`;
+        }
+        else {
+            createStatement +=
+                "CREATE TABLE " +
+                    // @ts-ignore
+                    this.tableName() +
+                    // @ts-ignore
+                    (this._formatting ? " (\n    " : " (") +
+                    // @ts-ignore
+                    columns.sql.join(this._formatting ? ",\n    " : ", ") +
+                    // @ts-ignore
+                    this._addChecks() +
+                    ")";
+        }
+        // @ts-ignore
+        this.pushQuery(createStatement);
+        // @ts-ignore
+        if (this.single.comment) {
+            // @ts-ignore
+            this.comment(this.single.comment);
+        }
+        if (like) {
+            // @ts-ignore
+            this.addColumns(columns, this.addColumnsPrefix);
+        }
+    }
+    dropUnique(columns, indexName) {
+        indexName = indexName
+            // @ts-ignore
+            ? this.formatter.wrap(indexName)
+            // @ts-ignore
+            : this._indexCommand('unique', this.tableNameRaw, columns);
+        // @ts-ignore
+        this.pushQuery(`drop index ${indexName}`);
+    }
+    unique(columns, indexName) {
+        let deferrable;
+        let predicate;
+        if ((0, isObject_1.default)(indexName)) {
+            ({ indexName, deferrable, predicate } = indexName);
+        }
+        if (deferrable && deferrable !== 'not deferrable') {
+            // @ts-ignore
+            this.client.logger.warn(`IBMi: unique index \`${indexName}\` will not be deferrable ${deferrable}.`);
+        }
+        indexName = indexName
+            // @ts-ignore
+            ? this.formatter.wrap(indexName)
+            // @ts-ignore
+            : this._indexCommand('unique', this.tableNameRaw, columns);
+        // @ts-ignore
+        columns = this.formatter.columnize(columns);
+        const predicateQuery = predicate
+            // @ts-ignore
+            ? ' ' + this.client.queryCompiler(predicate).where()
+            : '';
+        // @ts-ignore
+        this.pushQuery(
+        // @ts-ignore
+        `create unique index ${indexName} on ${this.tableName()} (${columns})${predicateQuery}`);
+    }
+    // All of the columns to "add" for the query
+    addColumns(columns, prefix) {
+        // @ts-ignore
+        prefix = prefix || this.addColumnsPrefix;
+        if (columns.sql.length > 0) {
+            const columnSql = columns.sql.map((column) => {
+                return prefix + column;
+            });
+            // @ts-ignore
+            this.pushQuery({
+                sql: 
+                // @ts-ignore
+                (this.lowerCase ? 'alter table ' : 'ALTER TABLE ') +
+                    // @ts-ignore
+                    this.tableName() +
+                    ' ' +
+                    columnSql.join(' '),
+                bindings: columns.bindings,
+            });
+        }
+    }
+    async commit(conn) {
+        return await conn.commit();
+    }
+}
+exports.default = IBMiTableCompiler;
+//# sourceMappingURL=ibmi-tablecompiler.js.map

package/dist/schema/ibmi-tablecompiler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ibmi-tablecompiler.js","sourceRoot":"","sources":["../../src/schema/ibmi-tablecompiler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bdkinc/knex-ibmi",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Knex dialect for IBMi",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",