From 15ed91097d1d2b78a88d6929a85a2c7f241bb8d3 Mon Sep 17 00:00:00 2001
From: Steven Ontong <steven@journeyapps.com>
Date: Mon, 7 Oct 2024 11:18:48 +0200
Subject: [PATCH 1/2] test: populate schema type field

---
 modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts | 4 +++-
 packages/types/src/definitions.ts                      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts b/modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts
index 589870f66..188d1888a 100644
--- a/modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts
+++ b/modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts
@@ -255,10 +255,12 @@ export class MongoRouteAPIAdapter implements api.RouteAPI {
       }
     }
     return [...columns.entries()].map(([key, value]) => {
+      const internal_type = value.bsonTypes.size == 0 ? '' : [...value.bsonTypes].join(' | ');
       return {
         name: key,
+        type: internal_type,
         sqlite_type: value.sqliteType.typeFlags,
-        internal_type: value.bsonTypes.size == 0 ? '' : [...value.bsonTypes].join(' | ')
+        internal_type
       };
     });
   }
diff --git a/packages/types/src/definitions.ts b/packages/types/src/definitions.ts
index 9f176c62a..a381e4f9e 100644
--- a/packages/types/src/definitions.ts
+++ b/packages/types/src/definitions.ts
@@ -126,7 +126,7 @@ export const TableSchema = t.object({
        * Full type name, e.g. "character varying(255)[]"
        * @deprecated - use internal_type
        */
-      type: t.string.optional(),
+      type: t.string,
 
       /**
        * Internal postgres type, e.g. "varchar[]".

From 5f40ba5170a76c891907de563cb4981094240119 Mon Sep 17 00:00:00 2001
From: Steven Ontong <steven@journeyapps.com>
Date: Mon, 7 Oct 2024 14:00:06 +0200
Subject: [PATCH 2/2] pg_type restore

---
 modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts | 3 ++-
 packages/types/src/definitions.ts                      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts b/modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts
index 188d1888a..e96cc8cb8 100644
--- a/modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts
+++ b/modules/module-mongodb/src/api/MongoRouteAPIAdapter.ts
@@ -260,7 +260,8 @@ export class MongoRouteAPIAdapter implements api.RouteAPI {
         name: key,
         type: internal_type,
         sqlite_type: value.sqliteType.typeFlags,
-        internal_type
+        internal_type,
+        pg_type: internal_type
       };
     });
   }
diff --git a/packages/types/src/definitions.ts b/packages/types/src/definitions.ts
index a381e4f9e..dc3bdf879 100644
--- a/packages/types/src/definitions.ts
+++ b/packages/types/src/definitions.ts
@@ -132,7 +132,7 @@ export const TableSchema = t.object({
        * Internal postgres type, e.g. "varchar[]".
        * @deprecated - use internal_type instead
        */
-      pg_type: t.string.optional()
+      pg_type: t.string
     })
   )
 });