@bdkinc/knex-ibmi 0.5.10 → 0.5.12

package/dist/index.d.mts

@@ -201,13 +201,18 @@ interface DB2ConnectionParams {
     XATXNTIMEOUT?: number;
 }
 interface DB2ConnectionConfig {
-    database: string;
+    database?: string;
     host: string;
-    port: 8471 | 9471 | number;
+    port?: number;
     user: string;
     password: string;
     driver: "IBM i Access ODBC Driver" | string;
     connectionStringParams?: DB2ConnectionParams;
+    sessionInit?: {
+        currentSchema?: string;
+        currentPath?: string;
+        statements?: string[];
+    };
 }
 interface DB2Config extends Knex.Config {
     client: any;

package/dist/index.d.ts

@@ -201,13 +201,18 @@ interface DB2ConnectionParams {
     XATXNTIMEOUT?: number;
 }
 interface DB2ConnectionConfig {
-    database: string;
+    database?: string;
     host: string;
-    port: 8471 | 9471 | number;
+    port?: number;
     user: string;
     password: string;
     driver: "IBM i Access ODBC Driver" | string;
     connectionStringParams?: DB2ConnectionParams;
+    sessionInit?: {
+        currentSchema?: string;
+        currentPath?: string;
+        statements?: string[];
+    };
 }
 interface DB2Config extends Knex.Config {
     client: any;

package/dist/index.js

@@ -926,6 +926,20 @@ var DB2Client = class extends import_knex.default.Client {
     const connection = await this.driver.connect(
       this._getConnectionString(connectionConfig)
     );
+    if (connectionConfig.sessionInit) {
+      const { currentSchema, currentPath, statements } = connectionConfig.sessionInit;
+      if (currentSchema) {
+        await connection.query(`SET CURRENT SCHEMA = ${currentSchema}`);
+      }
+      if (currentPath) {
+        await connection.query(`SET CURRENT PATH = ${currentPath}`);
+      }
+      if (statements && statements.length > 0) {
+        for (const stmt of statements) {
+          await connection.query(stmt);
+        }
+      }
+    }
     return connection;
   }
   // Used to explicitly close a connection, called internally by the pool manager
@@ -958,7 +972,8 @@ var DB2Client = class extends import_knex.default.Client {
       const value = connectionStringParams[key];
       return `${result}${key}=${value};`;
     }, "");
-    return `DRIVER=${connectionConfig.driver};SYSTEM=${connectionConfig.host};PORT=${connectionConfig.port || 8471};DATABASE=${connectionConfig.database};UID=${connectionConfig.user};PWD=${connectionConfig.password};` + connectionStringExtension;
+    const databasePart = connectionConfig.database ? `DATABASE=${connectionConfig.database};` : "";
+    return `DRIVER=${connectionConfig.driver};SYSTEM=${connectionConfig.host};PORT=${connectionConfig.port || 8471};` + databasePart + `UID=${connectionConfig.user};PWD=${connectionConfig.password};` + connectionStringExtension;
   }
   // Runs the query on the specified connection, providing the bindings
   async _query(connection, obj) {
@@ -1454,11 +1469,25 @@ var DB2Client = class extends import_knex.default.Client {
   validateResponse(obj) {
     if (!obj.response) {
       this.printDebug("response undefined " + this.safeStringify(obj));
-      return null;
+      return this.processSqlMethod({
+        ...obj,
+        response: { rows: [], rowCount: 0 }
+      });
     }
     if (!obj.response.rows) {
-      this.printError("rows undefined " + this.safeStringify(obj));
-      return null;
+      const usesRowCountOnly = !obj.select && (obj.sqlMethod === "del" /* DELETE */ || obj.sqlMethod === "delete" /* DELETE_ALT */ || obj.sqlMethod === "update" /* UPDATE */ || obj.sqlMethod === "counter" /* COUNTER */);
+      if (usesRowCountOnly) {
+        return null;
+      }
+      this.printWarn("rows undefined " + this.safeStringify(obj));
+      return this.processSqlMethod({
+        ...obj,
+        response: {
+          ...obj.response,
+          rows: [],
+          rowCount: obj.response.rowCount ?? 0
+        }
+      });
     }
     return null;
   }
@@ -1548,7 +1577,8 @@ var DB2Client = class extends import_knex.default.Client {
     return errorMessage.includes("sql") || errorMessage.includes("syntax") || errorMessage.includes("table") || errorMessage.includes("column");
   }
   processSqlMethod(obj) {
-    const { rows, rowCount } = obj.response;
+    const rows = obj.response?.rows ?? [];
+    const rowCount = obj.response?.rowCount;
     switch (obj.sqlMethod) {
       case "select" /* SELECT */:
         return rows;