@bdkinc/knex-ibmi 0.0.16 → 0.0.18

package/README.md

@@ -17,7 +17,6 @@ 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
 - 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.
 

package/dist/index.d.mts

@@ -1,91 +1,3 @@
-import * as odbc from 'odbc';
-import { Connection } from 'odbc';
-import { knex, Knex } from 'knex';
-import SchemaCompiler from 'knex/lib/schema/compiler';
-import TableCompiler from 'knex/lib/schema/tablecompiler';
-import ColumnCompiler from 'knex/lib/schema/columncompiler';
-import QueryCompiler from 'knex/lib/query/querycompiler';
-
-declare class IBMiSchemaCompiler extends SchemaCompiler {
-    hasTable(tableName: any): void;
-    toSQL(): any;
-}
-
-declare class IBMiTableCompiler extends TableCompiler {
-    createQuery(columns: any, ifNot: any, like: any): void;
-    dropUnique(columns: any, indexName: any): void;
-    unique(columns: any, indexName: any): void;
-    addColumns(columns: any, prefix: any): void;
-    commit(conn: any, value: any): Promise<any>;
-}
-
-declare class IBMiColumnCompiler extends ColumnCompiler {
-    increments(options?: {
-        primaryKey: boolean;
-    }): string;
-}
-
-declare class IBMiQueryCompiler extends QueryCompiler {
-    insert(): "" | {
-        sql: string;
-        returning: any;
-    };
-    _buildInsertData(insertValues: any, returningSql: any): string;
-    _prepInsert(data: any): any;
-    _returning(method: any, value: any, withTrigger: any): string | undefined;
-    columnizeWithPrefix(prefix: any, target: any): string;
-}
-
-declare class DB2Client extends knex.Client {
-    constructor(config: any);
-    _driver(): typeof odbc;
-    printDebug(message: string): void;
-    acquireRawConnection(): Promise<any>;
-    destroyRawConnection(connection: Connection): Promise<void>;
-    _getConnectionString(connectionConfig: any): string;
-    _query(connection: any, obj: any): Promise<any>;
-    _selectAfterUpdate(): string;
-    transaction(container: any, config: any, outerTx: any): Knex.Transaction;
-    schemaCompiler(): IBMiSchemaCompiler;
-    tableCompiler(): IBMiTableCompiler;
-    columnCompiler(): IBMiColumnCompiler;
-    queryCompiler(): IBMiQueryCompiler;
-    processResponse(obj: any, runner: any): any;
-}
-interface DB2PoolConfig {
-    min: number;
-    max: 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;
-}
-interface DB2ConnectionConfig {
-    database: string;
-    host: string;
-    port: 50000 | number;
-    user: string;
-    password: string;
-    driver: "IBM i Access ODBC Driver" | string;
-    connectionStringParams?: DB2ConnectionParams;
-    pool?: DB2PoolConfig;
-}
-interface DB2Config {
-    client: any;
-    connection: DB2ConnectionConfig;
-    pool?: DB2PoolConfig;
-}
-declare const DB2Dialect: typeof DB2Client;
-
-export { DB2Config, DB2Dialect, DB2Client as default };
+declare module "knex/lib/query/querycompiler" {}
+declare module "knex/lib/schema/tablecompiler" {}
+declare module "knex/lib/schema/compiler" {}

package/dist/index.d.ts

