From b16711f912a155cd82c01712596d136be77568f7 Mon Sep 17 00:00:00 2001
From: Shayon Mukherjee <shayon@loom.com>
Date: Sat, 24 Oct 2020 13:39:44 -0700
Subject: [PATCH] Skip adding options twice and extend specs

---
 packages/pg/lib/connection-parameters.js                     | 1 -
 .../pg/test/unit/connection-parameters/creation-tests.js     | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/pg/lib/connection-parameters.js b/packages/pg/lib/connection-parameters.js
index 8258fd3d4..c5914a1a7 100644
--- a/packages/pg/lib/connection-parameters.js
+++ b/packages/pg/lib/connection-parameters.js
@@ -143,7 +143,6 @@ class ConnectionParameters {
     add(params, this, 'application_name')
     add(params, this, 'fallback_application_name')
     add(params, this, 'connect_timeout')
-    add(params, this, 'options')
 
     addOption(pgOptions, this, 'statement_timeout')
     addOption(pgOptions, this, 'idle_in_transaction_session_timeout')
diff --git a/packages/pg/test/unit/connection-parameters/creation-tests.js b/packages/pg/test/unit/connection-parameters/creation-tests.js
index 1432b2883..aeab482fb 100644
--- a/packages/pg/test/unit/connection-parameters/creation-tests.js
+++ b/packages/pg/test/unit/connection-parameters/creation-tests.js
@@ -157,6 +157,7 @@ test('libpq connection string building', function () {
       port: 888,
       host: 'localhost',
       database: 'bam',
+      options: 'foobar',
     }
     var subject = new ConnectionParameters(config)
     subject.getLibpqConnectionString(
@@ -168,6 +169,7 @@ test('libpq connection string building', function () {
         checkForPart(parts, "port='888'")
         checkForPart(parts, "hostaddr='127.0.0.1'")
         checkForPart(parts, "dbname='bam'")
+        checkForPart(parts, "options='foobar'")
       })
     )
   })
@@ -181,13 +183,14 @@ test('libpq connection string building', function () {
       database: 'bam',
       statement_timeout: 5000,
       idle_in_transaction_session_timeout: 5000,
+      options: '-c geqo=off -c foobar=off',
     }
     var subject = new ConnectionParameters(config)
     subject.getLibpqConnectionString(
       assert.calls(function (err, constring) {
         assert(!err)
         var parts = constring.split(/ (?=([^\']*\'[^\']*\')*[^\']*$)/)
-        checkForPart(parts, "options='-c statement_timeout=5000 -c idle_in_transaction_session_timeout=5000'")
+        checkForPart(parts, "options='-c statement_timeout=5000 -c idle_in_transaction_session_timeout=5000 -c geqo=off -c foobar=off'")
       })
     )
   })