simpler query

splitice · splitice · commit b7a235609313 · 2025-07-18T17:00:24.000+10:00
diff --git a/packages/pg/lib/query.js b/packages/pg/lib/query.js
@@ -7,27 +7,47 @@ class Query {
   constructor(config, values, callback) {
     config = utils.normalizeQueryConfig(config, values, callback)
 
-    this.text = config.text
-    this.values = config.values
-    this.rows = config.rows
-    this.types = config.types
-    this.name = config.name
-    this.queryMode = config.queryMode
-    this.binary = config.binary
-    // use unique portal name each time
-    this.portal = config.portal || ''
-    this.callback = config.callback
-    this._rowMode = config.rowMode
-    if (process.domain && config.callback) {
-      this.callback = process.domain.bind(config.callback)
-    }
-    this._result = new Result(this._rowMode, this.types)
+    this._config = config
+
+    if (typeof values === 'function') {
+      callback = values
+      values = undefined
+    }
+    this.values = values || config.values
+
+    if (callback) {
+      this.callback = callback || config.callback
+    }
+
+    this._result = new Result(this._config.rowMode, this.types)
 
     // potential for multiple results
     this._results = this._result
     this._canceledDueToError = false
   }
 
+  get text() {
+    return this._config.text
+  }
+  get rows() {
+    return this._config.rows
+  }
+  get types() {
+    return this._config.types
+  }
+  get name() {
+    return this._config.name
+  }
+  get queryMode() {
+    return this._config.queryMode
+  }
+  get binary() {
+    return this._config.binary
+  }
+  get portal() {
+    return this._config.portal || ''
+  }
+
   requiresPreparation() {
     if (this.queryMode === 'extended') {
       return true
@@ -61,7 +81,7 @@ class Query {
       if (!Array.isArray(this._results)) {
         this._results = [this._result]
       }
-      this._result = new Result(this._rowMode, this.types)
+      this._result = new Result(this._config.rowMode, this.types)
       this._results.push(this._result)
     }
   }
@@ -72,7 +92,6 @@ class Query {
   handleRowDescription(msg) {
     this._checkForMultirow()
     this._result.addFields(msg.fields)
-    this._accumulateRows = this.callback || !this.listeners('row').length
   }
 
   handleDataRow(msg) {
@@ -89,9 +108,9 @@ class Query {
       return
     }
 
-    if (this._accumulateRows) {
+    //if (this.callback) {
       this._result.addRow(row)
-    }
+    //}
   }
 
   handleCommandComplete(msg, connection) {
diff --git a/packages/pg/lib/utils.js b/packages/pg/lib/utils.js
@@ -155,19 +155,10 @@ function dateToStringUTC(date) {
   return ret
 }
 
-function normalizeQueryConfig(config, values, callback) {
+function normalizeQueryConfig(config) {
   // can take in strings or config objects
   config = typeof config === 'string' ? { text: config } : config
-  if (values) {
-    if (typeof values === 'function') {
-      config.callback = values
-    } else {
-      config.values = values
-    }
-  }
-  if (callback) {
-    config.callback = callback
-  }
+  
   return config
 }
 
