@bdkinc/knex-ibmi 0.2.2 → 0.2.4

package/README.md

@@ -7,6 +7,7 @@
 This is an external dialect for [knex](https://knexjs.org).
 This library uses the ODBC (as recommended here https://ibmi-oss-docs.readthedocs.io/en/latest/odbc/README.html)
 driver and is only tested on IBMi.
+
 For more information on IBMi OSS here are the [docs](https://ibmi-oss-docs.readthedocs.io/en/latest/README.html)
 
 ## Supported functionality
@@ -43,15 +44,16 @@ const { DB2Dialect } = require("@bdkinc/knex-ibmi");
 const db = knex({
   client: DB2Dialect,
   connection: {
-    host: "localhost",
-    database: "knextest",
-    port: 50000,
-    user: "<user>",
-    password: "<password>",
-    driver: "IBM i Access ODBC Driver",
-    connectionStringParams: {
-      ALLOWPROCCALLS: 1,
+    host: "localhost", // hostname or ip address of server
+    database: "knextest", // usually named in your odbc.ini connection
+    port: 50000, // default port
+    user: "<user>", // IBMi username
+    password: "<password>", // IBMi password
+    driver: "IBM i Access ODBC Driver", // defined in odbcinst.ini
+    connectionStringParams: { // DSN connection string parameters https://www.ibm.com/docs/en/i/7.5?topic=details-connection-string-keywords
+      ALLOWPROCCALLS: 1, 
       CMT: 0,
+      DBQ: 'MYLIB' // library or schema that holds the tables
     },
   },
   pool: {
@@ -77,15 +79,16 @@ import { DB2Dialect } from "@bdkinc/knex-ibmi";
 const db = knex({
   client: DB2Dialect,
   connection: {
-    host: "localhost",
-    database: "knextest",
-    port: 50000,
-    user: "<user>",
-    password: "<password>",
-    driver: "IBM i Access ODBC Driver",
-    connectionStringParams: {
+    host: "localhost", // hostname or ip address of server
+    database: "knextest", // usually named in your odbc.ini connection
+    port: 50000, // default port
+    user: "<user>", // IBMi username
+    password: "<password>", // IBMi password
+    driver: "IBM i Access ODBC Driver", // defined in odbcinst.ini
+    connectionStringParams: { // DSN connection string parameters https://www.ibm.com/docs/en/i/7.5?topic=details-connection-string-keywords
       ALLOWPROCCALLS: 1,
       CMT: 0,
+      DBQ: 'MYLIB' // library or schema that holds the tables
     },
   },
   pool: {
@@ -113,15 +116,16 @@ import { DB2Dialect, DB2Config } from "@bdkinc/knex-ibmi";
 const config: DB2Config = {
   client: DB2Dialect,
   connection: {
-    host: "localhost",
-    database: "knextest",
-    port: 50000,
-    user: "<user>",
-    password: "<password>",
-    driver: "IBM i Access ODBC Driver",
-    connectionStringParams: {
+    host: "localhost", // hostname or ip address of server
+    database: "knextest", // usually named in your odbc.ini connection
+    port: 50000, // default port
+    user: "<user>", // IBMi username
+    password: "<password>", // IBMi password
+    driver: "IBM i Access ODBC Driver", // defined in odbcinst.ini
+    connectionStringParams: { // DSN connection string parameters https://www.ibm.com/docs/en/i/7.5?topic=details-connection-string-keywords
       ALLOWPROCCALLS: 1,
       CMT: 0,
+      DBQ: 'MYLIB' // library or schema that holds the tables
     },
   },
   pool: {

package/dist/index.d.ts

@@ -40,7 +40,6 @@ declare class IBMiQueryCompiler extends QueryCompiler {
     update(): {
         sql: string;
         returning: any;
-        selectReturning: string;
     };
     _returning(method: string, value: any, withTrigger: undefined): string | undefined;
     columnizeWithPrefix(prefix: string, target: any): string;
@@ -94,12 +93,10 @@ interface DB2ConnectionConfig {
     driver: "IBM i Access ODBC Driver" | string;
     connectionStringParams?: DB2ConnectionParams;
 }
-interface DB2Config {
+interface DB2Config extends Knex.Config {
     client: any;
     connection: DB2ConnectionConfig;
     pool?: DB2PoolConfig;
-    version?: string;
-    useNullAsDefault?: boolean;
 }
 declare const DB2Dialect: typeof DB2Client;
 

package/dist/index.js

@@ -271,17 +271,15 @@ var IBMiQueryCompiler = class extends import_querycompiler.default {
     const order = this.order();
     const limit = this.limit();
     const { returning } = this.single;
-    const values = Object.values(this.single.update).map((a) => `${a}`).join(", ");
-    const moreWheres = this.grouped.where && this.grouped.where.length > 0 ? 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 ${this.tableName} where ${Object.entries(this.single.update).map(([key, value]) => `"${key}" = '${value}'`).join(" and ")}${moreWheres.length > 0 && " and "}${moreWheres.join(
-      " and "
-    )}` : "";
-    const sql = withSQL + `update ${this.single.only ? "only " : ""}${this.tableName} set ` + updates.join(", ") + (where ? ` ${where}` : "") + (order ? ` ${order}` : "") + (limit ? ` ${limit}` : "");
-    return { sql, returning, selectReturning };
+    let sql = "";
+    if (returning) {
+      sql += `select ${this.formatter.columnize(this.single.returning)} from FINAL TABLE(`;
+    }
+    sql += withSQL + `update ${this.single.only ? "only " : ""}${this.tableName} set ` + updates.join(", ") + (where ? ` ${where}` : "") + (order ? ` ${order}` : "") + (limit ? ` ${limit}` : "");
+    if (returning) {
+      sql += `)`;
+    }
+    return { sql, returning };
   }
   _returning(method, value, withTrigger) {
     switch (method) {
@@ -348,11 +346,10 @@ var DB2Client = class extends import_knex.knex.Client {
     }
   }
   printError(message) {
-    if (import_node_process.default.env.DEBUG === "true") {
-      if (this.logger.error) {
-        this.logger.error("knex-ibmi: " + message);
-      }
+    if (this.logger.error) {
+      this.logger.error("knex-ibmi: " + message);
     }
+    throw new Error(message);
   }
   printWarn(message) {
     if (import_node_process.default.env.DEBUG === "true") {
@@ -448,8 +445,7 @@ var DB2Client = class extends import_knex.knex.Client {
           obj.response = { rows: result, rowCount: result.count };
         }
       } catch (err) {
-        this.printError(err);
-        throw new Error(err);
+        this.printError(JSON.stringify(err));
       }
     }
     this.printDebug(obj);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bdkinc/knex-ibmi",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Knex dialect for IBMi",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",