@bdkinc/knex-ibmi 0.5.2 → 0.5.4

package/dist/index.d.mts

@@ -44,6 +44,7 @@ declare enum SqlMethod {
 }
 declare class DB2Client extends knex.Client {
     private statementCaches;
+    private normalizeBigintToString;
     constructor(config: Knex.Config<DB2Config>);
     private safeStringify;
     _driver(): typeof odbc;
@@ -70,6 +71,9 @@ declare class DB2Client extends knex.Client {
     private executeSelectQuery;
     private executeStatementQuery;
     private isNoDataError;
+    private shouldNormalizeBigintValues;
+    private maybeNormalizeBigint;
+    private normalizeBigintValue;
     /**
      * Format statement response from ODBC driver
      * Handles special case for IDENTITY_VAL_LOCAL() function
@@ -109,8 +113,12 @@ interface DB2PoolConfig {
     acquireConnectionTimeout?: number;
 }
 interface DB2ConnectionParams {
-    CMT?: number;
-    CONNTYPE?: number;
+    DSN?: string;
+    SIGNON?: 0 | 1 | 2 | 3 | 4;
+    SSL?: 0 | 1;
+    CMT?: 0 | 1 | 2 | 3 | 4;
+    CONNTYPE?: 0 | 1 | 2;
+    DATABASE?: string;
     DBQ?: string;
     MAXDECPREC?: 31 | 63;
     MAXDECSCALE?: number;
@@ -126,17 +134,57 @@ interface DB2ConnectionParams {
     TSP?: 0 | 1 | 2 | 3;
     TSFT?: 0 | 1;
     XMLCURIMPPARSE?: 0 | 1;
-    XMLDECLARATION?: 1 | 2 | 3 | 4;
-    ALLOWPROCCALLS?: 0 | 1;
-    XDYNAMIC?: 0 | 1;
+    XMLDECLARATION?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
     DFTPKGLIB?: string;
-    PKG?: 0 | 1 | 2;
+    PKG?: string;
+    XDYNAMIC?: 0 | 1;
     BLOCKFETCH?: 0 | 1;
+    BLOCKSIZE?: number;
     COMPRESSION?: 0 | 1;
     CONCURRENCY?: 0 | 1;
     CURSORSENSITIVITY?: 0 | 1 | 2;
-    EXTCOLINFO?: "SQL_DESC_AUTO_UNIQUE_VALUE" | "SQL_DESC_BASE_COLUMN_NAME" | "SQL_DESC_BASE_TABLE_NAME and SQL_DESC_TABLE_NAME" | "SQL_DESC_LABEL" | "SQL_DESC_SCHEMA_NAME" | "SQL_DESC_SEARCHABLE" | "SQL_DESC_UNNAMED" | "SQL_DESC_UPDATABLE";
+    EXTCOLINFO?: 0 | 1;
+    LAZYCLOSE?: 0 | 1;
+    MAXFIELDLEN?: number;
+    PREFETCH?: 0 | 1;
+    QRYSTGLMT?: number | "*NOMAX";
+    QUERYOPTIMIZEGOAL?: 0 | 1 | 2;
+    QUERYTIMEOUT?: 0 | 1;
+    LANGUAGEID?: "AFR" | "ARA" | "BEL" | "BGR" | "CAT" | "CHS" | "CHT" | "CSY" | "DAN" | "DES" | "DEU" | "ELL" | "ENA" | "ENB" | "ENG" | "ENP" | "ENU" | "ESP" | "EST" | "FAR" | "FIN" | "FRA" | "FRB" | "FRC" | "FRS" | "GAE" | "HEB" | "HRV" | "HUN" | "ISL" | "ITA" | "ITS" | "JPN" | "KOR" | "LAO" | "LVA" | "LTU" | "MKD" | "NLB" | "NLD" | "NON" | "NOR" | "PLK" | "PTB" | "PTG" | "RMS" | "ROM" | "RUS" | "SKY" | "SLO" | "SQI" | "SRB" | "SRL" | "SVE" | "THA" | "TRK" | "UKR" | "URD" | "VIE";
+    SORTTABLE?: string;
+    SORTTYPE?: 0 | 1 | 2 | 3;
+    SORTWEIGHT?: 0 | 1;
+    CATALOGOPTIONS?: number;
+    LIBVIEW?: 0 | 1 | 2;
+    REMARKS?: 0 | 1;
+    SEARCHPATTERN?: 0 | 1;
+    ALLOWUNSCHAR?: 0 | 1;
+    CCSID?: number;
+    GRAPHIC?: 0 | 1 | 2 | 3;
+    HEXPARSEROPT?: 0 | 1;
+    TRANSLATE?: 0 | 1;
+    TRIMCHAR?: 0 | 1;
+    UNICODESQL?: 0 | 1;
+    XLATEDLL?: string;
+    XLATEOPT?: number;
+    QAQQINILIB?: string;
+    SQDIAGCODE?: string;
+    TRACE?: number;
+    ALWAYSCALCLEN?: 0 | 1;
+    ALLOWPROCCALLS?: 0 | 1;
+    CONCURRENTACCESSRESOLUTION?: 0 | 1 | 2 | 3;
+    DB2SQLSTATES?: 0 | 1;
+    DATETIMETOCHAR?: number;
+    DBCSNoTruncError?: 0 | 1;
+    DEBUG?: number;
+    KEEPALIVE?: 0 | 1 | 2;
+    LOGINTIMEOUT?: number;
+    TIMEOUT?: number;
     TRUEAUTOCOMMIT?: 0 | 1;
+    NEWPWD?: string;
+    XALCS?: 0 | 1;
+    XALOCKTIMEOUT?: number;
+    XATXNTIMEOUT?: number;
 }
 interface DB2ConnectionConfig {
     database: string;
@@ -157,6 +205,7 @@ interface DB2Config extends Knex.Config {
         preparedStatementCache?: boolean;
         preparedStatementCacheSize?: number;
         readUncommitted?: boolean;
+        normalizeBigintToString?: boolean;
     };
 }
 declare const DB2Dialect: typeof DB2Client;

package/dist/index.d.ts

@@ -44,6 +44,7 @@ declare enum SqlMethod {
 }
 declare class DB2Client extends knex.Client {
     private statementCaches;
+    private normalizeBigintToString;
     constructor(config: Knex.Config<DB2Config>);
     private safeStringify;
     _driver(): typeof odbc;
@@ -70,6 +71,9 @@ declare class DB2Client extends knex.Client {
     private executeSelectQuery;
     private executeStatementQuery;
     private isNoDataError;
+    private shouldNormalizeBigintValues;
+    private maybeNormalizeBigint;
+    private normalizeBigintValue;
     /**
      * Format statement response from ODBC driver
      * Handles special case for IDENTITY_VAL_LOCAL() function
@@ -109,8 +113,12 @@ interface DB2PoolConfig {
     acquireConnectionTimeout?: number;
 }
 interface DB2ConnectionParams {
-    CMT?: number;
-    CONNTYPE?: number;
+    DSN?: string;
+    SIGNON?: 0 | 1 | 2 | 3 | 4;
+    SSL?: 0 | 1;
+    CMT?: 0 | 1 | 2 | 3 | 4;
+    CONNTYPE?: 0 | 1 | 2;
+    DATABASE?: string;
     DBQ?: string;
     MAXDECPREC?: 31 | 63;
     MAXDECSCALE?: number;
@@ -126,17 +134,57 @@ interface DB2ConnectionParams {
     TSP?: 0 | 1 | 2 | 3;
     TSFT?: 0 | 1;
     XMLCURIMPPARSE?: 0 | 1;
-    XMLDECLARATION?: 1 | 2 | 3 | 4;
-    ALLOWPROCCALLS?: 0 | 1;
-    XDYNAMIC?: 0 | 1;
+    XMLDECLARATION?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
     DFTPKGLIB?: string;
-    PKG?: 0 | 1 | 2;
+    PKG?: string;
+    XDYNAMIC?: 0 | 1;
     BLOCKFETCH?: 0 | 1;
+    BLOCKSIZE?: number;
     COMPRESSION?: 0 | 1;
     CONCURRENCY?: 0 | 1;
     CURSORSENSITIVITY?: 0 | 1 | 2;
-    EXTCOLINFO?: "SQL_DESC_AUTO_UNIQUE_VALUE" | "SQL_DESC_BASE_COLUMN_NAME" | "SQL_DESC_BASE_TABLE_NAME and SQL_DESC_TABLE_NAME" | "SQL_DESC_LABEL" | "SQL_DESC_SCHEMA_NAME" | "SQL_DESC_SEARCHABLE" | "SQL_DESC_UNNAMED" | "SQL_DESC_UPDATABLE";
+    EXTCOLINFO?: 0 | 1;
+    LAZYCLOSE?: 0 | 1;
+    MAXFIELDLEN?: number;
+    PREFETCH?: 0 | 1;
+    QRYSTGLMT?: number | "*NOMAX";
+    QUERYOPTIMIZEGOAL?: 0 | 1 | 2;
+    QUERYTIMEOUT?: 0 | 1;
+    LANGUAGEID?: "AFR" | "ARA" | "BEL" | "BGR" | "CAT" | "CHS" | "CHT" | "CSY" | "DAN" | "DES" | "DEU" | "ELL" | "ENA" | "ENB" | "ENG" | "ENP" | "ENU" | "ESP" | "EST" | "FAR" | "FIN" | "FRA" | "FRB" | "FRC" | "FRS" | "GAE" | "HEB" | "HRV" | "HUN" | "ISL" | "ITA" | "ITS" | "JPN" | "KOR" | "LAO" | "LVA" | "LTU" | "MKD" | "NLB" | "NLD" | "NON" | "NOR" | "PLK" | "PTB" | "PTG" | "RMS" | "ROM" | "RUS" | "SKY" | "SLO" | "SQI" | "SRB" | "SRL" | "SVE" | "THA" | "TRK" | "UKR" | "URD" | "VIE";
+    SORTTABLE?: string;
+    SORTTYPE?: 0 | 1 | 2 | 3;
+    SORTWEIGHT?: 0 | 1;
+    CATALOGOPTIONS?: number;
+    LIBVIEW?: 0 | 1 | 2;
+    REMARKS?: 0 | 1;
+    SEARCHPATTERN?: 0 | 1;
+    ALLOWUNSCHAR?: 0 | 1;
+    CCSID?: number;
+    GRAPHIC?: 0 | 1 | 2 | 3;
+    HEXPARSEROPT?: 0 | 1;
+    TRANSLATE?: 0 | 1;
+    TRIMCHAR?: 0 | 1;
+    UNICODESQL?: 0 | 1;
+    XLATEDLL?: string;
+    XLATEOPT?: number;
+    QAQQINILIB?: string;
+    SQDIAGCODE?: string;
+    TRACE?: number;
+    ALWAYSCALCLEN?: 0 | 1;
+    ALLOWPROCCALLS?: 0 | 1;
+    CONCURRENTACCESSRESOLUTION?: 0 | 1 | 2 | 3;
+    DB2SQLSTATES?: 0 | 1;
+    DATETIMETOCHAR?: number;
+    DBCSNoTruncError?: 0 | 1;
+    DEBUG?: number;
+    KEEPALIVE?: 0 | 1 | 2;
+    LOGINTIMEOUT?: number;
+    TIMEOUT?: number;
     TRUEAUTOCOMMIT?: 0 | 1;
+    NEWPWD?: string;
+    XALCS?: 0 | 1;
+    XALOCKTIMEOUT?: number;
+    XATXNTIMEOUT?: number;
 }
 interface DB2ConnectionConfig {
     database: string;
@@ -157,6 +205,7 @@ interface DB2Config extends Knex.Config {
         preparedStatementCache?: boolean;
         preparedStatementCacheSize?: number;
         readUncommitted?: boolean;
+        normalizeBigintToString?: boolean;
     };
 }
 declare const DB2Dialect: typeof DB2Client;

package/dist/index.js

@@ -40,6 +40,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_node_process = __toESM(require("process"));
+var import_node_buffer = require("buffer");
 var import_knex = __toESM(require("knex"));
 var import_odbc = __toESM(require("odbc"));
 
@@ -838,6 +839,7 @@ var DB2Client = class extends import_knex.default.Client {
     super(config);
     // Per-connection statement cache (WeakMap so it's GC'd with connections)
     __publicField(this, "statementCaches", /* @__PURE__ */ new WeakMap());
+    __publicField(this, "normalizeBigintToString");
     this.driverName = "odbc";
     if (this.dialect && !this.config.client) {
       this.printWarn(
@@ -863,6 +865,8 @@ var DB2Client = class extends import_knex.default.Client {
     if (config.useNullAsDefault) {
       this.valueForUndefined = null;
     }
+    const ibmiConfig = config?.ibmi;
+    this.normalizeBigintToString = ibmiConfig?.normalizeBigintToString !== false;
   }
   // Helper method to safely stringify objects that might have circular references
   safeStringify(obj, indent = 0) {
@@ -1143,7 +1147,8 @@ var DB2Client = class extends import_knex.default.Client {
       obj.bindings
     );
     if (rows) {
-      obj.response = { rows, rowCount: rows.length };
+      const normalizedRows = this.maybeNormalizeBigint(rows);
+      obj.response = { rows: normalizedRows, rowCount: normalizedRows.length };
     }
   }
   async executeStatementQuery(connection, obj) {
@@ -1161,7 +1166,9 @@ var DB2Client = class extends import_knex.default.Client {
         statement = cache.get(obj.sql);
         if (statement) {
           usedCache = true;
-          this.printDebug(`Using cached statement for: ${obj.sql.substring(0, 50)}...`);
+          this.printDebug(
+            `Using cached statement for: ${obj.sql.substring(0, 50)}...`
+          );
         } else {
           statement = await connection.createStatement();
           await statement.prepare(obj.sql);
@@ -1212,6 +1219,44 @@ var DB2Client = class extends import_knex.default.Client {
     const msg = String(error?.message || error || "").toLowerCase();
     return msg.includes("02000") || msg.includes("no data") || msg.includes("no rows") || msg.includes("0 rows");
   }
+  shouldNormalizeBigintValues() {
+    return this.normalizeBigintToString;
+  }
+  maybeNormalizeBigint(value) {
+    if (value === null || value === void 0) {
+      return value;
+    }
+    if (!this.shouldNormalizeBigintValues()) {
+      return value;
+    }
+    return this.normalizeBigintValue(value);
+  }
+  normalizeBigintValue(value, seen = /* @__PURE__ */ new WeakSet()) {
+    if (typeof value === "bigint") {
+      return value.toString();
+    }
+    if (Array.isArray(value)) {
+      for (let i = 0; i < value.length; i++) {
+        value[i] = this.normalizeBigintValue(value[i], seen);
+      }
+      return value;
+    }
+    if (value && typeof value === "object") {
+      if (value instanceof Date || import_node_buffer.Buffer.isBuffer(value) || ArrayBuffer.isView(value)) {
+        return value;
+      }
+      const obj = value;
+      if (seen.has(obj)) {
+        return value;
+      }
+      seen.add(obj);
+      for (const key of Object.keys(obj)) {
+        obj[key] = this.normalizeBigintValue(obj[key], seen);
+      }
+      return value;
+    }
+    return value;
+  }
   /**
    * Format statement response from ODBC driver
    * Handles special case for IDENTITY_VAL_LOCAL() function
@@ -1219,16 +1264,18 @@ var DB2Client = class extends import_knex.default.Client {
   formatStatementResponse(result) {
     const isIdentityQuery = result.statement?.includes("IDENTITY_VAL_LOCAL()");
     if (isIdentityQuery && result.columns?.length > 0) {
+      const identityRows = result.map(
+        (row) => row[result.columns[0].name]
+      );
+      const normalizedIdentityRows = this.maybeNormalizeBigint(identityRows);
       return {
-        rows: result.map(
-          (row) => row[result.columns[0].name]
-        ),
+        rows: normalizedIdentityRows,
         rowCount: result.count
       };
     }
     const rowCount = typeof result?.count === "number" ? result.count : 0;
     return {
-      rows: result,
+      rows: this.maybeNormalizeBigint(result),
       rowCount
     };
   }
@@ -1300,7 +1347,7 @@ var DB2Client = class extends import_knex.default.Client {
             return;
           }
           if (!cursor.noData) {
-            this.push(result);
+            this.push(parentThis.maybeNormalizeBigint(result));
           } else {
             isClosed = true;
             cursor.close((closeError) => {
@@ -1308,7 +1355,7 @@ var DB2Client = class extends import_knex.default.Client {
                 parentThis.printError(parentThis.safeStringify(closeError, 2));
               }
               if (result) {
-                this.push(result);
+                this.push(parentThis.maybeNormalizeBigint(result));
               }
               this.push(null);
             });
@@ -1372,6 +1419,9 @@ var DB2Client = class extends import_knex.default.Client {
         throw wrappedError;
       }
     }
+    if (response) {
+      this.maybeNormalizeBigint(response.rows);
+    }
     const validationResult = this.validateResponse(obj);
     if (validationResult !== null) return validationResult;
     return this.processSqlMethod(obj);