Fix logical error handling with queryStream() (Issue #1391)

Author: Christopher Jones

CHANGELOG.md

@@ -12,6 +12,12 @@
   pool properties `user`, `connectString`, `edition`, `events`,
   `externalAuth`, and `homogeneous` on the Pool and PoolStatistics classes.
 
+- Fixed `queryStream()` logical error handling ([Issue
+  1391](https://github.com/oracle/node-oracledb/issues/1391)).
+
+- Prevent intermingling of `queryStream()` streaming and `getRow()`/`getRows()`
+  calls.
+
 ## node-oracledb v5.2.0 (7 Jun 2021)
 
 - Connection pool changes:

lib/queryStream.js

@@ -89,18 +89,20 @@ class QueryStream extends Readable {
       this._fetching = true;
       this._resultSet._allowGetRowCall = true;
       const row = await this._resultSet.getRow();
-      this._fetching = false;
-      if (!this._resultSet) {
-        this.emit('_doneFetching');
-        return;
-      }
       if (row) {
         this.push(row);
       } else {
         this.push(null);
       }
     } catch (err) {
       this.destroy(err);
+    } finally {
+      this._fetching = false;
+      if (this.resultSet) {
+        this._resultSet._allowGetRowCall = false;
+      } else {
+        this.emit('_doneFetching');
+      }
     }
   }
 

test/list.txt

@@ -329,6 +329,7 @@ Overview of node-oracledb functional tests
         13.1.9 Read CLOBs after stream close
         13.1.10 meta data
         13.1.11 should emit events in the correct order
+        13.1.12 query with logical error should throw error
     13.2 Testing QueryStream.destroy
         13.2.1 should be able to stop the stream early with destroy
         13.2.2 should be able to stop the stream before any data

test/stream1.js

@@ -483,6 +483,26 @@ describe('13. stream1.js', function() {
         done(new Error('Test should not have thrown an error'));
       });
     });
+
+    it('13.1.12 query with logical error should throw error', function(done) {
+      const sql = 'select 1 from dual union all select 1 from dual union all select 1/0 from dual';
+      let stream = connection.queryStream(sql);
+
+      stream.on('error', function(error) {
+        should.exist(error);
+        should.strictEqual(error.message, 'ORA-01476: divisor is equal to zero');
+      });
+
+      stream.on('data', function(data) {
+        should.not.exist(data);
+      });
+
+      stream.on('end', function() {
+        stream.destroy();
+      });
+
+      stream.on('close', done);
+    });
   });
 
   describe('13.2 Testing QueryStream.destroy', function() {