Merge e750e2f into cedbae7

lib/MikroORM.ts

@@ -1,8 +1,9 @@
 import { EntityManager } from './EntityManager';
-import { IDatabaseDriver } from './drivers';
+import { AbstractSqlDriver, IDatabaseDriver } from './drivers';
 import { MetadataDiscovery } from './metadata';
 import { Configuration, Logger, Options } from './utils';
 import { EntityMetadata } from './decorators';
+import { SchemaGenerator } from './schema';
 
 export class MikroORM {
 
@@ -61,4 +62,8 @@ export class MikroORM {
     return this.metadata;
   }
 
+  getSchemaGenerator(): SchemaGenerator {
+    return new SchemaGenerator(this.driver as AbstractSqlDriver, this.metadata);
+  }
+
 }

lib/decorators/Entity.ts

@@ -60,6 +60,7 @@ export interface EntityProperty<T extends IEntityType<T> = any> {
   name: string & keyof T;
   entity: () => EntityName<T>;
   type: string;
+  columnType: string;
   primary: boolean;
   length?: any;
   reference: ReferenceType;

lib/metadata/MetadataDiscovery.ts

@@ -15,6 +15,7 @@ export class MetadataDiscovery {
   private readonly metadataProvider = this.config.getMetadataProvider();
   private readonly cache = this.config.getCacheAdapter();
   private readonly platform = this.em.getDriver().getPlatform();
+  private readonly schemaHelper = this.platform.getSchemaHelper();
   private readonly validator = new MetadataValidator();
   private readonly discovered: EntityMetadata[] = [];
 
@@ -191,6 +192,7 @@ export class MetadataDiscovery {
     this.validator.validateEntityDefinition(this.metadata, meta.name);
     Object.values(meta.properties).forEach(prop => {
       this.applyNamingStrategy(meta, prop);
+      this.initColumnType(prop);
 
       if (prop.version) {
         meta.versionProperty = prop.name;
@@ -261,6 +263,8 @@ export class MetadataDiscovery {
       ret.inverseJoinColumn = prop.referenceColumnName;
     }
 
+    this.initColumnType(ret);
+
     return ret;
   }
 
@@ -292,4 +296,18 @@ export class MetadataDiscovery {
     return 1;
   }
 
+  private initColumnType(prop: EntityProperty): void {
+    if (prop.columnType || !this.schemaHelper) {
+      return;
+    }
+
+    if (prop.reference === ReferenceType.SCALAR) {
+      prop.columnType = this.schemaHelper.getTypeDefinition(prop);
+      return;
+    }
+
+    const meta = this.metadata[prop.type];
+    prop.columnType = this.schemaHelper.getTypeDefinition(meta.properties[meta.primaryKey]);
+  }
+
 }

lib/platforms/MongoPlatform.ts

@@ -6,7 +6,7 @@ import { SchemaHelper } from '../schema';
 
 export class MongoPlatform extends Platform {
 
-  protected schemaHelper: SchemaHelper;
+  protected schemaHelper?: SchemaHelper;
 
   usesPivotTable(): boolean {
     return false;
@@ -36,8 +36,4 @@ export class MongoPlatform extends Platform {
     return 'id';
   }
 
-  getSchemaHelper(): SchemaHelper {
-    throw new Error(`${MongoPlatform.name} does not provide SchemaHelper`);
-  }
-
 }

lib/platforms/Platform.ts

@@ -4,7 +4,7 @@ import { SchemaHelper } from '../schema';
 
 export abstract class Platform {
 
-  protected abstract schemaHelper: SchemaHelper;
+  protected abstract schemaHelper?: SchemaHelper;
 
   usesPivotTable(): boolean {
     return true;
@@ -26,7 +26,7 @@ export abstract class Platform {
     return false;
   }
 
-  getSchemaHelper(): SchemaHelper {
+  getSchemaHelper(): SchemaHelper | undefined {
     return this.schemaHelper;
   }
 

lib/schema/MySqlSchemaHelper.ts

@@ -1,18 +1,18 @@
+import { ColumnInfo, MySqlTableBuilder } from 'knex';
 import { SchemaHelper } from './SchemaHelper';
 import { EntityProperty } from '../decorators';
-import { MySqlTableBuilder } from 'knex';
 
 export class MySqlSchemaHelper extends SchemaHelper {
 
   static readonly TYPES = {
-    number: 'int(?)',
-    float: 'float',
-    double: 'double',
-    string: 'varchar(?)',
-    date: 'datetime(?)',
-    boolean: 'tinyint(1)',
-    text: 'text',
-    json: 'json',
+    number: ['int(?)', 'float', 'double'],
+    float: ['float'],
+    double: ['double'],
+    string: ['varchar(?)', 'text'],
+    date: ['datetime(?)', 'timestamp(?)'],
+    boolean: ['tinyint(1)'],
+    text: ['text'],
+    json: ['json'],
   };
 
   static readonly DEFAULT_TYPE_LENGTHS = {
@@ -38,4 +38,12 @@ export class MySqlSchemaHelper extends SchemaHelper {
     return super.getTypeDefinition(prop, MySqlSchemaHelper.TYPES, MySqlSchemaHelper.DEFAULT_TYPE_LENGTHS);
   }
 
+  isSame(prop: EntityProperty, type: ColumnInfo): boolean {
+    return super.isSame(prop, type, MySqlSchemaHelper.TYPES);
+  }
+
+  getListTablesSQL(): string {
+    return `select table_name from information_schema.tables where table_type = 'BASE TABLE' and table_schema = schema()`;
+  }
+
 }

lib/schema/PostgreSqlSchemaHelper.ts

@@ -1,17 +1,18 @@
+import { ColumnInfo } from 'knex';
 import { SchemaHelper } from './SchemaHelper';
 import { EntityProperty } from '../decorators';
 
 export class PostgreSqlSchemaHelper extends SchemaHelper {
 
   static readonly TYPES = {
-    number: 'int',
-    float: 'float',
-    double: 'double precision',
-    string: 'varchar(?)',
-    date: 'timestamp(?)',
-    boolean: 'boolean',
-    text: 'text',
-    json: 'json',
+    number: ['int', 'int8', 'integer', 'float', 'float8', 'double', 'double precision', 'bigint', 'smallint', 'decimal', 'numeric', 'real'],
+    float: ['float'],
+    double: ['double', 'double precision', 'float8'],
+    string: ['varchar(?)', 'character varying', 'text', 'character', 'char'],
+    date: ['datetime(?)', 'timestamp(?)', 'timestamp without time zone', 'timestamptz', 'datetimetz', 'time', 'date', 'timetz', 'datetz'],
+    boolean: ['boolean', 'bool'],
+    text: ['text'],
+    json: ['json'],
   };
 
   static readonly DEFAULT_TYPE_LENGTHS = {
@@ -31,8 +32,16 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
     return super.getTypeDefinition(prop, PostgreSqlSchemaHelper.TYPES, PostgreSqlSchemaHelper.DEFAULT_TYPE_LENGTHS);
   }
 
+  isSame(prop: EntityProperty, type: ColumnInfo): boolean {
+    return super.isSame(prop, type, PostgreSqlSchemaHelper.TYPES);
+  }
+
   indexForeignKeys() {
     return false;
   }
 
+  getListTablesSQL(): string {
+    return `select * from information_schema.tables where table_type = 'BASE TABLE' and table_schema not in ('pg_catalog', 'information_schema')`;
+  }
+
 }