@bdkinc/knex-ibmi 0.3.1 → 0.3.5

package/README.md

@@ -208,7 +208,7 @@ try {
 
   await finished(data); // db queries are promises, we need to wait until resolved
 
-  // or we can iterate through each record one at a time (fetchSize has no effect)
+  // or we can iterate through each record
   for await (const record of data) {
     console.log(record);
   }

package/dist/index.js

@@ -449,35 +449,41 @@ var DB2Client = class extends import_knex.knex.Client {
     this.printDebug(obj);
     return obj;
   }
-  _stream(connection, obj, stream, options) {
+  async _stream(connection, obj, stream, options) {
     if (!obj.sql) throw new Error("A query is required to stream results");
     return new Promise(async (resolve, reject) => {
-      stream.on("error", (err) => {
-        if (err) {
-          connection.__knex__disposed = err;
-        }
-        reject(err);
-      });
+      stream.on("error", reject);
       stream.on("end", resolve);
+      const cursor = await connection.query(obj.sql, obj.bindings, {
+        cursor: true,
+        fetchSize: options?.fetchSize || 1
+      });
       const readableStream = new import_node_stream.Readable({
         objectMode: true,
-        async read() {
-          const cursor = await connection.query(obj.sql, obj.bindings, {
-            cursor: true,
-            fetchSize: options?.fetchSize || 1
+        read() {
+          cursor.fetch((error, result) => {
+            if (error) {
+              console.log(error);
+              return;
+            }
+            if (!cursor.noData) {
+              this.push(result);
+            } else {
+              cursor.close((error2) => {
+                if (error2) {
+                  console.log(error2);
+                  return;
+                }
+              });
+            }
           });
-          while (!cursor.noData) {
-            const result = await cursor.fetch();
-            this.push(result);
-          }
-          await cursor.close();
         }
       });
-      readableStream.pipe(stream);
       readableStream.on("error", (err) => {
         reject(err);
         stream.emit("error", err);
       });
+      readableStream.pipe(stream);
     });
   }
   transaction(container, config, outerTx) {

package/package.json

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