@@ -1,91 +1,3 @@
-import * as odbc from 'odbc';
-import { Connection } from 'odbc';
-import { knex, Knex } from 'knex';
-import SchemaCompiler from 'knex/lib/schema/compiler';
-import TableCompiler from 'knex/lib/schema/tablecompiler';
-import ColumnCompiler from 'knex/lib/schema/columncompiler';
-import QueryCompiler from 'knex/lib/query/querycompiler';
-
-declare class IBMiSchemaCompiler extends SchemaCompiler {
-    hasTable(tableName: any): void;
-    toSQL(): any;
-}
-
-declare class IBMiTableCompiler extends TableCompiler {
-    createQuery(columns: any, ifNot: any, like: any): void;
-    dropUnique(columns: any, indexName: any): void;
-    unique(columns: any, indexName: any): void;
-    addColumns(columns: any, prefix: any): void;
-    commit(conn: any, value: any): Promise<any>;
-}
-
-declare class IBMiColumnCompiler extends ColumnCompiler {
-    increments(options?: {
-        primaryKey: boolean;
-    }): string;
-}
-
-declare class IBMiQueryCompiler extends QueryCompiler {
-    insert(): "" | {
-        sql: string;
-        returning: any;
-    };
-    _buildInsertData(insertValues: any, returningSql: any): string;
-    _prepInsert(data: any): any;
-    _returning(method: any, value: any, withTrigger: any): string | undefined;
-    columnizeWithPrefix(prefix: any, target: any): string;
-}
-
-declare class DB2Client extends knex.Client {
-    constructor(config: any);
-    _driver(): typeof odbc;
-    printDebug(message: string): void;
-    acquireRawConnection(): Promise<any>;
-    destroyRawConnection(connection: Connection): Promise<void>;
-    _getConnectionString(connectionConfig: any): string;
-    _query(connection: any, obj: any): Promise<any>;
-    _selectAfterUpdate(): string;
-    transaction(container: any, config: any, outerTx: any): Knex.Transaction;
-    schemaCompiler(): IBMiSchemaCompiler;
-    tableCompiler(): IBMiTableCompiler;
-    columnCompiler(): IBMiColumnCompiler;
-    queryCompiler(): IBMiQueryCompiler;
-    processResponse(obj: any, runner: any): any;
-}
-interface DB2PoolConfig {
-    min: number;
-    max: 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;
-}
-interface DB2ConnectionConfig {
-    database: string;
-    host: string;
-    port: 50000 | number;
-    user: string;
-    password: string;
-    driver: "IBM i Access ODBC Driver" | string;
-    connectionStringParams?: DB2ConnectionParams;
-    pool?: DB2PoolConfig;
-}
-interface DB2Config {
-    client: any;
-    connection: DB2ConnectionConfig;
-    pool?: DB2PoolConfig;
-}
-declare const DB2Dialect: typeof DB2Client;
-
-export { DB2Config, DB2Dialect, DB2Client as default };
+declare module "knex/lib/query/querycompiler" {}
+declare module "knex/lib/schema/tablecompiler" {}
+declare module "knex/lib/schema/compiler" {}

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 console = __toESM(require("console"));
+var console2 = __toESM(require("console"));
 
 // src/schema/ibmi-compiler.ts
 var import_compiler = __toESM(require("knex/lib/schema/compiler"));
@@ -182,6 +182,7 @@ 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 || [];
@@ -285,7 +286,51 @@ var IBMiQueryCompiler = class extends import_querycompiler.default {
       values
     };
   }
