Refactor postgres schema translator & schema utils

wix · Dec 5, 2023 · cc2d4eb · cc2d4eb
1 parent b97c88f
commit cc2d4eb
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 28 deletions.
diff --git a/libs/external-db-mysql/src/sql_schema_translator.ts b/libs/external-db-mysql/src/sql_schema_translator.ts
@@ -18,14 +18,18 @@ export default class SchemaColumnTranslato {
             case 'float':
             case 'double':
             case 'decimal':
+            case 'year':
                 return 'number'
 
             case 'date':
+                return 'date'
+
             case 'datetime':
             case 'timestamp':
-            case 'time':
-            case 'year':
                 return 'datetime'
+
+            case 'time':
+                return 'time'
 
             case 'varchar':
             case 'text':

diff --git a/libs/external-db-postgres/src/sql_schema_translator.spec.ts b/libs/external-db-postgres/src/sql_schema_translator.spec.ts
@@ -53,9 +53,17 @@ describe('Sql Schema Column Translator', () => {
         })
 
         describe('string fields', () => {
-            test('string', () => {
-                expect( env.schemaTranslator.columnToDbColumnSql({ name: ctx.fieldName, type: 'text', subtype: 'string' }) ).toEqual(`${escapeIdentifier(ctx.fieldName)} text`)
-            })
+            test.each([
+                'string',
+                'richcontent',
+                'image',
+                'video',
+                'audio',
+                'document',
+                'language',
+            ])('%s', (subtype) => {
+                expect(env.schemaTranslator.columnToDbColumnSql({ name: ctx.fieldName, type: 'text', subtype })).toEqual(`${escapeIdentifier(ctx.fieldName)} text`)
+              })
 
             test('string with length', () => {
                 expect( env.schemaTranslator.columnToDbColumnSql({ name: ctx.fieldName, type: 'text', subtype: 'string', precision: '2055' }) ).toEqual(`${escapeIdentifier(ctx.fieldName)} varchar(2055)`)
@@ -86,20 +94,15 @@ describe('Sql Schema Column Translator', () => {
 
         describe('json fields', () => {
             test.each([
-                ['object'],
-                ['image'],
-                ['document'],
-                ['video'],
-                ['audio'],
-                ['any'],
-                ['mediaGallery'],
-                ['address'],
-                ['pageLink'],
-                ['reference'],
-                ['multiReference'],
-                ['arrayString'],
-                ['arrayDocument'],
-                ['richContent'],
+                'object',
+                'any',
+                'mediaGallery',
+                'address',
+                'pageLink',
+                'reference',
+                'multiReference',
+                'arrayDocument',
+                'arrayString',
               ])('%s', (subtype) => {
                 expect(env.schemaTranslator.columnToDbColumnSql({ name: ctx.fieldName, type: 'object', subtype })).toEqual(`${escapeIdentifier(ctx.fieldName)} json`)
               })
@@ -133,7 +136,13 @@ describe('Sql Schema Column Translator', () => {
 
         describe('date time fields', () => {
             test('date', () => {
-                ['date', 'time', 'timez', 'timestamp', 'timestamptz'].forEach(t => {
+                expect( env.schemaTranslator.translateType('date') ).toEqual('date')
+            })
+            test('time', () => {
+                expect( env.schemaTranslator.translateType('time') ).toEqual('time')
+            })
+            test('datetime', () => {
+                ['timez', 'timestamp', 'timestamptz'].forEach(t => {
                     expect( env.schemaTranslator.translateType(t) ).toEqual('datetime')
                 })
             })

diff --git a/libs/external-db-postgres/src/sql_schema_translator.ts b/libs/external-db-postgres/src/sql_schema_translator.ts
@@ -34,9 +34,12 @@ export default class SchemaColumnTranslator {
                 return 'number'
 
             case 'date':
+                return 'date'
             case 'time':
-            case 'timez':
+                return 'time'
+
             case 'timestamp':
+            case 'timez':
             case 'timestamptz':
                 return 'datetime'
 
@@ -97,6 +100,11 @@ export default class SchemaColumnTranslator {
                 return 'timestamp'
 
             case 'text_string':
+            case 'text_richcontent':
+            case 'text_image':
+            case 'text_video':
+            case 'text_audio':
+            case 'text_document':
                 return precision ? `varchar${this.parseLength(precision)}` : 'text'
 
             case 'text_small':
@@ -109,22 +117,17 @@ export default class SchemaColumnTranslator {
             case 'boolean_boolean':
                 return 'boolean'
 
-            case 'object':
             case 'object_':
             case 'object_object':
-            case 'object_image':
-            case 'object_document':
-            case 'object_video':
             case 'object_any':
-            case 'object_audio':
             case 'object_mediagallery':
             case 'object_address':
             case 'object_pagelink':
             case 'object_reference':
             case 'object_multireference':
             case 'object_arraystring':
             case 'object_arraydocument':
-            case 'object_richcontent':
+            case 'object_array':
                 return 'json'
 
             default:

diff --git a/libs/velo-external-db-core/src/utils/schema_utils.spec.ts b/libs/velo-external-db-core/src/utils/schema_utils.spec.ts
@@ -31,6 +31,12 @@ describe('Schema utils functions', () => {
         test('datetime type', () => {
             expect(fieldTypeToWixDataEnum('datetime')).toBe(VeloFieldTypeEnum.dataTime)
         })
+        test('date type', () => {
+            expect(fieldTypeToWixDataEnum('date')).toBe(VeloFieldTypeEnum.date)
+        })
+        test('time type', () => {
+            expect(fieldTypeToWixDataEnum('time')).toBe(VeloFieldTypeEnum.time)
+        })
 
         test('unsupported type will throw an error', () => {
             expect(() => fieldTypeToWixDataEnum('unsupported-type')).toThrowError()

diff --git a/libs/velo-external-db-core/src/utils/schema_utils.ts b/libs/velo-external-db-core/src/utils/schema_utils.ts
@@ -20,7 +20,11 @@ export const fieldTypeToWixDataEnum = ( fieldType: string ): collectionSpi.Field
             return collectionSpi.FieldType.singleReference
         case FieldType.multiReference:
             return collectionSpi.FieldType.multiReference
-
+        case FieldType.time:
+            return collectionSpi.FieldType.time
+        case FieldType.date:
+            return collectionSpi.FieldType.date
+
         default:
            throw new Error(`${fieldType} - Unsupported field type`)
     }

diff --git a/libs/velo-external-db-types/src/collection_types.ts b/libs/velo-external-db-types/src/collection_types.ts
@@ -20,6 +20,8 @@ export enum CollectionOperationSPI { // rename it
 
 export enum FieldType {
     text = 'text',
+    time = 'time',
+    date = 'date',
     number = 'number',
     boolean = 'boolean',
     datetime = 'datetime',