From b830265b89897a4ad746abdcf85093999864ea61 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 26 May 2021 22:48:55 +0100
Subject: [PATCH 1/2] SSL fixes, update boolean in lucene

---
 .../FilterEditor/LuceneFilterBuilder.svelte   |  2 +-
 packages/server/src/integrations/postgres.js  | 24 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/LuceneFilterBuilder.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/LuceneFilterBuilder.svelte
index 5017d39d41..34a2b61504 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/LuceneFilterBuilder.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/LuceneFilterBuilder.svelte
@@ -195,7 +195,7 @@
         />
       {:else if expression.type === "boolean"}
         <Combobox
-          disabled
+          disabled={expression.noValue}
           options={[
             { label: "True", value: true },
             { label: "False", value: false },
diff --git a/packages/server/src/integrations/postgres.js b/packages/server/src/integrations/postgres.js
index d567db7ba0..47790764a9 100644
--- a/packages/server/src/integrations/postgres.js
+++ b/packages/server/src/integrations/postgres.js
@@ -1,4 +1,5 @@
 const { Pool } = require("pg")
+const { FIELD_TYPES } = require("./Integration")
 
 let pool
 
@@ -9,30 +10,34 @@ const SCHEMA = {
     "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.",
   datasource: {
     host: {
-      type: "string",
+      type: FIELD_TYPES.STRING,
       default: "localhost",
       required: true,
     },
     port: {
-      type: "number",
+      type: FIELD_TYPES.NUMBER,
       required: true,
       default: 5432,
     },
     database: {
-      type: "string",
+      type: FIELD_TYPES.STRING,
       default: "postgres",
       required: true,
     },
     user: {
-      type: "string",
+      type: FIELD_TYPES.STRING,
       default: "root",
       required: true,
     },
     password: {
-      type: "password",
+      type: FIELD_TYPES.PASSWORD,
       default: "root",
       required: true,
     },
+    ssl: {
+      type: FIELD_TYPES.OBJECT,
+      required: false,
+    },
   },
   query: {
     create: {
@@ -53,6 +58,11 @@ const SCHEMA = {
 class PostgresIntegration {
   constructor(config) {
     this.config = config
+    if (this.config.ssl.rejectUnauthorized) {
+      this.config.ssl.rejectUnauthorized =
+        this.config.ssl.rejectUnauthorized === "true" ? true : false
+    }
+
     if (!pool) {
       pool = new Pool(this.config)
     }
@@ -65,7 +75,9 @@ class PostgresIntegration {
     } catch (err) {
       throw new Error(err)
     } finally {
-      this.client.release()
+      if (this.client) {
+        this.client.release()
+      }
     }
   }
 

From 76620a50831a8d7dc296bd6f1d8dc7edef12cf7c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 27 May 2021 08:21:05 +0100
Subject: [PATCH 2/2] flip bools to strings

---
 .../PropertyControls/FilterEditor/LuceneFilterBuilder.svelte  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/LuceneFilterBuilder.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/LuceneFilterBuilder.svelte
index 34a2b61504..53242f5e9b 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/LuceneFilterBuilder.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/LuceneFilterBuilder.svelte
@@ -197,8 +197,8 @@
         <Combobox
           disabled={expression.noValue}
           options={[
-            { label: "True", value: true },
-            { label: "False", value: false },
+            { label: "True", value: "true" },
+            { label: "False", value: "false" },
           ]}
           bind:value={expression.value}
         />