@bdkinc/knex-ibmi 0.2.5 → 0.2.7

package/README.md

@@ -37,6 +37,8 @@ Requires Node v16 or higher.
 
 This library can be used as commonjs, esm or TypeScript.
 
+### CommonJs
+
 ```javascript
 const knex = require("knex");
 const { DB2Dialect } = require("@bdkinc/knex-ibmi");
@@ -70,13 +72,16 @@ query
   .finally(() => process.exit());
 ```
 
-or as ESM
+### ESM
 
 ```javascript
 import knex from "knex";
 import { DB2Dialect } from "@bdkinc/knex-ibmi";
 
-const db = knex({
+/**
+ * @type {import("@bdkinc/knex-ibmi").DB2Config}
+ */
+const config = {
   client: DB2Dialect,
   connection: {
     host: "localhost", // hostname or ip address of server
@@ -95,7 +100,9 @@ const db = knex({
     min: 2,
     max: 10,
   },
-});
+}
+
+const db = knex(config);
 
 try {
   const data = await db.select("*").from("table").where({ foo: "bar" });
@@ -107,7 +114,7 @@ try {
 }
 ```
 
-or as Typescript
+### TypeScript
 
 ```typescript
 import { knex } from "knex";

package/dist/index.d.ts

@@ -36,7 +36,10 @@ declare class IBMiQueryCompiler extends QueryCompiler {
         returning: any;
     };
     _buildInsertData(insertValues: string | any[], returningSql: string): string;
-    _prepInsert(data: any): any;
+    _prepInsert(data: any): {
+        columns: any;
+        values: any;
+    };
     update(): {
         sql: string;
         returning: any;
@@ -60,7 +63,7 @@ declare class DB2Client extends knex.Client {
     schemaCompiler(tableBuilder: any): IBMiSchemaCompiler;
     tableCompiler(tableBuilder: any): IBMiTableCompiler;
     columnCompiler(tableCompiler: any, columnCompiler: any): IBMiColumnCompiler;
-    queryCompiler(builder: Knex.QueryBuilder): IBMiQueryCompiler;
+    queryCompiler(builder: Knex.QueryBuilder, bindings?: any[]): IBMiQueryCompiler;
     processResponse(obj: any, runner: any): any;
 }
 interface DB2PoolConfig {

package/dist/index.js

@@ -4,6 +4,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -26,6 +29,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// node_modules/lodash/isObject.js
+var require_isObject = __commonJS({
+  "node_modules/lodash/isObject.js"(exports2, module2) {
+    function isObject2(value) {
+      var type = typeof value;
+      return value != null && (type == "object" || type == "function");
+    }
+    module2.exports = isObject2;
+  }
+});
+
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -76,7 +90,7 @@ var ibmi_compiler_default = IBMiSchemaCompiler;
 
 // src/schema/ibmi-tablecompiler.ts
 var import_tablecompiler = __toESM(require("knex/lib/schema/tablecompiler"));
-var import_isObject = __toESM(require("lodash/isObject"));
+var import_isObject = __toESM(require_isObject());
 var IBMiTableCompiler = class extends import_tablecompiler.default {
   createQuery(columns, ifNot, like) {
     let createStatement = ifNot ? `if object_id('${this.tableName()}', 'U') is null ` : "";
@@ -165,10 +179,8 @@ var ibmi_transaction_default = IBMiTransaction;
 
 // src/query/ibmi-querycompiler.ts
 var import_querycompiler = __toESM(require("knex/lib/query/querycompiler"));
-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 IBMiQueryCompiler = class extends import_querycompiler.default {
   insert() {
     const insertValues = this.single.insert || [];
@@ -180,7 +192,7 @@ var IBMiQueryCompiler = class extends import_querycompiler.default {
       if (insertValues.length === 0) {
         return "";
       }
-    } else if (typeof insertValues === "object" && (0, import_isEmpty.default)(insertValues)) {
+    } else if (typeof insertValues === "object" && Object.keys(insertValues).length === 0) {
       return {
         sql: sql + returningSql + this._emptyInsertValue,
         returning
@@ -211,11 +223,9 @@ var IBMiQueryCompiler = class extends import_querycompiler.default {
     return sql;
   }
   _prepInsert(data) {
-    if ((0, import_isObject2.default)(data)) {
-      if (data.hasOwnProperty("migration_time")) {
-        const parsed = new Date(data.migration_time);
-        data.migration_time = (0, import_date_fns.format)(parsed, "yyyy-MM-dd HH:mm:ss");
-      }
+    if (typeof data === "object" && data.migration_time) {
+      const parsed = new Date(data.migration_time);
+      data.migration_time = (0, import_date_fns.format)(parsed, "yyyy-MM-dd HH:mm:ss");
     }
     const isRaw = (0, import_wrappingFormatter.rawOrFn)(
       data,
@@ -321,6 +331,9 @@ var DB2Client = class extends import_knex.knex.Client {
         `knex: Required configuration option 'client' is missing.`
       );
     }
+    if (config.version) {
+      this.version = config.version;
+    }
     if (this.driverName && config.connection) {
       this.initializeDriver();
       if (!config.pool || config.pool && config.pool.max !== 0) {
@@ -428,19 +441,6 @@ var DB2Client = class extends import_knex.knex.Client {
             ),
             rowCount: result.count
           };
-        } else if (method === "update") {
-          if (obj.selectReturning) {
-            const returningSelect = await connection.query(obj.selectReturning);
-            obj.response = {
-              rows: returningSelect,
-              rowCount: result.count
-            };
-          } else {
-            obj.response = {
-              rows: result,
-              rowCount: result.count
-            };
-          }
         } else {
           obj.response = { rows: result, rowCount: result.count };
         }
@@ -463,8 +463,8 @@ var DB2Client = class extends import_knex.knex.Client {
   columnCompiler(tableCompiler, columnCompiler) {
     return new ibmi_columncompiler_default(this, tableCompiler, columnCompiler);
   }
-  queryCompiler(builder) {
-    return new ibmi_querycompiler_default(this, builder);
+  queryCompiler(builder, bindings) {
+    return new ibmi_querycompiler_default(this, builder, bindings);
   }
   processResponse(obj, runner) {
     if (obj === null) return null;
@@ -487,7 +487,7 @@ var DB2Client = class extends import_knex.knex.Client {
       case "del":
       case "delete":
       case "update":
-        if (obj.selectReturning) {
+        if (obj.select) {
           return rows;
         }
         return rowCount;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bdkinc/knex-ibmi",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Knex dialect for IBMi",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -56,7 +56,6 @@
   "dependencies": {
     "date-fns": "^3.6.0",
     "knex": "^3",
-    "lodash": "^4.17.21",
     "odbc": "^2.4.8"
   }
 }