+  update() {
+    const withSQL = this.with();
+    const updates = this._prepUpdate(this.single.update);
+    const where = this.where();
+    const order = this.order();
+    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 ? (
+        // @ts-ignore
+        this.grouped.where.map((w) => {
+          if (this.single.update.hasOwnProperty(w.column))
+            return;
+          if (!w.value)
+            return;
+          return `"${w.column}" ${w.not ? "!" : ""}${w.operator} ${w.value}`;
+        })
+      ) : []
+    );
+    let selectReturning = returning ? `select ${returning.map((a) => `"${a}"`).join(", ")} from ${// @ts-ignore
+    this.tableName} where ${Object.entries(this.single.update).map(([key, value]) => `"${key}" = '${value}'`).join(" and ")}${moreWheres.length > 0 && " and "}${moreWheres.join(
+      " and "
+    )}` : "";
+    console.log({ selectReturning });
+    const sql = withSQL + // @ts-ignore
+    `update ${this.single.only ? "only " : ""}${this.tableName} set ` + // @ts-ignore
+    updates.join(", ") + (where ? ` ${where}` : "") + (order ? ` ${order}` : "") + (limit ? ` ${limit}` : "");
+    return { sql, returning, selectReturning };
+  }
   _returning(method, value, withTrigger) {
+    console.log("_returning", value);
     switch (method) {
       case "update":
       case "insert":
@@ -299,7 +344,7 @@ var IBMiQueryCompiler = class extends import_querycompiler.default {
           `${withTrigger ? " into #out" : ""}`
         ) : "";
       case "rowcount":
-        return value ? ";select @@rowcount" : "";
+        return value ? "select @@rowcount" : "";
     }
   }
   columnizeWithPrefix(prefix, target) {
@@ -358,7 +403,7 @@ var DB2Client = class extends import_knex.knex.Client {
   async acquireRawConnection() {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
-    console.log(this._getConnectionString(connectionConfig));
+    console2.log(this._getConnectionString(connectionConfig));
     if (this.config?.connection?.pool) {
       const poolConfig = {
         connectionString: this._getConnectionString(connectionConfig),
@@ -382,7 +427,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) {
-    console.log("destroy connection");
+    console2.log("destroy connection");
     return await connection.close();
   }
   _getConnectionString(connectionConfig) {
@@ -409,7 +454,7 @@ var DB2Client = class extends import_knex.knex.Client {
       }
     } else {
       await connection.beginTransaction();
-      console.log("transaction begun");
+      console2.log("transaction begun");
       try {
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
@@ -420,70 +465,38 @@ var DB2Client = class extends import_knex.knex.Client {
         if (result.statement.includes("IDENTITY_VAL_LOCAL()")) {
           obj.response = {
             rows: result.map(
-              (row) => result.columns.length > 0 ? row[result.columns[0].name] : row
+              (row) => result.columns && result.columns?.length > 0 ? row[result.columns[0].name] : row
             ),
-            rowCount: result.length
+            rowCount: result.count
           };
         } else if (method === "update") {
-          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));
+          if (obj.selectReturning) {
+            const returningSelect = await connection.query(obj.selectReturning);
             obj.response = {
-              rows: rows.length,
-              rowCount: rows.length
+              rows: returningSelect,
+              rowCount: result.count
             };
           } 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
+              rows: result,
+              rowCount: result.count
             };
           }
         } else {
-          obj.response = { rows: result, rowCount: result.length };
+          obj.response = { rows: result, rowCount: result.count };
         }
       } catch (err) {
-        console.error(err);
+        console2.error(err);
         await connection.rollback();
         throw new Error(err);
       } finally {
-        console.log("transaction committed");
+        console2.log("transaction committed");
         await connection.commit();
       }
     }
-    console.log({ obj });
+    console2.log({ obj });
     return obj;
   }
-  _selectAfterUpdate() {
-    const returnSelect = `; SELECT ${// @ts-ignore
-    this.single.returning ? (
-      // @ts-ignore
-      this.formatter.columnize(this.single.returning)
-    ) : "*"} from ${this.tableName} `;
-    let whereStatement = [this.where()];
-    console.log({ whereStatement });
-    for (const [key, value] of Object.entries(this.single.update)) {
-      whereStatement.push(`WHERE ${key} = ${value}`);
-    }
-    return returnSelect + whereStatement.join(" and ");
-  }
   transaction(container, config, outerTx) {
     return new ibmi_transaction_default(this, ...arguments);
   }
@@ -504,7 +517,7 @@ var DB2Client = class extends import_knex.knex.Client {
       return null;
     const resp = obj.response;
     const method = obj.sqlMethod;
-    const { rows } = resp;
+    const { rows, rowCount } = resp;
     if (obj.output)
       return obj.output.call(runner, resp);
     switch (method) {
@@ -519,11 +532,14 @@ var DB2Client = class extends import_knex.knex.Client {
       case "del":
       case "delete":
       case "update":
-        return rows;
+        if (obj.selectReturning) {
+          return rows;
+        }
+        return rowCount;
       case "counter":
-        return resp.rowCount;
+        return rowCount;
       default:
-        return resp;
+        return rows;
     }
   }
 };

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import * as process from "process";
 import { knex } from "knex";
 import * as odbc from "odbc";
-import * as console from "console";
+import * as console2 from "console";
 
 // src/schema/ibmi-compiler.ts
 import SchemaCompiler from "knex/lib/schema/compiler";
@@ -147,6 +147,7 @@ import isObject2 from "lodash/isObject";
 import { rawOrFn as rawOrFn_ } from "knex/lib/formatter/wrappingFormatter";
 import { format } from "date-fns";
 import isEmpty from "lodash/isEmpty";
