@bdkinc/knex-ibmi 0.0.7 → 0.0.9

package/README.md

@@ -1,6 +1,6 @@
 [![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.**
+**Disclaimer: this library is in alpha. Please submit an issue for any bugs encounter or any questions you have.**
 
 ## Description
 
@@ -17,8 +17,8 @@ This is an external dialect for [knex](https://github.com/tgriesser/knex). This
 Currently, this dialect has limited functionality compared to the Knex built-in dialects. Below are some of the limitations:
 
 - No streaming support
+- Updates return the value of the first column in that row. Make sure your identifier is the first column in the table. The returning option does not work on updates. 
 - 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

@@ -35,7 +35,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var process = __toESM(require("process"));
-var import_knex = __toESM(require("knex"));
+var import_knex = require("knex");
 var odbc = __toESM(require("odbc"));
 var console = __toESM(require("console"));
 
@@ -318,7 +318,7 @@ var IBMiQueryCompiler = class extends import_querycompiler.default {
 var ibmi_querycompiler_default = IBMiQueryCompiler;
 
 // src/index.ts
-var DB2Client = class extends import_knex.default.Client {
+var DB2Client = class extends import_knex.knex.Client {
   constructor(config) {
     super(config);
     this.driverName = "odbc";
@@ -361,7 +361,19 @@ var DB2Client = class extends import_knex.default.Client {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
     console.log(this._getConnectionString(connectionConfig));
-    return await this.driver.pool(this._getConnectionString(connectionConfig));
+    if (this.pool) {
+      const pool = await this.driver.pool({
+        connectionString: this._getConnectionString(connectionConfig),
+        connectionTimeout: this.pool?.acquireTimeoutMillis || 6e4,
+        initialSize: this.pool?.min || 2,
+        maxSize: this.pool?.max || 10,
+        reuseConnection: true
+      });
+      return await pool.connect();
+    }
+    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.
@@ -381,19 +393,20 @@ var DB2Client = class extends import_knex.default.Client {
   }
   // Runs the query on the specified connection, providing the bindings
   // and any other necessary prep work.
-  async _query(pool, obj) {
+  async _query(connection, 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);
+      const rows = await connection.query(obj.sql, obj.bindings);
       if (rows) {
         obj.response = { rows, rowCount: rows.length };
       }
     } else {
+      await connection.beginTransaction();
+      console.log("transaction begun");
       try {
-        const connection = await pool.connect();
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
         console.log({ obj });
@@ -409,7 +422,6 @@ var DB2Client = class extends import_knex.default.Client {
             rowCount: result.length
           };
         } else if (method === "update") {
-          console.log(this.queryCompiler);
           let returningSelect = obj.sql.replace("update", "select * from ");
           returningSelect = returningSelect.replace("where", "and");
           returningSelect = returningSelect.replace("set", "where");
@@ -420,14 +432,21 @@ var DB2Client = class extends import_knex.default.Client {
             await selectStatement.bind(obj.bindings);
           }
           const selected = await selectStatement.execute();
-          console.log(selected.columns);
-          obj.response = { rows: selected, rowCount: selected.length };
+          obj.response = {
+            rows: selected.map(
+              (row) => selected.columns.length > 0 ? row[selected.columns[0].name] : row
+            ),
+            rowCount: selected.length
+          };
         } else {
           obj.response = { rows: result, rowCount: result.length };
         }
       } catch (err) {
         console.error(err);
         throw new Error(err);
+      } finally {
+        console.log("transaction committed");
+        await connection.commit();
       }
     }
     return obj;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 // src/index.ts
 import * as process from "process";
-import knex from "knex";
+import { knex } from "knex";
 import * as odbc from "odbc";
 import * as console from "console";
 
@@ -326,7 +326,19 @@ var DB2Client = class extends knex.Client {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
     console.log(this._getConnectionString(connectionConfig));
-    return await this.driver.pool(this._getConnectionString(connectionConfig));
+    if (this.pool) {
+      const pool = await this.driver.pool({
+        connectionString: this._getConnectionString(connectionConfig),
+        connectionTimeout: this.pool?.acquireTimeoutMillis || 6e4,
+        initialSize: this.pool?.min || 2,
+        maxSize: this.pool?.max || 10,
+        reuseConnection: true
+      });
+      return await pool.connect();
+    }
+    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.
@@ -346,19 +358,20 @@ var DB2Client = class extends knex.Client {
   }
   // Runs the query on the specified connection, providing the bindings
   // and any other necessary prep work.
-  async _query(pool, obj) {
+  async _query(connection, 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);
+      const rows = await connection.query(obj.sql, obj.bindings);
       if (rows) {
         obj.response = { rows, rowCount: rows.length };
       }
     } else {
+      await connection.beginTransaction();
+      console.log("transaction begun");
       try {
-        const connection = await pool.connect();
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
         console.log({ obj });
@@ -374,7 +387,6 @@ var DB2Client = class extends knex.Client {
             rowCount: result.length
           };
         } else if (method === "update") {
-          console.log(this.queryCompiler);
           let returningSelect = obj.sql.replace("update", "select * from ");
           returningSelect = returningSelect.replace("where", "and");
           returningSelect = returningSelect.replace("set", "where");
@@ -385,14 +397,21 @@ var DB2Client = class extends knex.Client {
             await selectStatement.bind(obj.bindings);
           }
           const selected = await selectStatement.execute();
-          console.log(selected.columns);
-          obj.response = { rows: selected, rowCount: selected.length };
+          obj.response = {
+            rows: selected.map(
+              (row) => selected.columns.length > 0 ? row[selected.columns[0].name] : row
+            ),
+            rowCount: selected.length
+          };
         } else {
           obj.response = { rows: result, rowCount: result.length };
         }
       } catch (err) {
         console.error(err);
         throw new Error(err);
+      } finally {
+        console.log("transaction committed");
+        await connection.commit();
       }
     }
     return obj;

package/package.json

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

package/src/index.ts

@@ -1,6 +1,6 @@
 import * as process from "process";
 import { Connection } from "odbc";
-import knex, { Knex } from "knex";
+import { knex, Knex } from "knex";
 import * as odbc from "odbc";
 import * as console from "console";
 import SchemaCompiler from "./schema/ibmi-compiler";
@@ -61,7 +61,21 @@ class DB2Client extends knex.Client {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
     console.log(this._getConnectionString(connectionConfig));
-    return await this.driver.pool(this._getConnectionString(connectionConfig));
+
+    if (this.pool) {
+      const pool = await this.driver.pool({
+        connectionString: this._getConnectionString(connectionConfig),
+        connectionTimeout: this.pool?.acquireTimeoutMillis || 60000,
+        initialSize: this.pool?.min || 2,
+        maxSize: this.pool?.max || 10,
+        reuseConnection: true,
+      });
+      return await pool.connect();
+    }
+
+    return await this.driver.connect(
+      this._getConnectionString(connectionConfig),
+    );
   }
 
   // Used to explicitly close a connection, called internally by the pool manager
@@ -90,7 +104,7 @@ class DB2Client extends knex.Client {
 
   // Runs the query on the specified connection, providing the bindings
   // and any other necessary prep work.
-  async _query(pool: any, obj: any) {
+  async _query(connection: any, obj: any) {
     // @ts-ignore
     // TODO: verify correctness
     if (!obj || typeof obj == "string") obj = { sql: obj };
@@ -105,13 +119,14 @@ class DB2Client extends knex.Client {
     // which is needed for queries that modify the database
 
     if (method === "select" || method === "first" || method === "pluck") {
-      const rows: any = await pool.query(obj.sql, obj.bindings);
+      const rows: any = await connection.query(obj.sql, obj.bindings);
       if (rows) {
         obj.response = { rows, rowCount: rows.length };
       }
     } else {
+      await connection.beginTransaction();
+      console.log("transaction begun");
       try {
-        const connection = await pool.connect();
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
         console.log({ obj });
@@ -137,7 +152,6 @@ class DB2Client extends knex.Client {
           // it would be a lot easier if the table-reference function
           // worked the same for updates as it does inserts
           // on DB2 LUW it does work so if they ever add it we need to fix
-          console.log(this.queryCompiler)
           let returningSelect = obj.sql.replace("update", "select * from ");
           returningSelect = returningSelect.replace("where", "and");
           returningSelect = returningSelect.replace("set", "where");
@@ -148,14 +162,22 @@ class DB2Client extends knex.Client {
             await selectStatement.bind(obj.bindings);
           }
           const selected = await selectStatement.execute();
-          console.log(selected.columns)
-          obj.response = {rows: selected, rowCount: selected.length}
+          obj.response = {
+            rows: selected.map((row) =>
+              selected.columns.length > 0 ? row[selected.columns[0].name] : row,
+            ),
+            rowCount: selected.length,
+          };
         } else {
           obj.response = { rows: result, rowCount: result.length };
         }
       } catch (err: any) {
         console.error(err);
+        // await connection.rollback()
         throw new Error(err);
+      } finally {
+        console.log("transaction committed");
+        await connection.commit();
       }
     }
 

package/src/schema/ibmi-compiler.ts

@@ -1,5 +1,4 @@
 import SchemaCompiler from "knex/lib/schema/compiler";
-import * as console from "console";
 
 class IBMiSchemaCompiler extends SchemaCompiler {
   hasTable(tableName) {