@bdkinc/knex-ibmi 0.0.7 → 0.0.8

package/README.md

@@ -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

@@ -392,8 +392,9 @@ var DB2Client = class extends import_knex.default.Client {
         obj.response = { rows, rowCount: rows.length };
       }
     } else {
+      const connection = await pool.connect();
+      await connection.beginTransaction();
       try {
-        const connection = await pool.connect();
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
         console.log({ obj });
@@ -409,7 +410,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 +420,18 @@ 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);
+        await connection.rollback();
         throw new Error(err);
+      } finally {
+        await connection.commit();
       }
     }
     return obj;

package/dist/index.mjs

@@ -357,8 +357,9 @@ var DB2Client = class extends knex.Client {
         obj.response = { rows, rowCount: rows.length };
       }
     } else {
+      const connection = await pool.connect();
+      await connection.beginTransaction();
       try {
-        const connection = await pool.connect();
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
         console.log({ obj });
@@ -374,7 +375,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 +385,18 @@ 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);
+        await connection.rollback();
         throw new Error(err);
+      } finally {
+        await connection.commit();
       }
     }
     return obj;

package/package.json

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

package/src/index.ts

@@ -110,8 +110,9 @@ class DB2Client extends knex.Client {
         obj.response = { rows, rowCount: rows.length };
       }
     } else {
+      const connection = await pool.connect();
+      await connection.beginTransaction();
       try {
-        const connection = await pool.connect();
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
         console.log({ obj });
@@ -137,7 +138,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,15 +148,20 @@ 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 {
+        await connection.commit()
       }
+
     }
 
     return obj;