@bdkinc/knex-ibmi 0.0.3 → 0.0.5

package/README.md

@@ -1,4 +1,4 @@
-[![npm version](http://img.shields.io/npm/v/knex-db2.svg)](https://npmjs.org/package/@bdkinc/knex-ibmi)
+[![npm version](http://img.shields.io/npm/v/@bdkinc/knex-ibmi.svg)](https://npmjs.org/package/@bdkinc/knex-ibmi)
 
 **Disclaimer: this library is in early stages of development. Please submit an issue for any bugs encounter or any questions you have.**
 
@@ -19,6 +19,7 @@ Currently, this dialect has limited functionality compared to the Knex built-in
 - No streaming support
 - Possibly other missing functionality
 - Uses a pool for all connections
+- Journaling must be handled separately. After a migration is ran journaling can be configured on the newly created tables. I recommend using the schema utility in the i access client solutions software. 
 
 ## Installing
 
@@ -106,7 +107,7 @@ try {
 
 ## Configuring your driver
 
-If you don't know the name of your installed driver, then look in look in `odbcinst.ini`. You can find the full path of the file by running `odbcinst -j`.
+If you don't know the name of your installed driver, then look in `odbcinst.ini`. You can find the full path of the file by running `odbcinst -j`.
 There you should see an entry like the one below:
 
 ```

package/dist/index.js

@@ -37,7 +37,7 @@ module.exports = __toCommonJS(src_exports);
 var process = __toESM(require("process"));
 var import_knex = __toESM(require("knex"));
 var odbc = __toESM(require("odbc"));
-var console5 = __toESM(require("console"));
+var console2 = __toESM(require("console"));
 
 // src/schema/ibmi-compiler.ts
 var import_compiler = __toESM(require("knex/lib/schema/compiler"));
@@ -48,11 +48,14 @@ var IBMiSchemaCompiler = class extends import_compiler.default {
   }
   hasTable(tableName) {
     const formattedTable = this.client.parameter(
+      // @ts-ignore
       prefixedTableName(this.schema, tableName),
+      // @ts-ignore
       this.builder,
+      // @ts-ignore
       this.bindingsHolder
     );
-    const bindings = [tableName.toUpperCase()];
+    const bindings = [tableName];
     let sql = `SELECT TABLE_NAME FROM QSYS2.SYSTABLES WHERE TYPE = 'T' AND TABLE_NAME = ${formattedTable}`;
     if (this.schema) {
       sql += " AND TABLE_SCHEMA = ?";
@@ -83,50 +86,18 @@ var ibmi_compiler_default = IBMiSchemaCompiler;
 
 // src/schema/ibmi-tablecompiler.ts
 var import_tablecompiler = __toESM(require("knex/lib/schema/tablecompiler"));
+var import_isObject = __toESM(require("lodash/isObject"));
 var IBMiTableCompiler = class extends import_tablecompiler.default {
-  constructor(client, tableBuilder) {
-    super(client, tableBuilder);
-  }
-  unique(columns, indexName) {
-    let deferrable;
-    let useConstraint = false;
-    let predicate;
-    if (typeof indexName === "object") {
-      ({ indexName, deferrable, useConstraint, predicate } = indexName);
-    }
-    if (deferrable && deferrable !== "not deferrable") {
-      this.client.logger.warn(
-        `ibmi: unique index [${indexName}] will not be deferrable ${deferrable} because mssql does not support deferred constraints.`
-      );
-    }
-    if (useConstraint && predicate) {
-      throw new Error("ibmi cannot create constraint with predicate");
-    }
-    indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand("unique", this.tableNameRaw, columns);
-    if (!Array.isArray(columns)) {
-      columns = [columns];
-    }
-    if (useConstraint) {
-      this.pushQuery(
-        `ALTER TABLE ${this.tableName()} ADD CONSTRAINT ${indexName} UNIQUE (${this.formatter.columnize(
-          columns
-        )})`
-      );
-    } else {
-      const predicateQuery = predicate ? " " + this.client.queryCompiler(predicate).where() : " WHERE " + columns.map((column) => this.formatter.columnize(column) + " IS NOT NULL").join(" AND ");
-      this.pushQuery(
-        `CREATE UNIQUE INDEX ${indexName} ON ${this.tableName()} (${this.formatter.columnize(
-          columns
-        )})${predicateQuery}`
-      );
-    }
-  }
   createQuery(columns, ifNot, like) {
     let createStatement = ifNot ? `if object_id('${this.tableName()}', 'U') is null ` : "";
     if (like) {
       createStatement += `SELECT * INTO ${this.tableName()} FROM ${this.tableNameLike()} WHERE 0=1`;
     } else {
-      createStatement += "CREATE TABLE " + this.tableName() + (this._formatting ? " (\n    " : " (") + columns.sql.join(this._formatting ? ",\n    " : ", ") + this._addChecks() + ")";
+      createStatement += "CREATE TABLE " + // @ts-ignore
+      this.tableName() + // @ts-ignore
+      (this._formatting ? " (\n    " : " (") + // @ts-ignore
+      columns.sql.join(this._formatting ? ",\n    " : ", ") + // @ts-ignore
+      this._addChecks() + ")";
     }
     this.pushQuery(createStatement);
     if (this.single.comment) {
@@ -136,6 +107,29 @@ var IBMiTableCompiler = class extends import_tablecompiler.default {
       this.addColumns(columns, this.addColumnsPrefix);
     }
   }
+  dropUnique(columns, indexName) {
+    indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand("unique", this.tableNameRaw, columns);
+    this.pushQuery(`drop index ${indexName}`);
+  }
+  unique(columns, indexName) {
+    let deferrable;
+    let predicate;
+    if ((0, import_isObject.default)(indexName)) {
+      ({ indexName, deferrable, predicate } = indexName);
+    }
+    if (deferrable && deferrable !== "not deferrable") {
+      this.client.logger.warn(
+        `IBMi: unique index \`${indexName}\` will not be deferrable ${deferrable}.`
+      );
+    }
+    indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand("unique", this.tableNameRaw, columns);
+    columns = this.formatter.columnize(columns);
+    const predicateQuery = predicate ? " " + this.client.queryCompiler(predicate).where() : "";
+    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) {
     prefix = prefix || this.addColumnsPrefix;
@@ -144,7 +138,11 @@ var IBMiTableCompiler = class extends import_tablecompiler.default {
         return prefix + column;
       });
       this.pushQuery({
-        sql: (this.lowerCase ? "alter table " : "ALTER TABLE ") + this.tableName() + " " + columnSql.join(" "),
+        sql: (
+          // @ts-ignore
+          (this.lowerCase ? "alter table " : "ALTER TABLE ") + // @ts-ignore
+          this.tableName() + " " + columnSql.join(" ")
+        ),
         bindings: columns.bindings
       });
     }
@@ -157,32 +155,16 @@ var ibmi_tablecompiler_default = IBMiTableCompiler;
 
 // src/schema/ibmi-columncompiler.ts
 var import_columncompiler = __toESM(require("knex/lib/schema/columncompiler"));
-var console2 = __toESM(require("console"));
 var IBMiColumnCompiler = class extends import_columncompiler.default {
-  constructor(client, tableCompiler, columnBuilder) {
-    super(client, tableCompiler, columnBuilder);
-  }
   increments(options = { primaryKey: true }) {
-    return "int not null generated always as identity (start with 1, increment by 1)" + (this.tableCompiler._canBeAddPrimaryKey(options) ? " primary key" : "");
-  }
-  datetime(withoutTz = false, precision) {
-    let useTz;
-    if (isObject(withoutTz)) {
-      ({ useTz, precision } = withoutTz);
-    } else {
-      useTz = !withoutTz;
-    }
-    useTz = typeof useTz === "boolean" ? useTz : true;
-    precision = precision !== void 0 && precision !== null ? "(" + precision + ")" : "";
-    console2.log(useTz, precision);
-    return `${useTz ? "timestamptz" : "timestamp"}${precision}`;
+    return "int not null generated always as identity (start with 1, increment by 1)" + // @ts-ignore
+    (this.tableCompiler._canBeAddPrimaryKey(options) ? " primary key" : "");
   }
 };
 var ibmi_columncompiler_default = IBMiColumnCompiler;
 
 // src/execution/ibmi-transaction.ts
 var import_transaction = __toESM(require("knex/lib/execution/transaction"));
-var console3 = __toESM(require("console"));
 var IBMiTransaction = class extends import_transaction.default {
   async begin(conn) {
     const connection = await conn.connect();
@@ -190,7 +172,6 @@ var IBMiTransaction = class extends import_transaction.default {
     return connection;
   }
   async rollback(conn) {
-    console3.log({ conn });
     const connection = await conn.connect();
     await connection.rollback();
     return connection;
@@ -204,31 +185,25 @@ var ibmi_transaction_default = IBMiTransaction;
 
 // src/query/ibmi-querycompiler.ts
 var import_querycompiler = __toESM(require("knex/lib/query/querycompiler"));
-var import_has = __toESM(require("lodash/has"));
-var import_isEmpty = __toESM(require("lodash/isEmpty"));
-var import_omitBy = __toESM(require("lodash/omitBy"));
-var import_isObject = __toESM(require("lodash/isObject"));
+var import_isObject2 = __toESM(require("lodash/isObject"));
 var import_wrappingFormatter = require("knex/lib/formatter/wrappingFormatter");
 var import_date_fns = require("date-fns");
-var console4 = __toESM(require("console"));
 var IBMiQueryCompiler = class extends import_querycompiler.default {
   _prepInsert(data) {
-    if ((0, import_isObject.default)(data)) {
-      console4.log("data is object", data);
+    if ((0, import_isObject2.default)(data)) {
       if (data.hasOwnProperty("migration_time")) {
-        console4.log("data has migration_time", data.migration_time);
         const parsed = new Date(data.migration_time);
-        console4.log(parsed);
         data.migration_time = (0, import_date_fns.format)(parsed, "yyyy-MM-dd HH:mm:ss");
-        console4.log(data.migration_time);
       }
-      console4.log("data date after change", data);
     }
     const isRaw = (0, import_wrappingFormatter.rawOrFn)(
       data,
       void 0,
+      // @ts-ignore
       this.builder,
+      // @ts-ignore
       this.client,
+      // @ts-ignore
       this.bindingsHolder
     );
     if (isRaw)
@@ -267,54 +242,6 @@ var IBMiQueryCompiler = class extends import_querycompiler.default {
       values
     };
   }
-  _prepUpdate(data = {}) {
-    const { counter = {} } = this.single;
-    for (const column of Object.keys(counter)) {
-      if ((0, import_has.default)(data, column)) {
-        this.client.logger.warn(
-          `increment/decrement called for a column that has already been specified in main .update() call. Ignoring increment/decrement and using value from .update() call.`
-        );
-        continue;
-      }
-      let value = counter[column];
-      const symbol = value < 0 ? "-" : "+";
-      if (symbol === "-") {
-        value = -value;
-      }
-      data[column] = this.client.raw(`?? ${symbol} ?`, [column, value]);
-    }
-    data = (0, import_omitBy.default)(data, (value) => typeof value === "undefined");
-    const vals = [];
-    const columns = Object.keys(data);
-    let i = -1;
-    while (++i < columns.length) {
-      vals.push(
-        (0, import_wrappingFormatter.wrap)(
-          columns[i],
-          void 0,
-          this.builder,
-          this.client,
-          this.bindingsHolder
-        ) + " = " + this.client.parameter(
-          data[columns[i]],
-          this.builder,
-          this.bindingsHolder
-        )
-      );
-    }
-    if ((0, import_isEmpty.default)(vals)) {
-      throw new Error(
-        [
-          "Empty .update() call detected!",
-          "Update data does not contain any values to update.",
-          "This will result in a faulty query.",
-          this.single.table ? `Table: ${this.single.table}.` : "",
-          this.single.update ? `Columns: ${Object.keys(this.single.update)}.` : ""
-        ].join(" ")
-      );
-    }
-    return vals;
-  }
 };
 var ibmi_querycompiler_default = IBMiQueryCompiler;
 
@@ -351,12 +278,6 @@ var DB2Client = class extends import_knex.default.Client {
   _driver() {
     return odbc;
   }
-  wrapIdentifierImpl(value) {
-    if (value.includes("knex_migrations")) {
-      return value.toUpperCase();
-    }
-    return value;
-  }
   printDebug(message) {
     if (process.env.DEBUG === "true") {
       this.logger.debug(message);
@@ -367,13 +288,13 @@ var DB2Client = class extends import_knex.default.Client {
   async acquireRawConnection() {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
-    console5.log(this._getConnectionString(connectionConfig));
+    console2.log(this._getConnectionString(connectionConfig));
     return await this.driver.pool(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) {
-    console5.log("destroy connection");
+    console2.log("destroy connection");
     return await connection.close();
   }
   _getConnectionString(connectionConfig) {
@@ -407,16 +328,15 @@ var DB2Client = class extends import_knex.default.Client {
           await statement.bind(obj.bindings);
         }
         const result = await statement.execute();
-        obj.response = { rows: [result.count], rowCount: result.count };
+        obj.response = { rowCount: result.count };
       } catch (err) {
-        console5.error(err);
+        console2.error(err);
         throw new Error(err);
       }
     }
-    console5.log({ obj });
     return obj;
   }
-  transaction() {
+  transaction(container, config, outerTx) {
     return new ibmi_transaction_default(this, ...arguments);
   }
   schemaCompiler() {
@@ -437,16 +357,16 @@ var DB2Client = class extends import_knex.default.Client {
     const resp = obj.response;
     const method = obj.sqlMethod;
     const { rows } = resp;
+    console2.log({ method, rows });
     if (obj.output)
       return obj.output.call(runner, resp);
     switch (method) {
       case "select":
+        return rows;
       case "pluck":
-      case "first": {
-        if (method === "pluck")
-          return rows.map(obj.pluck);
-        return method === "first" ? rows[0] : rows;
-      }
+        return rows.map(obj.pluck);
+      case "first":
+        return rows[0];
       case "insert":
       case "del":
       case "delete":

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import * as process from "process";
 import knex from "knex";
 import * as odbc from "odbc";
-import * as console5 from "console";
+import * as console2 from "console";
 
 // src/schema/ibmi-compiler.ts
 import SchemaCompiler from "knex/lib/schema/compiler";
@@ -13,11 +13,14 @@ var IBMiSchemaCompiler = class extends SchemaCompiler {
   }
   hasTable(tableName) {
     const formattedTable = this.client.parameter(
+      // @ts-ignore
       prefixedTableName(this.schema, tableName),
+      // @ts-ignore
       this.builder,
+      // @ts-ignore
       this.bindingsHolder
     );
-    const bindings = [tableName.toUpperCase()];
+    const bindings = [tableName];
     let sql = `SELECT TABLE_NAME FROM QSYS2.SYSTABLES WHERE TYPE = 'T' AND TABLE_NAME = ${formattedTable}`;
     if (this.schema) {
       sql += " AND TABLE_SCHEMA = ?";
@@ -48,50 +51,18 @@ var ibmi_compiler_default = IBMiSchemaCompiler;
 
 // src/schema/ibmi-tablecompiler.ts
 import TableCompiler from "knex/lib/schema/tablecompiler";
+import isObject from "lodash/isObject";
 var IBMiTableCompiler = class extends TableCompiler {
-  constructor(client, tableBuilder) {
-    super(client, tableBuilder);
-  }
-  unique(columns, indexName) {
-    let deferrable;
-    let useConstraint = false;
-    let predicate;
-    if (typeof indexName === "object") {
-      ({ indexName, deferrable, useConstraint, predicate } = indexName);
-    }
-    if (deferrable && deferrable !== "not deferrable") {
-      this.client.logger.warn(
-        `ibmi: unique index [${indexName}] will not be deferrable ${deferrable} because mssql does not support deferred constraints.`
-      );
-    }
-    if (useConstraint && predicate) {
-      throw new Error("ibmi cannot create constraint with predicate");
-    }
-    indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand("unique", this.tableNameRaw, columns);
-    if (!Array.isArray(columns)) {
-      columns = [columns];
-    }
-    if (useConstraint) {
-      this.pushQuery(
-        `ALTER TABLE ${this.tableName()} ADD CONSTRAINT ${indexName} UNIQUE (${this.formatter.columnize(
-          columns
-        )})`
-      );
-    } else {
-      const predicateQuery = predicate ? " " + this.client.queryCompiler(predicate).where() : " WHERE " + columns.map((column) => this.formatter.columnize(column) + " IS NOT NULL").join(" AND ");
-      this.pushQuery(
-        `CREATE UNIQUE INDEX ${indexName} ON ${this.tableName()} (${this.formatter.columnize(
-          columns
-        )})${predicateQuery}`
-      );
-    }
-  }
   createQuery(columns, ifNot, like) {
     let createStatement = ifNot ? `if object_id('${this.tableName()}', 'U') is null ` : "";
     if (like) {
       createStatement += `SELECT * INTO ${this.tableName()} FROM ${this.tableNameLike()} WHERE 0=1`;
     } else {
-      createStatement += "CREATE TABLE " + this.tableName() + (this._formatting ? " (\n    " : " (") + columns.sql.join(this._formatting ? ",\n    " : ", ") + this._addChecks() + ")";
+      createStatement += "CREATE TABLE " + // @ts-ignore
+      this.tableName() + // @ts-ignore
+      (this._formatting ? " (\n    " : " (") + // @ts-ignore
+      columns.sql.join(this._formatting ? ",\n    " : ", ") + // @ts-ignore
+      this._addChecks() + ")";
     }
     this.pushQuery(createStatement);
     if (this.single.comment) {
@@ -101,6 +72,29 @@ var IBMiTableCompiler = class extends TableCompiler {
       this.addColumns(columns, this.addColumnsPrefix);
     }
   }
+  dropUnique(columns, indexName) {
+    indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand("unique", this.tableNameRaw, columns);
+    this.pushQuery(`drop index ${indexName}`);
+  }
+  unique(columns, indexName) {
+    let deferrable;
+    let predicate;
+    if (isObject(indexName)) {
+      ({ indexName, deferrable, predicate } = indexName);
+    }
+    if (deferrable && deferrable !== "not deferrable") {
+      this.client.logger.warn(
+        `IBMi: unique index \`${indexName}\` will not be deferrable ${deferrable}.`
+      );
+    }
+    indexName = indexName ? this.formatter.wrap(indexName) : this._indexCommand("unique", this.tableNameRaw, columns);
+    columns = this.formatter.columnize(columns);
+    const predicateQuery = predicate ? " " + this.client.queryCompiler(predicate).where() : "";
+    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) {
     prefix = prefix || this.addColumnsPrefix;
@@ -109,7 +103,11 @@ var IBMiTableCompiler = class extends TableCompiler {
         return prefix + column;
       });
       this.pushQuery({
-        sql: (this.lowerCase ? "alter table " : "ALTER TABLE ") + this.tableName() + " " + columnSql.join(" "),
+        sql: (
+          // @ts-ignore
+          (this.lowerCase ? "alter table " : "ALTER TABLE ") + // @ts-ignore
+          this.tableName() + " " + columnSql.join(" ")
+        ),
         bindings: columns.bindings
       });
     }
@@ -122,32 +120,16 @@ var ibmi_tablecompiler_default = IBMiTableCompiler;
 
 // src/schema/ibmi-columncompiler.ts
 import ColumnCompiler from "knex/lib/schema/columncompiler";
-import * as console2 from "console";
 var IBMiColumnCompiler = class extends ColumnCompiler {
-  constructor(client, tableCompiler, columnBuilder) {
-    super(client, tableCompiler, columnBuilder);
-  }
   increments(options = { primaryKey: true }) {
-    return "int not null generated always as identity (start with 1, increment by 1)" + (this.tableCompiler._canBeAddPrimaryKey(options) ? " primary key" : "");
-  }
-  datetime(withoutTz = false, precision) {
-    let useTz;
-    if (isObject(withoutTz)) {
-      ({ useTz, precision } = withoutTz);
-    } else {
-      useTz = !withoutTz;
-    }
-    useTz = typeof useTz === "boolean" ? useTz : true;
-    precision = precision !== void 0 && precision !== null ? "(" + precision + ")" : "";
-    console2.log(useTz, precision);
-    return `${useTz ? "timestamptz" : "timestamp"}${precision}`;
+    return "int not null generated always as identity (start with 1, increment by 1)" + // @ts-ignore
+    (this.tableCompiler._canBeAddPrimaryKey(options) ? " primary key" : "");
   }
 };
 var ibmi_columncompiler_default = IBMiColumnCompiler;
 
 // src/execution/ibmi-transaction.ts
 import Transaction from "knex/lib/execution/transaction";
-import * as console3 from "console";
 var IBMiTransaction = class extends Transaction {
   async begin(conn) {
     const connection = await conn.connect();
@@ -155,7 +137,6 @@ var IBMiTransaction = class extends Transaction {
     return connection;
   }
   async rollback(conn) {
-    console3.log({ conn });
     const connection = await conn.connect();
     await connection.rollback();
     return connection;
@@ -169,34 +150,25 @@ var ibmi_transaction_default = IBMiTransaction;
 
 // src/query/ibmi-querycompiler.ts
 import QueryCompiler from "knex/lib/query/querycompiler";
-import has from "lodash/has";
-import isEmpty from "lodash/isEmpty";
-import omitBy from "lodash/omitBy";
 import isObject2 from "lodash/isObject";
-import {
-  wrap as wrap_,
-  rawOrFn as rawOrFn_
-} from "knex/lib/formatter/wrappingFormatter";
+import { rawOrFn as rawOrFn_ } from "knex/lib/formatter/wrappingFormatter";
 import { format } from "date-fns";
-import * as console4 from "console";
 var IBMiQueryCompiler = class extends QueryCompiler {
   _prepInsert(data) {
     if (isObject2(data)) {
-      console4.log("data is object", data);
       if (data.hasOwnProperty("migration_time")) {
-        console4.log("data has migration_time", data.migration_time);
         const parsed = new Date(data.migration_time);
-        console4.log(parsed);
         data.migration_time = format(parsed, "yyyy-MM-dd HH:mm:ss");
-        console4.log(data.migration_time);
       }
-      console4.log("data date after change", data);
     }
     const isRaw = rawOrFn_(
       data,
       void 0,
+      // @ts-ignore
       this.builder,
+      // @ts-ignore
       this.client,
+      // @ts-ignore
       this.bindingsHolder
     );
     if (isRaw)
@@ -235,54 +207,6 @@ var IBMiQueryCompiler = class extends QueryCompiler {
       values
     };
   }
-  _prepUpdate(data = {}) {
-    const { counter = {} } = this.single;
-    for (const column of Object.keys(counter)) {
-      if (has(data, column)) {
-        this.client.logger.warn(
-          `increment/decrement called for a column that has already been specified in main .update() call. Ignoring increment/decrement and using value from .update() call.`
-        );
-        continue;
-      }
-      let value = counter[column];
-      const symbol = value < 0 ? "-" : "+";
-      if (symbol === "-") {
-        value = -value;
-      }
-      data[column] = this.client.raw(`?? ${symbol} ?`, [column, value]);
-    }
-    data = omitBy(data, (value) => typeof value === "undefined");
-    const vals = [];
-    const columns = Object.keys(data);
-    let i = -1;
-    while (++i < columns.length) {
-      vals.push(
-        wrap_(
-          columns[i],
-          void 0,
-          this.builder,
-          this.client,
-          this.bindingsHolder
-        ) + " = " + this.client.parameter(
-          data[columns[i]],
-          this.builder,
-          this.bindingsHolder
-        )
-      );
-    }
-    if (isEmpty(vals)) {
-      throw new Error(
-        [
-          "Empty .update() call detected!",
-          "Update data does not contain any values to update.",
-          "This will result in a faulty query.",
-          this.single.table ? `Table: ${this.single.table}.` : "",
-          this.single.update ? `Columns: ${Object.keys(this.single.update)}.` : ""
-        ].join(" ")
-      );
-    }
-    return vals;
-  }
 };
 var ibmi_querycompiler_default = IBMiQueryCompiler;
 
@@ -319,12 +243,6 @@ var DB2Client = class extends knex.Client {
   _driver() {
     return odbc;
   }
-  wrapIdentifierImpl(value) {
-    if (value.includes("knex_migrations")) {
-      return value.toUpperCase();
-    }
-    return value;
-  }
   printDebug(message) {
     if (process.env.DEBUG === "true") {
       this.logger.debug(message);
@@ -335,13 +253,13 @@ var DB2Client = class extends knex.Client {
   async acquireRawConnection() {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
-    console5.log(this._getConnectionString(connectionConfig));
+    console2.log(this._getConnectionString(connectionConfig));
     return await this.driver.pool(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) {
-    console5.log("destroy connection");
+    console2.log("destroy connection");
     return await connection.close();
   }
   _getConnectionString(connectionConfig) {
@@ -375,16 +293,15 @@ var DB2Client = class extends knex.Client {
           await statement.bind(obj.bindings);
         }
         const result = await statement.execute();
-        obj.response = { rows: [result.count], rowCount: result.count };
+        obj.response = { rowCount: result.count };
       } catch (err) {
-        console5.error(err);
+        console2.error(err);
         throw new Error(err);
       }
     }
-    console5.log({ obj });
     return obj;
   }
-  transaction() {
+  transaction(container, config, outerTx) {
     return new ibmi_transaction_default(this, ...arguments);
   }
   schemaCompiler() {
@@ -405,16 +322,16 @@ var DB2Client = class extends knex.Client {
     const resp = obj.response;
     const method = obj.sqlMethod;
     const { rows } = resp;
+    console2.log({ method, rows });
     if (obj.output)
       return obj.output.call(runner, resp);
     switch (method) {
       case "select":
+        return rows;
       case "pluck":
-      case "first": {
-        if (method === "pluck")
-          return rows.map(obj.pluck);
-        return method === "first" ? rows[0] : rows;
-      }
+        return rows.map(obj.pluck);
+      case "first":
+        return rows[0];
       case "insert":
       case "del":
       case "delete":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bdkinc/knex-ibmi",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Knex dialect for IBMi",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/execution/ibmi-transaction.ts

@@ -1,6 +1,5 @@
 import Transaction from "knex/lib/execution/transaction";
 import * as console from "console";
-import { connect } from "odbc";
 
 class IBMiTransaction extends Transaction {
   async begin(conn) {
@@ -10,7 +9,6 @@ class IBMiTransaction extends Transaction {
   }
 
   async rollback(conn) {
-    console.log({ conn });
     const connection = await conn.connect();
     await connection.rollback();
     return connection;

package/src/index.ts

@@ -1,6 +1,6 @@
 import * as process from "process";
 import { Connection } from "odbc";
-import knex from "knex";
+import knex, { Knex } from "knex";
 import * as odbc from "odbc";
 import * as console from "console";
 import SchemaCompiler from "./schema/ibmi-compiler";
@@ -12,7 +12,6 @@ import QueryCompiler from "./query/ibmi-querycompiler";
 class DB2Client extends knex.Client {
   constructor(config) {
     super(config);
-
     this.driverName = "odbc";
 
     if (this.dialect && !this.config.client) {
@@ -49,15 +48,6 @@ class DB2Client extends knex.Client {
     return odbc;
   }
 
-  wrapIdentifierImpl(value: any) {
-    // override default wrapper ("). we don't want to use it since
-    // it makes identifiers case-sensitive in DB2
-    if (value.includes("knex_migrations")) {
-      return value.toUpperCase();
-    }
-    return value;
-  }
-
   printDebug(message: string) {
     if (process.env.DEBUG === "true") {
       // @ts-ignore
@@ -128,18 +118,17 @@ class DB2Client extends knex.Client {
           await statement.bind(obj.bindings);
         }
         const result = await statement.execute();
-        obj.response = { rows: [result.count], rowCount: result.count };
+        obj.response = { rowCount: result.count };
       } catch (err: any) {
         console.error(err);
         throw new Error(err);
       }
     }
-    console.log({ obj });
 
     return obj;
   }
 
-  transaction() {
+  transaction(container: any, config: any, outerTx: any): Knex.Transaction {
     // @ts-ignore
     return new Transaction(this, ...arguments);
   }
@@ -171,16 +160,17 @@ class DB2Client extends knex.Client {
     const resp = obj.response;
     const method = obj.sqlMethod;
     const { rows } = resp;
+    console.log({ method, rows });
 
     if (obj.output) return obj.output.call(runner, resp);
 
     switch (method) {
       case "select":
+        return rows;
       case "pluck":
-      case "first": {
-        if (method === "pluck") return rows.map(obj.pluck);
-        return method === "first" ? rows[0] : rows;
-      }
+        return rows.map(obj.pluck);
+      case "first":
+        return rows[0];
       case "insert":
       case "del":
       case "delete":

package/src/query/ibmi-querycompiler.ts

@@ -1,33 +1,26 @@
 import QueryCompiler from "knex/lib/query/querycompiler";
-import has from "lodash/has";
-import isEmpty from "lodash/isEmpty";
-import omitBy from "lodash/omitBy";
 import isObject from "lodash/isObject";
-import {
-  wrap as wrap_,
-  rawOrFn as rawOrFn_,
-} from "knex/lib/formatter/wrappingFormatter";
-import { format, parseISO } from "date-fns";
+import { rawOrFn as rawOrFn_ } from "knex/lib/formatter/wrappingFormatter";
+import { format } from "date-fns";
 import * as console from "console";
 
 class IBMiQueryCompiler extends QueryCompiler {
   _prepInsert(data) {
     if (isObject(data)) {
-      console.log("data is object", data);
       if (data.hasOwnProperty("migration_time")) {
-        console.log("data has migration_time", data.migration_time);
         const parsed = new Date(data.migration_time);
-        console.log(parsed);
         data.migration_time = format(parsed, "yyyy-MM-dd HH:mm:ss");
-        console.log(data.migration_time);
       }
-      console.log("data date after change", data);
     }
+
     const isRaw = rawOrFn_(
       data,
       undefined,
+      // @ts-ignore
       this.builder,
+      // @ts-ignore
       this.client,
+      // @ts-ignore
       this.bindingsHolder,
     );
     if (isRaw) return isRaw;
@@ -62,71 +55,6 @@ class IBMiQueryCompiler extends QueryCompiler {
       values,
     };
   }
-
-  _prepUpdate(data = {}): any[] {
-    const { counter = {} } = this.single;
-
-    for (const column of Object.keys(counter)) {
-      //Skip?
-      if (has(data, column)) {
-        //Needed?
-        this.client.logger.warn(
-          `increment/decrement called for a column that has already been specified in main .update() call. Ignoring increment/decrement and using value from .update() call.`,
-        );
-        continue;
-      }
-
-      let value = counter[column];
-
-      const symbol = value < 0 ? "-" : "+";
-
-      if (symbol === "-") {
-        value = -value;
-      }
-
-      data[column] = this.client.raw(`?? ${symbol} ?`, [column, value]);
-    }
-
-    data = omitBy(data, (value) => typeof value === "undefined");
-
-    const vals = [];
-    const columns = Object.keys(data);
-    let i = -1;
-
-    while (++i < columns.length) {
-      vals.push(
-        wrap_(
-          columns[i],
-          undefined,
-          this.builder,
-          this.client,
-          this.bindingsHolder,
-        ) +
-          " = " +
-          this.client.parameter(
-            data[columns[i]],
-            this.builder,
-            this.bindingsHolder,
-          ),
-      );
-    }
-
-    if (isEmpty(vals)) {
-      throw new Error(
-        [
-          "Empty .update() call detected!",
-          "Update data does not contain any values to update.",
-          "This will result in a faulty query.",
-          this.single.table ? `Table: ${this.single.table}.` : "",
-          this.single.update
-            ? `Columns: ${Object.keys(this.single.update)}.`
-            : "",
-        ].join(" "),
-      );
-    }
-
-    return vals;
-  }
 }
 
 export default IBMiQueryCompiler;

package/src/schema/ibmi-columncompiler.ts

@@ -1,34 +1,13 @@
 import ColumnCompiler from "knex/lib/schema/columncompiler";
-import * as console from "console";
 
 class IBMiColumnCompiler extends ColumnCompiler {
-  constructor(client, tableCompiler, columnBuilder) {
-    super(client, tableCompiler, columnBuilder);
-  }
-
   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" : "")
     );
   }
-
-  datetime(withoutTz = false, precision) {
-    let useTz;
-    if (isObject(withoutTz)) {
-      ({ useTz, precision } = withoutTz);
-    } else {
-      useTz = !withoutTz;
-    }
-    useTz = typeof useTz === "boolean" ? useTz : true;
-    precision =
-      precision !== undefined && precision !== null
-        ? "(" + precision + ")"
-        : "";
-
-    console.log(useTz, precision);
-    return `${useTz ? "timestamptz" : "timestamp"}${precision}`;
-  }
 }
 
 export default IBMiColumnCompiler;

package/src/schema/ibmi-compiler.ts

@@ -7,20 +7,27 @@ class IBMiSchemaCompiler extends SchemaCompiler {
   }
 
   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.toUpperCase()];
+    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,

package/src/schema/ibmi-tablecompiler.ts

@@ -1,98 +1,102 @@
 import TableCompiler from "knex/lib/schema/tablecompiler";
+import isObject from "lodash/isObject";
 
 class IBMiTableCompiler extends TableCompiler {
-  constructor(client, tableBuilder) {
-    super(client, tableBuilder);
-  }
-
-  unique(columns, indexName) {
-    /** @type {string | undefined} */
-    let deferrable;
-    let useConstraint = false;
-    let predicate;
-    if (typeof indexName === "object") {
-      ({ indexName, deferrable, useConstraint, predicate } = indexName);
-    }
-    if (deferrable && deferrable !== 'not deferrable') {
-      this.client.logger.warn(
-        `ibmi: unique index [${indexName}] will not be deferrable ${deferrable} because mssql does not support deferred constraints.`
-      );
-    }
-    if (useConstraint && predicate) {
-      throw new Error('ibmi cannot create constraint with predicate');
-    }
-    indexName = indexName
-      ? this.formatter.wrap(indexName)
-      : this._indexCommand('unique', this.tableNameRaw, columns);
-
-    if (!Array.isArray(columns)) {
-      columns = [columns];
-    }
-
-    if (useConstraint) {
-      // mssql supports unique indexes and unique constraints.
-      // unique indexes cannot be used with foreign key relationships hence unique constraints are used instead.
-      this.pushQuery(
-        `ALTER TABLE ${this.tableName()} ADD CONSTRAINT ${indexName} UNIQUE (${this.formatter.columnize(
-          columns
-        )})`
-      );
-    } else {
-      // default to making unique index that allows null https://stackoverflow.com/a/767702/360060
-      // to be more or less compatible with other DBs (if any of the columns is NULL then "duplicates" are allowed)
-      const predicateQuery = predicate
-        ? ' ' + this.client.queryCompiler(predicate).where()
-        : ' WHERE ' +
-        columns
-          .map((column) => this.formatter.columnize(column) + ' IS NOT NULL')
-          .join(' AND ');
-      this.pushQuery(
-        `CREATE UNIQUE INDEX ${indexName} ON ${this.tableName()} (${this.formatter.columnize(
-          columns
-        )})${predicateQuery}`
-      );
-    }
-  }
-
   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 (isObject(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(' '),