From 1f818cf42f4d0f1d325be3275baed0a74cc7b47c Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 15 Jun 2021 19:57:41 +0100
Subject: [PATCH] Quick fixes for types.

---
 packages/bbui/src/Table/StringRenderer.svelte     | 2 +-
 packages/server/src/integrations/plus/postgres.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/bbui/src/Table/StringRenderer.svelte b/packages/bbui/src/Table/StringRenderer.svelte
index 2756839616..6fd731f5ec 100644
--- a/packages/bbui/src/Table/StringRenderer.svelte
+++ b/packages/bbui/src/Table/StringRenderer.svelte
@@ -2,7 +2,7 @@
   export let value
 </script>
 
-<div>{value}</div>
+<div>{typeof value === "object" ? JSON.stringify(value) : value}</div>
 
 <style>
   div {
diff --git a/packages/server/src/integrations/plus/postgres.js b/packages/server/src/integrations/plus/postgres.js
index 8df21dfb99..2d5b747935 100644
--- a/packages/server/src/integrations/plus/postgres.js
+++ b/packages/server/src/integrations/plus/postgres.js
@@ -14,6 +14,7 @@ const TYPE_MAP = {
   timestamp: FieldTypes.DATETIME,
   time: FieldTypes.DATETIME,
   boolean: FieldTypes.BOOLEAN,
+  json: FIELD_TYPES.JSON,
 }
 
 const SCHEMA = {
@@ -87,7 +88,7 @@ class PostgresPlus extends Sql {
     try {
       const primaryKeysResponse = await this.client.query(this.PRIMARY_KEYS_SQL)
       for (let table of primaryKeysResponse.rows) {
-        keys.push(table.column_name)
+        keys.push(table.column_name || table.primary_key)
       }
     } catch (err) {
       // TODO: this try catch method isn't right
@@ -114,7 +115,7 @@ class PostgresPlus extends Sql {
 
       tables[tableName].schema[columnName] = {
         name: columnName,
-        type: TYPE_MAP[column.data_type],
+        type: TYPE_MAP[column.data_type] || FIELD_TYPES.STRING,
       }
     }
     this.tables = tables