+import * as console from "console";
 var IBMiQueryCompiler = class extends QueryCompiler {
   insert() {
     const insertValues = this.single.insert || [];
@@ -250,7 +251,51 @@ var IBMiQueryCompiler = class extends QueryCompiler {
       values
     };
   }
+  update() {
+    const withSQL = this.with();
+    const updates = this._prepUpdate(this.single.update);
+    const where = this.where();
+    const order = this.order();
+    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 ? (
+        // @ts-ignore
+        this.grouped.where.map((w) => {
+          if (this.single.update.hasOwnProperty(w.column))
+            return;
+          if (!w.value)
+            return;
+          return `"${w.column}" ${w.not ? "!" : ""}${w.operator} ${w.value}`;
+        })
+      ) : []
+    );
+    let selectReturning = returning ? `select ${returning.map((a) => `"${a}"`).join(", ")} from ${// @ts-ignore
+    this.tableName} where ${Object.entries(this.single.update).map(([key, value]) => `"${key}" = '${value}'`).join(" and ")}${moreWheres.length > 0 && " and "}${moreWheres.join(
+      " and "
+    )}` : "";
+    console.log({ selectReturning });
+    const sql = withSQL + // @ts-ignore
+    `update ${this.single.only ? "only " : ""}${this.tableName} set ` + // @ts-ignore
+    updates.join(", ") + (where ? ` ${where}` : "") + (order ? ` ${order}` : "") + (limit ? ` ${limit}` : "");
+    return { sql, returning, selectReturning };
+  }
   _returning(method, value, withTrigger) {
+    console.log("_returning", value);
     switch (method) {
       case "update":
       case "insert":
@@ -264,7 +309,7 @@ var IBMiQueryCompiler = class extends QueryCompiler {
           `${withTrigger ? " into #out" : ""}`
         ) : "";
       case "rowcount":
-        return value ? ";select @@rowcount" : "";
+        return value ? "select @@rowcount" : "";
     }
   }
   columnizeWithPrefix(prefix, target) {
@@ -323,7 +368,7 @@ var DB2Client = class extends knex.Client {
   async acquireRawConnection() {
     this.printDebug("acquiring raw connection");
     const connectionConfig = this.config.connection;
-    console.log(this._getConnectionString(connectionConfig));
+    console2.log(this._getConnectionString(connectionConfig));
     if (this.config?.connection?.pool) {
       const poolConfig = {
         connectionString: this._getConnectionString(connectionConfig),
@@ -347,7 +392,7 @@ var DB2Client = class extends 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) {
-    console.log("destroy connection");
+    console2.log("destroy connection");
     return await connection.close();
   }
   _getConnectionString(connectionConfig) {
@@ -374,7 +419,7 @@ var DB2Client = class extends knex.Client {
       }
     } else {
       await connection.beginTransaction();
-      console.log("transaction begun");
+      console2.log("transaction begun");
       try {
         const statement = await connection.createStatement();
         await statement.prepare(obj.sql);
@@ -385,70 +430,38 @@ var DB2Client = class extends knex.Client {
         if (result.statement.includes("IDENTITY_VAL_LOCAL()")) {
           obj.response = {
             rows: result.map(
-              (row) => result.columns.length > 0 ? row[result.columns[0].name] : row
+              (row) => result.columns && result.columns?.length > 0 ? row[result.columns[0].name] : row
             ),
-            rowCount: result.length
+            rowCount: result.count
           };
         } else if (method === "update") {
-          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));
+          if (obj.selectReturning) {
+            const returningSelect = await connection.query(obj.selectReturning);
             obj.response = {
-              rows: rows.length,
-              rowCount: rows.length
+              rows: returningSelect,
+              rowCount: result.count
             };
           } 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
+              rows: result,
+              rowCount: result.count
             };
           }
         } else {
-          obj.response = { rows: result, rowCount: result.length };
+          obj.response = { rows: result, rowCount: result.count };
         }
       } catch (err) {
-        console.error(err);
+        console2.error(err);
         await connection.rollback();
         throw new Error(err);
       } finally {
-        console.log("transaction committed");
+        console2.log("transaction committed");
         await connection.commit();
       }
     }
-    console.log({ obj });
+    console2.log({ obj });
     return obj;
   }
-  _selectAfterUpdate() {
-    const returnSelect = `; SELECT ${// @ts-ignore
-    this.single.returning ? (
-      // @ts-ignore
-      this.formatter.columnize(this.single.returning)
-    ) : "*"} from ${this.tableName} `;
-    let whereStatement = [this.where()];
-    console.log({ whereStatement });
-    for (const [key, value] of Object.entries(this.single.update)) {
-      whereStatement.push(`WHERE ${key} = ${value}`);
-    }
-    return returnSelect + whereStatement.join(" and ");
-  }
   transaction(container, config, outerTx) {
     return new ibmi_transaction_default(this, ...arguments);
   }
