@bdkinc/knex-ibmi 0.0.4 → 0.0.5

package/README.md

@@ -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
 

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 console3 = __toESM(require("console"));
+var console2 = __toESM(require("console"));
 
 // src/schema/ibmi-compiler.ts
 var import_compiler = __toESM(require("knex/lib/schema/compiler"));
@@ -55,7 +55,7 @@ var IBMiSchemaCompiler = class extends import_compiler.default {
       // @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 = ?";
@@ -86,6 +86,7 @@ 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 {
   createQuery(columns, ifNot, like) {
     let createStatement = ifNot ? `if object_id('${this.tableName()}', 'U') is null ` : "";
@@ -106,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;
@@ -141,7 +165,6 @@ var ibmi_columncompiler_default = IBMiColumnCompiler;
 
 // src/execution/ibmi-transaction.ts
 var import_transaction = __toESM(require("knex/lib/execution/transaction"));
-var console2 = __toESM(require("console"));
 var IBMiTransaction = class extends import_transaction.default {
   async begin(conn) {
     const connection = await conn.connect();
@@ -149,7 +172,6 @@ var IBMiTransaction = class extends import_transaction.default {
     return connection;
   }
   async rollback(conn) {
-    console2.log({ conn });
     const connection = await conn.connect();
     await connection.rollback();
     return connection;
@@ -163,12 +185,12 @@ var ibmi_transaction_default = IBMiTransaction;
 
 // src/query/ibmi-querycompiler.ts
 var import_querycompiler = __toESM(require("knex/lib/query/querycompiler"));
-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 IBMiQueryCompiler = class extends import_querycompiler.default {
   _prepInsert(data) {
-    if ((0, import_isObject.default)(data)) {
+    if ((0, import_isObject2.default)(data)) {
       if (data.hasOwnProperty("migration_time")) {
         const parsed = new Date(data.migration_time);
         data.migration_time = (0, import_date_fns.format)(parsed, "yyyy-MM-dd HH:mm:ss");
@@ -256,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);
@@ -272,13 +288,13 @@ var DB2Client = class extends import_knex.default.Client {
   async acquireRawConnection() {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
-    console3.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) {
-    console3.log("destroy connection");
+    console2.log("destroy connection");
     return await connection.close();
   }
   _getConnectionString(connectionConfig) {
@@ -312,13 +328,12 @@ 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) {
-        console3.error(err);
+        console2.error(err);
         throw new Error(err);
       }
     }
-    console3.log({ obj });
     return obj;
   }
   transaction(container, config, outerTx) {
@@ -342,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 console3 from "console";
+import * as console2 from "console";
 
 // src/schema/ibmi-compiler.ts
 import SchemaCompiler from "knex/lib/schema/compiler";
@@ -20,7 +20,7 @@ var IBMiSchemaCompiler = class extends SchemaCompiler {
       // @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 = ?";
@@ -51,6 +51,7 @@ 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 {
   createQuery(columns, ifNot, like) {
     let createStatement = ifNot ? `if object_id('${this.tableName()}', 'U') is null ` : "";
@@ -71,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;
@@ -106,7 +130,6 @@ var ibmi_columncompiler_default = IBMiColumnCompiler;
 
 // src/execution/ibmi-transaction.ts
 import Transaction from "knex/lib/execution/transaction";
-import * as console2 from "console";
 var IBMiTransaction = class extends Transaction {
   async begin(conn) {
     const connection = await conn.connect();
@@ -114,7 +137,6 @@ var IBMiTransaction = class extends Transaction {
     return connection;
   }
   async rollback(conn) {
-    console2.log({ conn });
     const connection = await conn.connect();
     await connection.rollback();
     return connection;
@@ -128,12 +150,12 @@ var ibmi_transaction_default = IBMiTransaction;
 
 // src/query/ibmi-querycompiler.ts
 import QueryCompiler from "knex/lib/query/querycompiler";
-import isObject from "lodash/isObject";
+import isObject2 from "lodash/isObject";
 import { rawOrFn as rawOrFn_ } from "knex/lib/formatter/wrappingFormatter";
 import { format } from "date-fns";
 var IBMiQueryCompiler = class extends QueryCompiler {
   _prepInsert(data) {
-    if (isObject(data)) {
+    if (isObject2(data)) {
       if (data.hasOwnProperty("migration_time")) {
         const parsed = new Date(data.migration_time);
         data.migration_time = format(parsed, "yyyy-MM-dd HH:mm:ss");
@@ -221,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);
@@ -237,13 +253,13 @@ var DB2Client = class extends knex.Client {
   async acquireRawConnection() {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
-    console3.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) {
-    console3.log("destroy connection");
+    console2.log("destroy connection");
     return await connection.close();
   }
   _getConnectionString(connectionConfig) {
@@ -277,13 +293,12 @@ 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) {
-        console3.error(err);
+        console2.error(err);
         throw new Error(err);
       }
     }
-    console3.log({ obj });
     return obj;
   }
   transaction(container, config, outerTx) {
@@ -307,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.4",
+  "version": "0.0.5",
   "description": "Knex dialect for IBMi",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/execution/ibmi-transaction.ts

@@ -9,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

@@ -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,13 +118,12 @@ 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;
   }
@@ -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

@@ -2,6 +2,7 @@ import QueryCompiler from "knex/lib/query/querycompiler";
 import isObject from "lodash/isObject";
 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) {

package/src/schema/ibmi-compiler.ts

@@ -16,7 +16,7 @@ class IBMiSchemaCompiler extends SchemaCompiler {
       // @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}`;

package/src/schema/ibmi-tablecompiler.ts

@@ -1,4 +1,5 @@
 import TableCompiler from "knex/lib/schema/tablecompiler";
+import isObject from "lodash/isObject";
 
 class IBMiTableCompiler extends TableCompiler {
   createQuery(columns, ifNot, like) {
@@ -39,6 +40,48 @@ class IBMiTableCompiler extends TableCompiler {
     }
   }
 
+  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