Add test; use string for queryMode

Author: alxndrsn

docs/pages/apis/client.mdx

@@ -76,9 +76,8 @@ type QueryConfig {
   // custom type parsers just for this query result
   types?: Types;
 
-  // force extended query usage - prevents multiple statements in a
-  // single query
-  forcePreparation?: boolean;
+  // TODO: document
+  queryMode?: string;
 }
 ```
 

packages/pg/lib/native/query.js

@@ -10,7 +10,7 @@ var NativeQuery = (module.exports = function (config, values, callback) {
   this.text = config.text
   this.values = config.values
   this.name = config.name
-  this.forcePreparation = config.forcePreparation
+  this.queryMode = config.forcePreparation
   this.callback = config.callback
   this.state = 'new'
   this._arrayMode = config.rowMode === 'array'
@@ -160,7 +160,7 @@ NativeQuery.prototype.submit = function (client) {
     }
     var vals = this.values.map(utils.prepareValue)
     client.native.query(this.text, vals, after)
-  } else if (this.forcePreparation) {
+  } else if (this.queryMode === 'extended') {
     client.native.query(this.text, [], after)
   } else {
     client.native.query(this.text, after)

packages/pg/lib/query.js

@@ -16,7 +16,7 @@ class Query extends EventEmitter {
     this.rows = config.rows
     this.types = config.types
     this.name = config.name
-    this.forcePreparation = config.forcePreparation
+    this.queryMode = config.queryMode
     this.binary = config.binary
     // use unique portal name each time
     this.portal = config.portal || ''
@@ -33,8 +33,7 @@ class Query extends EventEmitter {
   }
 
   requiresPreparation() {
-    // preparation has been requested
-    if (this.forcePreparation) {
+    if (this.queryMode === 'extended') {
       return true
     }
 

packages/pg/test/integration/client/multiple-results-tests.js

@@ -25,6 +25,31 @@ suite.test(
   })
 )
 
+suite.test(
+  'throws if queryMode set to "extended"',
+  co.wrap(function* () {
+    const client = new helper.Client()
+    yield client.connect()
+
+    // TODO should be text or sql?
+    try {
+      const results = yield client.query({
+        text: `SELECT 'foo'::text as name; SELECT 'bar'::text as baz`,
+        queryMode: 'extended',
+      })
+      assert.fail('Should have thrown');
+    } catch(err) {
+      if(err instanceof assert.AssertionError) throw err;
+
+      assert.equal(err.severity, 'ERROR');
+      assert.equal(err.code, '42601');
+      assert.equal(err.message, 'cannot insert multiple commands into a prepared statement');
+    }
+
+    return client.end()
+  })
+)
+
 suite.test(
   'multiple selects work',
   co.wrap(function* () {