Fix bugs in integration tests

SweetIQ · Feb 19, 2018 · 47ae028 · 47ae028
1 parent 0286fc9
commit 47ae028
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/test/expected/mysql/osm.ts b/test/expected/mysql/osm.ts
@@ -1,5 +1,15 @@
 /* tslint:disable */
 
+type HasTypeKey<T> = {
+    [K in keyof T]: {
+        type: any
+    }
+}
+
+type SimpleSchema<T extends HasTypeKey<T>> = {
+    [K in keyof T]: T[K]['type']
+}
+
 export type enum_enum_col = 'enum1' | 'enum2' | 'enum3';
 export type enum_nullable_enum_col = 'enum1' | 'enum2' | 'enum3';
 export type set_set_col = 'set1' | 'set2' | 'set3';
@@ -137,7 +147,7 @@ export namespace user_enumsFields {
     export type enum_col = { type: enum_enum_col, };
     export type nullable_enum_col = { type: enum_nullable_enum_col | null, };
     export type set_col = { type: set_set_col, };
-    export type nullable_set_col = set_nullable_set_col { type: | null, };
+    export type nullable_set_col = { type: set_nullable_set_col | null, };
 
 }
 
@@ -149,7 +159,7 @@ interface user_enumsMeta {
 
 }
 
-export type users = SimpleSchema<usersMeta>
+export type user_enums = SimpleSchema<user_enumsMeta>
 
 export namespace packageFields {
     export type number_ = { type: number, };

diff --git a/test/expected/postgres/osm-camelcase.ts b/test/expected/postgres/osm-camelcase.ts
@@ -1,13 +1,23 @@
 /* tslint:disable */
 
+type HasTypeKey<T> = {
+    [K in keyof T]: {
+        type: any
+    }
+}
+
+type SimpleSchema<T extends HasTypeKey<T>> = {
+    [K in keyof T]: T[K]['type']
+}
+
 export type FormatEnum = 'html' | 'markdown' | 'text';
 export type UserStatusEnum = 'active' | 'confirmed' | 'deleted' | 'pending' | 'suspended';
 
 export namespace UsersFields {
     export type email = { type: string, primaryKey: false, unique: false, };
     export type id = { type: number, primaryKey: false, unique: false, };
     export type passCrypt = { type: string, primaryKey: false, unique: false, };
-    export type creationTime = Date{ type: ;, primaryKey: false, unique: false, }
+    export type creationTime = { type: Date, primaryKey: false, unique: false, };
     export type displayName = { type: string, primaryKey: false, unique: false, };
     export type dataPublic = { type: boolean, primaryKey: false, unique: false, };
     export type description = { type: string, primaryKey: false, unique: false, };