From 59eb3990dd459f02953e1d6e9c948aceed32fa02 Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Mon, 20 Sep 2021 09:12:23 +0200
Subject: [PATCH] Fix schema storage

---
 .../core/database/lib/schema/__tests__/schema-diff.test.js | 2 +-
 packages/core/database/lib/schema/index.js                 | 3 +--
 packages/core/database/lib/schema/storage.js               | 7 ++++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/core/database/lib/schema/__tests__/schema-diff.test.js b/packages/core/database/lib/schema/__tests__/schema-diff.test.js
index 51a0771db4..8b68f90b90 100644
--- a/packages/core/database/lib/schema/__tests__/schema-diff.test.js
+++ b/packages/core/database/lib/schema/__tests__/schema-diff.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const createSchemaDiff = require('../schema-diff');
+const createSchemaDiff = require('../diff');
 
 let diffSchemas;
 describe('diffSchemas', () => {
diff --git a/packages/core/database/lib/schema/index.js b/packages/core/database/lib/schema/index.js
index 6a387ad85f..29cd714103 100644
--- a/packages/core/database/lib/schema/index.js
+++ b/packages/core/database/lib/schema/index.js
@@ -49,8 +49,6 @@ const createSchemaProvider = db => {
 
       const { status, diff } = this.schemaDiff.diff(DBSchema, schema);
 
-      console.log(diff.tables.updated.flatMap(t => t.columns.updated).map(x => x.object));
-
       if (status === 'CHANGED') {
         await this.builder.updateSchema(diff);
       }
@@ -81,6 +79,7 @@ const createSchemaProvider = db => {
 
       if (oldHash !== hash) {
         debug('Schema changed');
+
         return this.syncSchema();
       }
 
diff --git a/packages/core/database/lib/schema/storage.js b/packages/core/database/lib/schema/storage.js
index 914fff9a99..7b53b5fcd3 100644
--- a/packages/core/database/lib/schema/storage.js
+++ b/packages/core/database/lib/schema/storage.js
@@ -36,7 +36,12 @@ module.exports = db => {
         return null;
       }
 
-      return typeof res.schema === 'object' ? res.schema : JSON.parse(res.schema);
+      const parsedSchema = typeof res.schema === 'object' ? res.schema : JSON.parse(res.schema);
+
+      return {
+        ...res,
+        schema: parsedSchema,
+      };
     },
 
     hashSchema(schema) {