Move all logic for prebuilding objects to Result

brianc · Aug 11, 2023 · cfff0b9 · cfff0b9
1 parent 2172d4e
commit cfff0b9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/packages/pg/lib/query.js b/packages/pg/lib/query.js
@@ -31,7 +31,6 @@ class Query extends EventEmitter {
     this.isPreparedStatement = false
     this._canceledDueToError = false
     this._promise = null
-    this._prebuiltEmptyResultObject = null
   }
 
   requiresPreparation() {
@@ -65,7 +64,6 @@ class Query extends EventEmitter {
       }
       this._result = new Result(this._rowMode, this.types)
       this._results.push(this._result)
-      this._prebuiltEmptyResultObject = null
     }
   }
 
@@ -85,12 +83,8 @@ class Query extends EventEmitter {
       return
     }
 
-    if (!this._prebuiltEmptyResultObject) {
-      this._createPrebuiltEmptyResultObject()
-    }
-
     try {
-      row = this._result.parseRow(msg.fields, { ... this._prebuiltEmptyResultObject })
+      row = this._result.parseRow(msg.fields)
     } catch (err) {
       this._canceledDueToError = err
       return
@@ -242,13 +236,6 @@ class Query extends EventEmitter {
   handleCopyData(msg, connection) {
     // noop
   }
-  _createPrebuiltEmptyResultObject() {
-    var row = {};
-    for (var i = 0; i < this._result.fields.length; i++) {
-      row[this._result.fields[i].name] = null
-    }
-    this._prebuiltEmptyResultObject = row
-  }
 }
 
 module.exports = Query
diff --git a/packages/pg/lib/result.js b/packages/pg/lib/result.js
@@ -21,6 +21,7 @@ class Result {
     if (this.rowAsArray) {
       this.parseRow = this._parseRowAsArray
     }
+    this._prebuiltEmptyResultObject = null
   }
 
   // adds a command complete message
@@ -59,14 +60,16 @@ class Result {
     return row
   }
 
-  parseRow(rowData, row = {}) {
+  parseRow(rowData) {
+    if (!this._prebuiltEmptyResultObject) {
+      this._createPrebuiltEmptyResultObject()
+    }
+    var row = { ... this._prebuiltEmptyResultObject }
     for (var i = 0, len = rowData.length; i < len; i++) {
       var rawValue = rowData[i]
       var field = this.fields[i].name
       if (rawValue !== null) {
         row[field] = this._parsers[i](rawValue)
-      } else {
-        row[field] = null
       }
     }
     return row
@@ -94,6 +97,13 @@ class Result {
       }
     }
   }
+  _createPrebuiltEmptyResultObject() {
+    var row = {};
+    for (var i = 0; i < this.fields.length; i++) {
+      row[this.fields[i].name] = null
+    }
+    this._prebuiltEmptyResultObject = row
+  }
 }
 
 module.exports = Result