@bdkinc/knex-ibmi 0.0.14 → 0.0.16

package/dist/index.js

@@ -161,19 +161,17 @@ var ibmi_columncompiler_default = IBMiColumnCompiler;
 // src/execution/ibmi-transaction.ts
 var import_transaction = __toESM(require("knex/lib/execution/transaction"));
 var IBMiTransaction = class extends import_transaction.default {
-  async begin(conn) {
-    const connection = await conn.connect();
+  async begin(connection) {
     await connection.beginTransaction();
     return connection;
   }
-  async rollback(conn) {
-    const connection = await conn.connect();
+  async rollback(connection) {
     await connection.rollback();
     return connection;
   }
-  async commit(conn) {
-    await conn.commit();
-    return conn;
+  async commit(connection) {
+    await connection.commit();
+    return connection;
   }
 };
 var ibmi_transaction_default = IBMiTransaction;
@@ -361,7 +359,6 @@ var DB2Client = class extends import_knex.knex.Client {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
     console.log(this._getConnectionString(connectionConfig));
-    console.log({ config: this.config, pool: this.pool });
     if (this.config?.connection?.pool) {
       const poolConfig = {
         connectionString: this._getConnectionString(connectionConfig),
@@ -416,7 +413,6 @@ var DB2Client = class extends import_knex.knex.Client {
       try {
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
-        console.log({ obj });
         if (obj.bindings) {
           await statement.bind(obj.bindings);
         }
@@ -429,33 +425,50 @@ var DB2Client = class extends import_knex.knex.Client {
             rowCount: result.length
           };
         } else if (method === "update") {
-          let returningSelect = obj.sql.replace("update", "select * from ");
-          returningSelect = returningSelect.replace("where", "and");
-          returningSelect = returningSelect.replace("set", "where");
-          returningSelect = returningSelect.replace(this.tableName, "where");
-          const selectStatement = await connection.createStatement();
-          await selectStatement.prepare(returningSelect);
-          if (obj.bindings) {
-            await selectStatement.bind(obj.bindings);
+          if (obj.sql.includes("knex_migrations_lock")) {
+            console.log("migrations_lock");
+            const rows = await connection.query(
+              // @ts-ignore
+              `select * from "knex_migrations_lock"`
+            );
+            console.log({ rows });
+            console.log(rows.map((row) => row.index));
+            obj.response = {
+              rows: rows.length,
+              rowCount: rows.length
+            };
+          } else {
+            let returningSelect = obj.sql.replace("update", "select * from ");
+            returningSelect = returningSelect.replace("where", "and");
+            returningSelect = returningSelect.replace("set", "where");
+            returningSelect = returningSelect.replace(this.tableName, "where");
+            const selectStatement = await connection.createStatement();
+            await selectStatement.prepare(returningSelect);
+            console.log({ returningSelect });
+            if (obj.bindings) {
+              await selectStatement.bind(obj.bindings);
+            }
+            const selected = await selectStatement.execute();
+            obj.response = {
+              rows: selected.map(
+                (row) => selected.columns.length > 0 ? row[selected.columns[0].name] : row
+              ),
+              rowCount: selected.length
+            };
           }
-          const selected = await selectStatement.execute();
-          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);
+        await connection.rollback();
         throw new Error(err);
       } finally {
         console.log("transaction committed");
         await connection.commit();
       }
     }
+    console.log({ obj });
     return obj;
   }
   _selectAfterUpdate() {

package/dist/index.mjs

@@ -126,19 +126,17 @@ var ibmi_columncompiler_default = IBMiColumnCompiler;
 // src/execution/ibmi-transaction.ts
 import Transaction from "knex/lib/execution/transaction";
 var IBMiTransaction = class extends Transaction {
-  async begin(conn) {
-    const connection = await conn.connect();
+  async begin(connection) {
     await connection.beginTransaction();
     return connection;
   }
-  async rollback(conn) {
-    const connection = await conn.connect();
+  async rollback(connection) {
     await connection.rollback();
     return connection;
   }
-  async commit(conn) {
-    await conn.commit();
-    return conn;
+  async commit(connection) {
+    await connection.commit();
+    return connection;
   }
 };
 var ibmi_transaction_default = IBMiTransaction;
@@ -326,7 +324,6 @@ var DB2Client = class extends knex.Client {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
     console.log(this._getConnectionString(connectionConfig));
-    console.log({ config: this.config, pool: this.pool });
     if (this.config?.connection?.pool) {
       const poolConfig = {
         connectionString: this._getConnectionString(connectionConfig),
@@ -381,7 +378,6 @@ var DB2Client = class extends knex.Client {
       try {
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
-        console.log({ obj });
         if (obj.bindings) {
           await statement.bind(obj.bindings);
         }
@@ -394,33 +390,50 @@ var DB2Client = class extends knex.Client {
             rowCount: result.length
           };
         } else if (method === "update") {
-          let returningSelect = obj.sql.replace("update", "select * from ");
-          returningSelect = returningSelect.replace("where", "and");
-          returningSelect = returningSelect.replace("set", "where");
-          returningSelect = returningSelect.replace(this.tableName, "where");
-          const selectStatement = await connection.createStatement();
-          await selectStatement.prepare(returningSelect);
-          if (obj.bindings) {
-            await selectStatement.bind(obj.bindings);
+          if (obj.sql.includes("knex_migrations_lock")) {
+            console.log("migrations_lock");
+            const rows = await connection.query(
+              // @ts-ignore
+              `select * from "knex_migrations_lock"`
+            );
+            console.log({ rows });
+            console.log(rows.map((row) => row.index));
+            obj.response = {
+              rows: rows.length,
+              rowCount: rows.length
+            };
+          } else {
+            let returningSelect = obj.sql.replace("update", "select * from ");
+            returningSelect = returningSelect.replace("where", "and");
+            returningSelect = returningSelect.replace("set", "where");
+            returningSelect = returningSelect.replace(this.tableName, "where");
+            const selectStatement = await connection.createStatement();
+            await selectStatement.prepare(returningSelect);
+            console.log({ returningSelect });
+            if (obj.bindings) {
+              await selectStatement.bind(obj.bindings);
+            }
+            const selected = await selectStatement.execute();
+            obj.response = {
+              rows: selected.map(
+                (row) => selected.columns.length > 0 ? row[selected.columns[0].name] : row
+              ),
+              rowCount: selected.length
+            };
           }
-          const selected = await selectStatement.execute();
-          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);
+        await connection.rollback();
         throw new Error(err);
       } finally {
         console.log("transaction committed");
         await connection.commit();
       }
     }
+    console.log({ obj });
     return obj;
   }
   _selectAfterUpdate() {

package/package.json

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

package/src/execution/ibmi-transaction.ts

@@ -1,21 +1,19 @@
 import Transaction from "knex/lib/execution/transaction";
 
 class IBMiTransaction extends Transaction {
-  async begin(conn) {
-    const connection = await conn.connect();
+  async begin(connection) {
     await connection.beginTransaction();
     return connection;
   }
 
-  async rollback(conn) {
-    const connection = await conn.connect();
+  async rollback(connection) {
     await connection.rollback();
     return connection;
   }
 
-  async commit(conn) {
-    await conn.commit();
-    return conn;
+  async commit(connection) {
+    await connection.commit();
+    return connection;
   }
 }
 

package/src/index.ts

@@ -62,14 +62,12 @@ class DB2Client extends knex.Client {
     const connectionConfig = this.config.connection;
     console.log(this._getConnectionString(connectionConfig));
 
-    console.log({ config: this.config, pool: this.pool });
-
     // @ts-ignore
     if (this.config?.connection?.pool) {
       const poolConfig = {
         connectionString: this._getConnectionString(connectionConfig),
         connectionTimeout:
-        // @ts-ignore
+          // @ts-ignore
           this.config?.connection?.acquireConnectionTimeout || 60000,
         // @ts-ignore
         initialSize: this.config?.connection?.pool?.min || 2,
@@ -135,7 +133,6 @@ class DB2Client extends knex.Client {
       try {
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
-        console.log({ obj });
         if (obj.bindings) {
           await statement.bind(obj.bindings);
         }
@@ -152,35 +149,56 @@ class DB2Client extends knex.Client {
             ),
             rowCount: result.length,
           };
+          // @ts-ignore
         } else if (method === "update") {
           // if is in update we need to run a separate select query
           // this also feels hacky and should be cleaned up
           // 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
-          let returningSelect = obj.sql.replace("update", "select * from ");
-          returningSelect = returningSelect.replace("where", "and");
-          returningSelect = returningSelect.replace("set", "where");
           // @ts-ignore
-          returningSelect = returningSelect.replace(this.tableName, "where");
-          const selectStatement = await connection.createStatement();
-          await selectStatement.prepare(returningSelect);
-          if (obj.bindings) {
-            await selectStatement.bind(obj.bindings);
+          if (obj.sql.includes("knex_migrations_lock")) {
+            // even more hacky for migrations
+            console.log("migrations_lock");
+            // @ts-ignore
+            const rows = await connection.query(
+              // @ts-ignore
+              `select * from \"knex_migrations_lock\"`,
+            );
+            console.log({ rows });
+            console.log(rows.map((row) => row.index));
+            obj.response = {
+              rows: rows.length,
+              rowCount: rows.length,
+            };
+          } else {
+            let returningSelect = obj.sql.replace("update", "select * from ");
+            returningSelect = returningSelect.replace("where", "and");
+            returningSelect = returningSelect.replace("set", "where");
+            // @ts-ignore
+            returningSelect = returningSelect.replace(this.tableName, "where");
+            const selectStatement = await connection.createStatement();
+            await selectStatement.prepare(returningSelect);
+            console.log({ returningSelect });
+            if (obj.bindings) {
+              await selectStatement.bind(obj.bindings);
+            }
+            const selected = await selectStatement.execute();
+            obj.response = {
+              rows: selected.map((row) =>
+                selected.columns.length > 0
+                  ? row[selected.columns[0].name]
+                  : row,
+              ),
+              rowCount: selected.length,
+            };
           }
-          const selected = await selectStatement.execute();
-          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()
+        await connection.rollback();
         throw new Error(err);
       } finally {
         console.log("transaction committed");
@@ -188,6 +206,7 @@ class DB2Client extends knex.Client {
       }
     }
 
+    console.log({ obj });
     return obj;
   }