@bdkinc/knex-ibmi 0.0.2 → 0.0.4

package/README.md

@@ -1,23 +1,24 @@
-[![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. Use at your own risk. Please submit an issue for any bugs encounter or any questions you have.**
+**Disclaimer: this library is in early stages of development. Please submit an issue for any bugs encounter or any questions you have.**
 
 ## Description
 
 This is an external dialect for [knex](https://github.com/tgriesser/knex). This library uses the ODBC driver and is only tested on IBMi. Here are the IBM OSS Docs https://ibmi-oss-docs.readthedocs.io/en/latest/odbc/README.html
 
+## Supported functionality
+
+- Query building
+- Query execution (see [Limitations](#Limitations))
+- Transactions
+
 ## Limitations
 
-Currently this dialect has limited functionality compared to the Knex built-in dialects. Below are some of the limitations:
+Currently, this dialect has limited functionality compared to the Knex built-in dialects. Below are some of the limitations:
 
-- No transaction support
 - No streaming support
 - Possibly other missing functionality
-
-## Supported functionality
-
-- Query building
-- Query execution (see [Limitations](#Limitations))
+- Uses a pool for all connections
 
 ## Installing
 
@@ -105,11 +106,21 @@ 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:
 
 ```
-[IBM i Access ODBC Driver 64-bit]       <= driver name enclosed in square brackets
+[IBM i Access ODBC Driver] <== driver name in square brackets
+Description=IBM i Access for Linux ODBC Driver
+Driver=/opt/ibm/iaccess/lib/libcwbodbc.so
+Setup=/opt/ibm/iaccess/lib/libcwbodbcs.so
+Driver64=/opt/ibm/iaccess/lib64/libcwbodbc.so
+Setup64=/opt/ibm/iaccess/lib64/libcwbodbcs.so
+Threading=0
+DontDLClose=1
+UsageCount=1
+
+[IBM i Access ODBC Driver 64-bit]
 Description=IBM i Access for Linux 64-bit ODBC Driver
 Driver=/opt/ibm/iaccess/lib64/libcwbodbc.so
 Setup=/opt/ibm/iaccess/lib64/libcwbodbcs.so

package/dist/index.js

@@ -1,138 +1,371 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  DB2Dialect: () => DB2Dialect,
-  default: () => src_default
-});
-module.exports = __toCommonJS(src_exports);
-var process = __toESM(require("process"));
-var import_knex = __toESM(require("knex"));
-var odbc = __toESM(require("odbc"));
-var DB2Client = class extends import_knex.default.Client {
-  constructor(config = {}) {
-    super(config);
-    this.driverName = "odbc";
-    if (this.driverName && config.connection) {
-      this.initializeDriver();
-      if (!config.pool || config.pool && config.pool.max !== 0) {
-        this.initializePool(config);
-      }
-    }
-  }
-  _driver() {
-    return odbc;
-  }
-  wrapIdentifierImpl(value) {
-    return value;
-  }
-  printDebug(message) {
-    if (process.env.DEBUG === "true") {
-      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() {
-    this.printDebug("acquiring raw connection");
-    const connectionConfig = this.config.connection;
-    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) {
-    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.method !== "raw" ? obj.method : obj.sql.split(" ")[0]).toLowerCase();
-    obj.sqlMethod = method;
-    if (method === "select" || method === "first" || method === "pluck") {
-      const rows = await connection.query(obj.sql, obj.bindings);
-      if (rows) {
-        obj.response = { rows, rowCount: rows.length };
-      }
-      return obj;
-    }
-    const statement = await connection.createStatement();
-    await statement.prepare(obj.sql);
-    await statement.bind(obj.bindings);
-    obj.response = await statement.execute();
-    return obj;
-  }
-  processResponse(obj, runner) {
-    if (obj === null)
-      return null;
-    const resp = obj.response;
-    const method = obj.sqlMethod;
-    const { rows } = resp;
-    if (obj.output)
-      return obj.output.call(runner, resp);
-    switch (method) {
-      case "select":
-      case "pluck":
-      case "first": {
-        if (method === "pluck")
-          return rows.map(obj.pluck);
-        return method === "first" ? rows[0] : rows;
-      }
-      case "insert":
-      case "del":
-      case "delete":
-      case "update":
-      case "counter":
-        return resp.rowCount;
-      default:
-        return resp;
-    }
-  }
-};
-var DB2Dialect = DB2Client;
-var src_default = DB2Client;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DB2Dialect
-});
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/index.ts
+var src_exports = {};
+__export(src_exports, {
+  DB2Dialect: () => DB2Dialect,
+  default: () => src_default
+});
+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"));
+
+// src/schema/ibmi-compiler.ts
+var import_compiler = __toESM(require("knex/lib/schema/compiler"));
+var console = __toESM(require("console"));
+var IBMiSchemaCompiler = class extends import_compiler.default {
+  constructor(client, builder) {
+    super(client, builder);
+  }
+  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()];
+    let sql = `SELECT TABLE_NAME FROM QSYS2.SYSTABLES WHERE TYPE = 'T' AND TABLE_NAME = ${formattedTable}`;
+    if (this.schema) {
+      sql += " AND TABLE_SCHEMA = ?";
+      bindings.push(this.schema);
+    }
+    this.pushQuery({
+      sql,
+      bindings,
+      output: (resp) => {
+        return resp.rowCount > 0;
+      }
+    });
+  }
+  toSQL() {
+    const sequence = this.builder._sequence;
+    for (let i = 0, l = sequence.length; i < l; i++) {
+      const query = sequence[i];
+      console.log(query.method, query);
+      this[query.method].apply(this, query.args);
+    }
+    return this.sequence;
+  }
+};
+function prefixedTableName(prefix, table) {
+  return prefix ? `${prefix}.${table}` : table;
+}
+var ibmi_compiler_default = IBMiSchemaCompiler;
+
+// src/schema/ibmi-tablecompiler.ts
+var import_tablecompiler = __toESM(require("knex/lib/schema/tablecompiler"));
+var IBMiTableCompiler = class extends import_tablecompiler.default {
+  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 " + // @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) {
+      this.comment(this.single.comment);
+    }
+    if (like) {
+      this.addColumns(columns, this.addColumnsPrefix);
+    }
+  }
+  // All of the columns to "add" for the query
+  addColumns(columns, prefix) {
+    prefix = prefix || this.addColumnsPrefix;
+    if (columns.sql.length > 0) {
+      const columnSql = columns.sql.map((column) => {
+        return prefix + column;
+      });
+      this.pushQuery({
+        sql: (
+          // @ts-ignore
+          (this.lowerCase ? "alter table " : "ALTER TABLE ") + // @ts-ignore
+          this.tableName() + " " + columnSql.join(" ")
+        ),
+        bindings: columns.bindings
+      });
+    }
+  }
+  async commit(conn, value) {
+    return await conn.commit();
+  }
+};
+var ibmi_tablecompiler_default = IBMiTableCompiler;
+
+// src/schema/ibmi-columncompiler.ts
+var import_columncompiler = __toESM(require("knex/lib/schema/columncompiler"));
+var IBMiColumnCompiler = class extends import_columncompiler.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" : "");
+  }
+};
+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();
+    await connection.beginTransaction();
+    return connection;
+  }
+  async rollback(conn) {
+    console2.log({ conn });
+    const connection = await conn.connect();
+    await connection.rollback();
+    return connection;
+  }
+  async commit(conn) {
+    await conn.commit();
+    return conn;
+  }
+};
+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_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 (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");
+      }
+    }
+    const isRaw = (0, import_wrappingFormatter.rawOrFn)(
+      data,
+      void 0,
+      // @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, void 0);
+          }
+          row.splice(idx, 0, void 0);
+        }
+        row[idx] = data[i][key];
+      }
+      values.push(row);
+    }
+    return {
+      columns,
+      values
+    };
+  }
+};
+var ibmi_querycompiler_default = IBMiQueryCompiler;
+
+// src/index.ts
+var DB2Client = class extends import_knex.default.Client {
+  constructor(config) {
+    super(config);
+    this.driverName = "odbc";
+    if (this.dialect && !this.config.client) {
+      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;
+  }
+  wrapIdentifierImpl(value) {
+    if (value.includes("knex_migrations")) {
+      return value.toUpperCase();
+    }
+    return value;
+  }
+  printDebug(message) {
+    if (process.env.DEBUG === "true") {
+      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() {
+    this.printDebug("acquiring raw connection");
+    const connectionConfig = this.config.connection;
+    console3.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");
+    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(pool, 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;
+    if (method === "select" || method === "first" || method === "pluck") {
+      const rows = await pool.query(obj.sql, obj.bindings);
+      if (rows) {
+        obj.response = { rows, rowCount: rows.length };
+      }
+    } else {
+      try {
+        const connection = await pool.connect();
+        const statement = await connection.createStatement();
+        await statement.prepare(obj.sql);
+        if (obj.bindings) {
+          await statement.bind(obj.bindings);
+        }
+        const result = await statement.execute();
+        obj.response = { rows: [result.count], rowCount: result.count };
+      } catch (err) {
+        console3.error(err);
+        throw new Error(err);
+      }
+    }
+    console3.log({ obj });
+    return obj;
+  }
+  transaction(container, config, outerTx) {
+    return new ibmi_transaction_default(this, ...arguments);
+  }
+  schemaCompiler() {
+    return new ibmi_compiler_default(this, ...arguments);
+  }
+  tableCompiler() {
+    return new ibmi_tablecompiler_default(this, ...arguments);
+  }
+  columnCompiler() {
+    return new ibmi_columncompiler_default(this, ...arguments);
+  }
+  queryCompiler() {
+    return new ibmi_querycompiler_default(this, ...arguments);
+  }
+  processResponse(obj, runner) {
+    if (obj === null)
+      return null;
+    const resp = obj.response;
+    const method = obj.sqlMethod;
+    const { rows } = resp;
+    if (obj.output)
+      return obj.output.call(runner, resp);
+    switch (method) {
+      case "select":
+      case "pluck":
+      case "first": {
+        if (method === "pluck")
+          return rows.map(obj.pluck);
+        return method === "first" ? rows[0] : rows;
+      }
+      case "insert":
+      case "del":
+      case "delete":
+      case "update":
+      case "counter":
+        return resp.rowCount;
+      default:
+        return resp;
+    }
+  }
+};
+var DB2Dialect = DB2Client;
+var src_default = DB2Client;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DB2Dialect
+});