@bdkinc/knex-ibmi 0.1.7 → 0.2.2

package/src/execution/ibmi-transaction.js

@@ -1,99 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-ignore
-var transaction_1 = require("knex/lib/execution/transaction");
-var IBMiTransaction = /** @class */ (function (_super) {
-    __extends(IBMiTransaction, _super);
-    function IBMiTransaction() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    IBMiTransaction.prototype.begin = function (connection) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, connection.beginTransaction()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, connection];
-                }
-            });
-        });
-    };
-    IBMiTransaction.prototype.rollback = function (connection) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, connection.rollback()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, connection];
-                }
-            });
-        });
-    };
-    IBMiTransaction.prototype.commit = function (connection) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, connection.commit()];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/, connection];
-                }
-            });
-        });
-    };
-    return IBMiTransaction;
-}(transaction_1.default));
-exports.default = IBMiTransaction;

package/src/execution/ibmi-transaction.ts

@@ -1,21 +0,0 @@
-// @ts-ignore
-import Transaction from "knex/lib/execution/transaction";
-
-class IBMiTransaction extends Transaction {
-  async begin(connection: any) {
-    await connection.beginTransaction();
-    return connection;
-  }
-
-  async rollback(connection: any) {
-    await connection.rollback();
-    return connection;
-  }
-
-  async commit(connection: any) {
-    await connection.commit();
-    return connection;
-  }
-}
-
-export default IBMiTransaction;

package/src/index.ts