@@ -469,7 +482,7 @@ var DB2Client = class extends knex.Client {
       return null;
     const resp = obj.response;
     const method = obj.sqlMethod;
-    const { rows } = resp;
+    const { rows, rowCount } = resp;
     if (obj.output)
       return obj.output.call(runner, resp);
     switch (method) {
@@ -484,11 +497,14 @@ var DB2Client = class extends knex.Client {
       case "del":
       case "delete":
       case "update":
-        return rows;
+        if (obj.selectReturning) {
+          return rows;
+        }
+        return rowCount;
       case "counter":
-        return resp.rowCount;
+        return rowCount;
       default:
-        return resp;
+        return rows;
     }
   }
 };

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@bdkinc/knex-ibmi",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "Knex dialect for IBMi",
-  "main": "dist/index.js",
+  "main": "dist/index",
+  "types": "dist/index",
   "module": "dist/index.mjs",
   "exports": {
     "import": "./dist/index.mjs",
@@ -14,6 +15,7 @@
   "engineStrict": true,
   "scripts": {
     "build": "tsup src/index.ts --dts --format esm,cjs",
+    "build:dev": "tsup src/index.ts --format esm,cjs",
     "lint:scripts": "eslint . --ext .ts",
     "format:scripts": "prettier . --write"
   },

package/src/execution/ibmi-transaction.ts

@@ -1,3 +1,4 @@
+// @ts-ignore
 import Transaction from "knex/lib/execution/transaction";
 
 class IBMiTransaction extends Transaction {

package/src/index.d.ts

@@ -0,0 +1,4 @@
+declare module "knex/lib/query/querycompiler" {}
+declare module "knex/lib/schema/tablecompiler" {}
+declare module "knex/lib/schema/compiler" {}
+

package/src/index.ts

@@ -145,56 +145,27 @@ class DB2Client extends knex.Client {
         if (result.statement.includes("IDENTITY_VAL_LOCAL()")) {
           obj.response = {
             rows: result.map((row) =>
-              result.columns.length > 0 ? row[result.columns[0].name] : row,
+              result.columns && result.columns?.length > 0
+                ? row[result.columns[0].name]
+                : row,
             ),
-            rowCount: result.length,
+            rowCount: result.count,
           };
-          // @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
-          // @ts-ignore
-          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));
+          if (obj.selectReturning) {
+            const returningSelect = await connection.query(obj.selectReturning);
             obj.response = {
-              rows: rows.length,
-              rowCount: rows.length,
+              rows: returningSelect,
+              rowCount: result.count,
             };
           } 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,
+              rows: result,
+              rowCount: result.count,
             };
           }
         } else {
-          obj.response = { rows: result, rowCount: result.length };
+          obj.response = { rows: result, rowCount: result.count };
         }
       } catch (err: any) {
         console.error(err);
@@ -210,25 +181,6 @@ class DB2Client extends knex.Client {
     return obj;
   }
 
-  _selectAfterUpdate() {
-    const returnSelect = `; SELECT ${
-      // @ts-ignore
-      this.single.returning
-        ? // @ts-ignore
-          this.formatter.columnize(this.single.returning)
-        : "*"
-      // @ts-ignore
-    } from ${this.tableName} `;
-    // @ts-ignore
-    let whereStatement = [this.where()];
-    console.log({ whereStatement });
-    // @ts-ignore
-    for (const [key, value] of Object.entries(this.single.update)) {
-      whereStatement.push(`WHERE ${key} = ${value}`);
-    }
-    return returnSelect + whereStatement.join(" and ");
-  }
-
   transaction(container: any, config: any, outerTx: any): Knex.Transaction {
     // @ts-ignore
     return new Transaction(this, ...arguments);
@@ -259,7 +211,7 @@ class DB2Client extends knex.Client {
 
     const resp = obj.response;
     const method = obj.sqlMethod;
-    const { rows } = resp;
+    const { rows, rowCount } = resp;
 
     if (obj.output) return obj.output.call(runner, resp);
 
@@ -275,11 +227,14 @@ class DB2Client extends knex.Client {
       case "del":
       case "delete":
       case "update":
-        return rows;
+        if (obj.selectReturning) {
+          return rows;
+        }
+        return rowCount;
       case "counter":
-        return resp.rowCount;
+        return rowCount;
       default:
-        return resp;
+        return rows;
     }
   }
 }

package/src/query/ibmi-querycompiler.ts

@@ -1,9 +1,10 @@
+// @ts-ignore
 import QueryCompiler from "knex/lib/query/querycompiler";
 import isObject from "lodash/isObject";
 import { rawOrFn as rawOrFn_ } from "knex/lib/formatter/wrappingFormatter";
 import { format } from "date-fns";
-import * as console from "console";
 import isEmpty from "lodash/isEmpty";
+import * as console from "console";
 
 class IBMiQueryCompiler extends QueryCompiler {
   insert() {
@@ -127,8 +128,81 @@ class IBMiQueryCompiler extends QueryCompiler {
     };
   }
 
+  update() {
+    // @ts-ignore
+    const withSQL = this.with();
+    // @ts-ignore
+    const updates = this._prepUpdate(this.single.update);
+    // @ts-ignore
+    const where = this.where();
+    // @ts-ignore
+    const order = this.order();
+    // @ts-ignore
+    const limit = this.limit();
+    // @ts-ignore
+    const { returning } = this.single;
+    // @ts-ignore
+    const values = Object.values(this.single.update)
+      .map((a) => `${a}`)
+      .join(", ");
+
+    // @ts-ignore
+    console.log({
+      returning,
+      // @ts-ignore
+      where,
+      // @ts-ignore
+      updates,
+      // @ts-ignore
+      single: this.single.update,
+      // @ts-ignore
+      grouped: this.grouped.where,
+      values,
+    });
+    // @ts-ignore
+    const moreWheres =
+      // @ts-ignore
+      this.grouped.where && this.grouped.where.length > 0
+        ? // @ts-ignore
+          this.grouped.where.map((w) => {
+            // @ts-ignore
+            if (this.single.update.hasOwnProperty(w.column)) return;
+            if (!w.value) return;
+            return `"${w.column}" ${w.not ? "!" : ""}${w.operator} ${w.value}`;
+          })
+        : [];
+
+    let selectReturning = returning
+      ? `select ${returning.map((a) => `"${a}"`).join(", ")} from ${
+          // @ts-ignore
+          this.tableName
+          // @ts-ignore
+        } where ${Object.entries(this.single.update)
+          .map(([key, value]) => `"${key}" = '${value}'`)
+          .join(" and ")}${moreWheres.length > 0 && " and "}${moreWheres.join(
+          " and ",
+        )}`
+      : "";
+
+    console.log({ selectReturning });
+
+    const sql =
+      withSQL +
+      // @ts-ignore
+      `update ${this.single.only ? "only " : ""}${this.tableName}` +
+      " set " +
+      // @ts-ignore
+      updates.join(", ") +
+      (where ? ` ${where}` : "") +
+      (order ? ` ${order}` : "") +
+      (limit ? ` ${limit}` : "");
+
+    return { sql, returning, selectReturning };
+  }
+
   _returning(method, value, withTrigger) {
     // currently a placeholder in case I need to update return values
+    console.log("_returning", value);
     switch (method) {
       case "update":
       case "insert":
@@ -142,7 +216,7 @@ class IBMiQueryCompiler extends QueryCompiler {
             `${withTrigger ? " into #out" : ""}`
           : "";
       case "rowcount":
-        return value ? ";select @@rowcount" : "";
+        return value ? "select @@rowcount" : "";
     }
   }
 

package/src/schema/ibmi-columncompiler.ts

@@ -1,3 +1,4 @@
+// @ts-ignore
 import ColumnCompiler from "knex/lib/schema/columncompiler";
 
 class IBMiColumnCompiler extends ColumnCompiler {

package/src/schema/ibmi-compiler.ts

@@ -1,3 +1,4 @@
+// @ts-ignore
 import SchemaCompiler from "knex/lib/schema/compiler";
 
 class IBMiSchemaCompiler extends SchemaCompiler {

package/src/schema/ibmi-tablecompiler.ts

@@ -1,3 +1,4 @@
+// @ts-ignore
 import TableCompiler from "knex/lib/schema/tablecompiler";
 import isObject from "lodash/isObject";