@bdkinc/knex-ibmi 0.0.33 → 0.0.35

package/README.md

@@ -110,7 +110,6 @@ or as Typescript
 import { knex } from "knex";
 import { Db2Dialect, DB2Config } from "@bdkinc/knex-ibmi";
 
-
 const config: DB2Config = {
   client: Db2Dialect,
   connection: {
@@ -129,7 +128,7 @@ const config: DB2Config = {
     min: 2,
     max: 10,
   },
-}
+};
 
 const db = knex(config);
 
@@ -145,10 +144,6 @@ try {
 
 ## Pooling
 
-There are 2 different pooling configurations, Tarn pooling and the Node-ODBC pooling. 
-Where the pool property is positioned dictates which pooling is used. To use node-odbc pooling the pool object needs to 
-be a property inside the connection object. Examples below
-
 Tarn Pooling Configuration
 
 ```javascript
@@ -169,30 +164,7 @@ const db = knex({
   pool: {
     min: 2,
     max: 10,
-  },
-});
-```
-
-Node-ODBC Pooling Configuration
-
-```javascript
-const db = knex({
-  client: Db2Dialect,
-  connection: {
-    host: "localhost",
-    database: "knextest",
-    port: 50000,
-    user: "<user>",
-    password: "<password>",
-    driver: "IBM i Access ODBC Driver",
-    connectionStringParams: {
-      ALLOWPROCCALLS: 1,
-      CMT: 0,
-    },
-    pool: {
-      min: 2,
-      max: 10,
-    },
+    acquireConnectionTimeout: 6000,
   },
 });
 ```

package/dist/index.d.ts

@@ -57,8 +57,9 @@ declare class DB2Client extends knex.Client {
     processResponse(obj: any, runner: any): any;
 }
 interface DB2PoolConfig {
-    min: number;
-    max: number;
+    min?: number;
+    max?: number;
+    acquireConnectionTimeout?: number;
 }
 interface DB2ConnectionParams {
     CMT?: number;
@@ -83,7 +84,6 @@ interface DB2ConnectionConfig {
     password: string;
     driver: "IBM i Access ODBC Driver" | string;
     connectionStringParams?: DB2ConnectionParams;
-    pool?: DB2PoolConfig;
 }
 interface DB2Config {
     client: any;

package/dist/index.js

@@ -37,7 +37,7 @@ module.exports = __toCommonJS(src_exports);
 var process = __toESM(require("process"));
 var import_knex = require("knex");
 var odbc = __toESM(require("odbc"));
-var console2 = __toESM(require("console"));
+var console = __toESM(require("console"));
 
 // src/schema/ibmi-compiler.ts
 var import_compiler = __toESM(require("knex/lib/schema/compiler"));
@@ -182,7 +182,6 @@ var import_isObject2 = __toESM(require("lodash/isObject"));
 var import_wrappingFormatter = require("knex/lib/formatter/wrappingFormatter");
 var import_date_fns = require("date-fns");
 var import_isEmpty = __toESM(require("lodash/isEmpty"));
-var console = __toESM(require("console"));
 var IBMiQueryCompiler = class extends import_querycompiler.default {
   insert() {
     const insertValues = this.single.insert || [];
@@ -294,18 +293,6 @@ var IBMiQueryCompiler = class extends import_querycompiler.default {
     const limit = this.limit();
     const { returning } = this.single;
     const values = Object.values(this.single.update).map((a) => `${a}`).join(", ");
-    console.log({
-      returning,
-      // @ts-ignore
-      where,
-      // @ts-ignore
-      updates,
-      // @ts-ignore
-      single: this.single.update,
-      // @ts-ignore
-      grouped: this.grouped.where,
-      values
-    });
     const moreWheres = (
       // @ts-ignore
       this.grouped.where && this.grouped.where.length > 0 ? (
@@ -401,18 +388,18 @@ var DB2Client = class extends import_knex.knex.Client {
   async acquireRawConnection() {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
-    console2.log(this._getConnectionString(connectionConfig));
-    if (this.config?.connection?.pool) {
+    console.log("knex-ibmi: ", this._getConnectionString(connectionConfig));
+    if (this.config?.pool) {
       const poolConfig = {
         connectionString: this._getConnectionString(connectionConfig),
         connectionTimeout: (
           // @ts-ignore
-          this.config?.connection?.acquireConnectionTimeout || 6e4
+          this.config?.acquireConnectionTimeout || 6e4
         ),
         // @ts-ignore
-        initialSize: this.config?.connection?.pool?.min || 2,
+        initialSize: this.config?.pool?.min || 2,
         // @ts-ignore
-        maxSize: this.config?.connection?.pool?.max || 10,
+        maxSize: this.config?.pool?.max || 10,
         reuseConnection: true
       };
       const pool = await this.driver.pool(poolConfig);
@@ -425,7 +412,7 @@ var DB2Client = class extends import_knex.knex.Client {
   // 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) {
-    console2.log("destroy connection");
+    console.log("knex-ibmi: ", "destroy connection");
     return await connection.close();
   }
   _getConnectionString(connectionConfig) {
@@ -452,7 +439,7 @@ var DB2Client = class extends import_knex.knex.Client {
       }
     } else {
       await connection.beginTransaction();
-      console2.log("transaction begun");
+      console.log("knex-ibmi: ", "transaction begun");
       try {
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
@@ -484,15 +471,15 @@ var DB2Client = class extends import_knex.knex.Client {
           obj.response = { rows: result, rowCount: result.count };
         }
       } catch (err) {
-        console2.error(err);
+        console.error(err);
         await connection.rollback();
         throw new Error(err);
       } finally {
-        console2.log("transaction committed");
+        console.log("knex-ibmi: ", "transaction committed");
         await connection.commit();
       }
     }
-    console2.log(
+    console.log(
       "knex-ibmi: ",
       obj.sql,
       obj.bindings ? JSON.stringify(obj.bindings) : ""

package/package.json

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

package/src/index.ts

@@ -63,16 +63,16 @@ class DB2Client extends knex.Client {
     console.log("knex-ibmi: ", this._getConnectionString(connectionConfig));
 
     // @ts-ignore
-    if (this.config?.connection?.pool) {
+    if (this.config?.pool) {
       const poolConfig = {
         connectionString: this._getConnectionString(connectionConfig),
         connectionTimeout:
           // @ts-ignore
-          this.config?.connection?.acquireConnectionTimeout || 60000,
+          this.config?.acquireConnectionTimeout || 60000,
         // @ts-ignore
-        initialSize: this.config?.connection?.pool?.min || 2,
+        initialSize: this.config?.pool?.min || 2,
         // @ts-ignore
-        maxSize: this.config?.connection?.pool?.max || 10,
+        maxSize: this.config?.pool?.max || 10,
         reuseConnection: true,
       };
       const pool = await this.driver.pool(poolConfig);
@@ -244,8 +244,9 @@ class DB2Client extends knex.Client {
 }
 
 interface DB2PoolConfig {
-  min: number;
-  max: number;
+  min?: number;
+  max?: number;
+  acquireConnectionTimeout?: number;
 }
 
 interface DB2ConnectionParams {
@@ -272,7 +273,6 @@ interface DB2ConnectionConfig {
   password: string;
   driver: "IBM i Access ODBC Driver" | string;
   connectionStringParams?: DB2ConnectionParams;
-  pool?: DB2PoolConfig;
 }
 
 export interface DB2Config {