@@ -1,293 +0,0 @@
-import * as process from "process";
-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 Transaction from "./execution/ibmi-transaction";
-import QueryCompiler from "./query/ibmi-querycompiler";
-
-class DB2Client extends knex.Client {
-  constructor(config: Knex.Config<DB2Config>) {
-    super(config);
-    this.driverName = "odbc";
-
-    if (this.dialect && !this.config.client) {
-      this.printWarn(
-        `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: string) {
-    if (process.env.DEBUG === "true") {
-      // @ts-ignore
-      this.logger.debug("knex-ibmi: " + message);
-    }
-  }
-
-  printError(message: string) {
-    if (process.env.DEBUG === "true") {
-      // @ts-ignore
-      this.logger.error("knex-ibmi: " + message);
-    }
-  }
-
-  printWarn(message: string) {
-    if (process.env.DEBUG === "true") {
-      // @ts-ignore
-      this.logger.warn("knex-ibmi: " + 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;
-
-    this.printDebug(
-      // @ts-ignore
-      "connection config: " + this._getConnectionString(connectionConfig),
-    );
-
-    if (this.config?.pool) {
-      // @ts-ignore
-      const poolConfig = {
-        // @ts-ignore
-        connectionString: this._getConnectionString(connectionConfig),
-        connectionTimeout: this.config?.acquireConnectionTimeout || 60000,
-        initialSize: this.config?.pool?.min || 2,
-        maxSize: this.config?.pool?.max || 10,
-        reuseConnection: true,
-      };
-      const pool = await this.driver.pool(poolConfig);
-      return await pool.connect();
-    }
-
-    return await this.driver.connect(
-      // @ts-ignore
-      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: Connection) {
-    this.printDebug("destroy connection");
-    return await connection.close();
-  }
-
-  _getConnectionString(connectionConfig: DB2ConnectionConfig) {
-    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
-  async _query(connection: any, obj: any) {
-    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: any = await connection.query(obj.sql, obj.bindings);
-      if (rows) {
-        obj.response = { rows, rowCount: rows.length };
-      }
-    } else {
-      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.printDebug(result);
-        // this is hacky we check the SQL for the ID column
-        // 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: { [x: string]: any }) =>
-              result.columns && result.columns?.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: any) {
-        this.printDebug(err);
-        console.error(err)
-        throw new Error(err)
-      }
-    }
-
-    this.printDebug(obj);
-
-    return obj;
-  }
-
-  transaction(container: any, config: any, outerTx: any): Knex.Transaction {
-    // @ts-ignore
-    return new Transaction(this, ...arguments);
-  }
-
-  schemaCompiler() {
-    // @ts-ignore
-    return new SchemaCompiler(this, ...arguments);
-  }
-
-  tableCompiler() {
-    // @ts-ignore
-    return new TableCompiler(this, ...arguments);
-  }
-
-  columnCompiler() {
-    // @ts-ignore
-    return new ColumnCompiler(this, ...arguments);
-  }
-
-  queryCompiler() {
-    // @ts-ignore
-    return new QueryCompiler(this, ...arguments);
-  }
-
-  processResponse(obj: any, runner: any) {
-    if (obj === null) return null;
-
-    const resp = obj.response;
-    const method = obj.sqlMethod;
-    if (!resp) {
-      this.printDebug("response undefined" + obj);
-    }
-    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;
-    }
-  }
-}
-
-interface DB2PoolConfig {
-  min?: number;
-  max?: number;
-  acquireConnectionTimeout?: 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;
-  ALLOWPROCCALLS?: 0 | 1;
-}
-
-interface DB2ConnectionConfig {
-  database: string;
-  host: string;
-  port: 50000 | number;
-  user: string;
-  password: string;
-  driver: "IBM i Access ODBC Driver" | string;
-  connectionStringParams?: DB2ConnectionParams;
-}
-
-export interface DB2Config {
-  client: any;
-  connection: DB2ConnectionConfig;
-  pool?: DB2PoolConfig;
-}
-
-export const DB2Dialect = DB2Client;
-export default DB2Client;

package/src/knex-shim.d.ts

@@ -1,283 +0,0 @@
-declare module "knex/lib/execution/transaction" {
-  import { EventEmitter } from "node:events";
-  import { Knex } from "knex";
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
-  interface Transaction extends Knex.Transaction {}
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
-  class Transaction extends EventEmitter {
-    constructor(client: Knex.Client, container: any, config: any, outerTx: any);
-  }
-
-  export default Transaction;
-}
-
-declare module "knex/lib/query/querycompiler" {
-  // eslint-disable-next-line no-duplicate-imports
-  import { Knex } from "knex";
-
-  class QueryCompiler {
-    client: Knex.Client;
-    method: string;
-    options: any;
-    single: any;
-    queryComments: any[];
-    timeout: boolean;
-    cancelOnTimeout: boolean;
-    grouped: any;
-    formatter: any;
-    _emptyInsertValue: string;
-    first: () => any;
-    bindings: any[];
-    bindingsHolder: this;
-    builder: any;
-    tableName: string;
-
-    constructor(
-      client: Knex.Client,
-      builder: Knex.QueryBuilder,
-      bindings?: any,
-    );
-    toSQL(
-      method,
-      tz,
-    ): {
-      method: string;
-      options: any;
-      timeout: boolean;
-      cancelOnTimeout: boolean;
-      bindings: any[];
-      __knexQueryUid: string;
-      toNative: () => { sql: string; bindings: any[] };
-      sql?: string;
-      as?: string;
-    };
-
-    select(): string;
-    insert(): string | { sql: string; returning?: any };
-    with(): string;
-    comments(): string;
-    columns(): string;
-    join(): string;
-    where(): string;
-    union(): string;
-    group(): string;
-    having(): string;
-    order(): string;
-    limit(): string;
-    offset(): string;
-    lock(): string;
-    waitMode(): string;
-    wrap(str: string): string;
-
-    // Internal methods
-    _buildInsertValues(insertData: any): string;
-    _prepUpdate(data: any): any;
-  }
-
-  export default QueryCompiler;
-}
-
-declare module "knex/lib/schema/tablecompiler" {
-  // Eslint gets dumb about this
-  // eslint-disable-next-line no-duplicate-imports
-  import { Knex } from "knex";
-
-  class TableCompiler {
-    constructor(client: Knex.Client, tableBuilder?: Knex.TableBuilder);
-
-    client: Knex.Client;
-    tableBuilder: Knex.TableBuilder;
-    _commonBuilder: Knex.TableBuilder;
-    method: string;
-    schemaNameRaw: string;
-    tableNameRaw: string;
-    tableNameLikeRaw: string;
-    single: any;
-    grouped: any;
-    formatter: any;
-    bindings: any[];
-    bindingsHolder: this;
-    sequence: any[];
-    _formatting: boolean;
-    checksCount: number;
-
-    toSQL(): any[];
-    create(ifNot: boolean, like: boolean): void;
-    createIfNot(): void;
-    createLike(): void;
-    createLikeIfNot(): void;
-    alter(): void;
-    foreign(foreignData: any): void;
-    getColumnTypes(columns: any[]): any;
-    columnQueries(columns: any[]): void;
-    addColumns(columns: any[], prefix?: string): void;
-    alterColumns(columns: any[], colBuilders: any[]): void;
-    getColumns(method?: string): any[];
-    tableName(): string;
-    tableNameLike(): string;
-    alterTable(): void;
-    alterTableForCreate(columnTypes: any): void;
-    dropIndex(value: string): void;
-    dropUnique(columns: string | string[], indexName: string): void;
-    dropForeign(): void;
-    dropColumn(): void;
-    _setNullableState(column: string, nullable: boolean): void;
-    setNullable(column: string): void;
-    dropNullable(column: string): void;
-    dropChecks(checkConstraintNames: string[]): void;
-    check(
-      checkPredicate: string,
-      bindings: any[],
-      constraintName: string,
-    ): void;
-    _addChecks(): string;
-    _indexCommand(type: string, tableName: string, columns: string[]): string;
-    _getPrimaryKeys(): any[];
-    _canBeAddPrimaryKey(options: any): boolean;
-    _getIncrementsColumnNames(): any[];
-    _getBigIncrementsColumnNames(): any[];
-
-    pushQuery(query: string | { sql: string; bindings: any }): void;
-    pushAdditional(fn: any): void;
-    unshiftQuery(query: string | { sql: string; bindings: any }): void;
-
-    lowerCase: boolean;
-    createAlterTableMethods: any;
-    addColumnsPrefix: string;
-    alterColumnsPrefix: string;
-    modifyColumnPrefix: string;
-    dropColumnPrefix: string;
-
-    comment(val: any): void;
-  }
-
-  export default TableCompiler;
-}
-
-declare module "knex/lib/schema/columncompiler" {
-  // Eslint gets dumb about this
-  // eslint-disable-next-line no-duplicate-imports
-  import { Knex } from "knex";
-  import TableCompiler from "knex/lib/schema/tablecompiler";
-
-  class ColumnCompiler {
-    constructor(
-      client: Knex.Client,
-      tableCompiler?: TableCompiler,
-      columnBuilder?: Knex.ColumnBuilder,
-    );
-
-    client: Knex.Client;
-    tableCompiler: TableCompiler;
-    columnBuilder: Knex.ColumnBuilder;
-    _commonBuilder: Knex.ColumnBuilder;
-    args: any[];
-    type: string;
-    grouped: any;
-    modified: any;
-    isIncrements: boolean;
-    formatter: any;
-    bindings: any[];
-    bindingsHolder: this;
-    sequence: any[];
-    modifiers: string[];
-    checksCount: number;
-    _columnType: string;
-
-    _addCheckModifiers(): void;
-    defaults(label: string): any;
-    toSQL(): any[];
-    compileColumn(): string;
-    getColumnName(): string;
-    getColumnType(): string;
-    getModifiers(): string;
-
-    varchar(length: number): string;
-    floating(precision: number, scale: number): string;
-    decimal(precision: number, scale: number): string;
-    specifictype(type: string): string;
-
-    nullable(nullable: boolean): string;
-    notNullable(): string;
-    defaultTo(value: any): string;
-    increments(options?: { primaryKey: boolean }): string;
-    bigincrements(options?: { primaryKey: boolean }): string;
-
-    _pushAlterCheckQuery(checkPredicate: string, constraintName: string): void;
-    _checkConstraintName(constraintName: string): string;
-    _check(checkPredicate: string, constraintName: string): string;
-    checkPositive(constraintName: string): string;
-    checkNegative(constraintName: string): string;
-    _checkIn(values: any[], constraintName: string, not?: boolean): string;
-    checkIn(values: any[], constraintName: string): string;
-    checkNotIn(values: any[], constraintName: string): string;
-    checkBetween(intervals: any[], constraintName: string): string;
-    checkLength(
-      operator: string,
-      length: number,
-      constraintName: string,
-    ): string;
-  }
-
-  export default ColumnCompiler;
-}
-
-declare module "knex/lib/schema/compiler" {
-  // Eslint gets dumb about this
-  // eslint-disable-next-line no-duplicate-imports
-  import { Knex } from "knex";
-
-  class SchemaCompiler {
-    constructor(client: Knex.Client, builder?: Knex.TableBuilder);
-
-    client: Knex.Client;
-    builder: Knex.TableBuilder;
-    _commonBuilder: Knex.TableBuilder;
-    schema: any;
-    bindings: any[];
-    bindingsHolder: this;
-    formatter: any;
-    sequence: any[];
-    dropTablePrefix: string;
-    dropViewPrefix: string;
-    dropMaterializedViewPrefix: string;
-    alterViewPrefix: string;
-
-    createSchema(): void;
-    createSchemaIfNotExists(): void;
-    dropSchema(): void;
-    dropSchemaIfExists(): void;
-    dropTable(tableName: string): void;
-    dropTableIfExists(tableName: string): void;
-    dropView(viewName: string): void;
-    dropViewIfExists(viewName: string): void;
-    dropMaterializedView(viewName: string): void;
-    dropMaterializedViewIfExists(viewName: string): void;
-    renameView(from: string, to: string): void;
-    refreshMaterializedView(): void;
-    _dropView(viewName: string, ifExists: boolean, materialized: boolean): void;
-    raw(sql: string, bindings: any[]): void;
-    toSQL(): any[];
-    generateDdlCommands(): Promise<any>;
-    alterTable(): any;
-    createTable(): any;
-    createTableIfNotExists(): any;
-    createTableLike(): any;
-    createView(): any;
-    createViewOrReplace(): any;
-    createMaterializedView(): any;
-    alterView(): any;
-    pushQuery(): void;
-    pushAdditional(): void;
-    unshiftQuery(): void;
-
-    pushQuery(
-      query: string | { sql: string; bindings: any; output: any },
-    ): void;
-    pushAdditional(fn: any): void;
-    unshiftQuery(query: string | { sql: string; bindings: any }): void;
-  }
-
-  export default SchemaCompiler;
-}