@mikro-orm/postgresql 6.3.5-dev.17 → 6.3.5-dev.18

package/PostgreSqlPlatform.d.ts

@@ -38,6 +38,12 @@ export declare class PostgreSqlPlatform extends AbstractSqlPlatform {
     getFullTextWhereClause(prop: EntityProperty): string;
     supportsCreatingFullTextIndex(): boolean;
     getFullTextIndexExpression(indexName: string, schemaName: string | undefined, tableName: string, columns: SimpleColumnMeta[]): string;
+    normalizeColumnType(type: string, options?: {
+        length?: number;
+        precision?: number;
+        scale?: number;
+        autoincrement?: boolean;
+    }): string;
     getMappedType(type: string): Type<unknown>;
     getRegExpOperator(val?: unknown, flags?: string): string;
     getRegExpValue(val: RegExp): {
@@ -62,6 +68,9 @@ export declare class PostgreSqlPlatform extends AbstractSqlPlatform {
     getCharTypeDeclarationSQL(column: {
         length?: number;
     }): string;
+    getIntervalTypeDeclarationSQL(column: {
+        length?: number;
+    }): string;
     getBlobDeclarationSQL(): string;
     getJsonDeclarationSQL(): string;
     getSearchJsonPropertyKey(path: string[], type: string | undefined | Type, aliased: boolean, value?: unknown): string;

package/PostgreSqlPlatform.js

@@ -41,7 +41,7 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
         return 'timestamptz' + (column.length != null ? `(${column.length})` : '');
     }
     getDefaultDateTimeLength() {
-        return 6; // timestamptz actually means timestamptz(6)
+        return 6;
     }
     convertIntervalToJSValue(value) {
         return (0, postgres_interval_1.default)(value);
@@ -57,9 +57,9 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
     }
     getIntegerTypeDeclarationSQL(column) {
         if (column.autoincrement && !column.generated) {
-            return `serial`;
+            return 'serial';
         }
-        return `int`;
+        return 'int';
     }
     getBigIntTypeDeclarationSQL(column) {
         /* istanbul ignore next */
@@ -97,6 +97,34 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
         }
         return `create index ${quotedIndexName} on ${quotedTableName} using gin(to_tsvector('simple', ${quotedColumnNames.join(` || ' ' || `)}))`;
     }
+    normalizeColumnType(type, options = {}) {
+        const simpleType = this.extractSimpleType(type);
+        if (['int', 'int4', 'integer'].includes(simpleType)) {
+            return this.getIntegerTypeDeclarationSQL({});
+        }
+        if (['bigint', 'int8'].includes(simpleType)) {
+            return this.getBigIntTypeDeclarationSQL({});
+        }
+        if (['smallint', 'int2'].includes(simpleType)) {
+            return this.getSmallIntTypeDeclarationSQL({});
+        }
+        if (['boolean', 'bool'].includes(simpleType)) {
+            return this.getBooleanTypeDeclarationSQL();
+        }
+        if (['varchar', 'character varying'].includes(simpleType)) {
+            return this.getVarcharTypeDeclarationSQL(options);
+        }
+        if (['char', 'bpchar'].includes(simpleType)) {
+            return this.getCharTypeDeclarationSQL(options);
+        }
+        if (['decimal', 'numeric'].includes(simpleType)) {
+            return this.getDecimalTypeDeclarationSQL(options);
+        }
+        if (['interval'].includes(simpleType)) {
+            return this.getIntervalTypeDeclarationSQL(options);
+        }
+        return super.normalizeColumnType(type, options);
+    }
     getMappedType(type) {
         switch (this.extractSimpleType(type)) {
             case 'tsvector': return core_1.Type.getType(FullTextType_1.FullTextType);
@@ -173,6 +201,9 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
         }
         return super.getCharTypeDeclarationSQL(column);
     }
+    getIntervalTypeDeclarationSQL(column) {
+        return 'interval' + (column.length != null ? `(${column.length})` : '');
+    }
     getBlobDeclarationSQL() {
         return 'bytea';
     }

package/PostgreSqlSchemaHelper.js

@@ -130,10 +130,13 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             let type = col.data_type.toLowerCase() === 'array'
                 ? col.udt_name.replace(/^_(.*)$/, '$1[]')
                 : col.udt_name;
+            if (type === 'bpchar') {
+                type = 'char';
+            }
             if (type === 'vector' && col.length == null && col.custom_length != null) {
                 col.length = col.custom_length;
             }
-            if (col.length != null && !type.endsWith(`(${col.length})`)) {
+            if (col.length != null && !type.endsWith(`(${col.length})`) && !['text', 'date'].includes(type)) {
                 type += `(${col.length})`;
             }
             if (type === 'numeric' && col.numeric_precision != null && col.numeric_scale != null) {
@@ -531,6 +534,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
                     return -1;
                 case 'interval':
                 case 'time':
+                case 'timestamp':
                 case 'timestamptz':
                     return this.platform.getDefaultDateTimeLength();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/postgresql",
-  "version": "6.3.5-dev.17",
+  "version": "6.3.5-dev.18",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -58,7 +58,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.3.5-dev.17",
+    "@mikro-orm/knex": "6.3.5-dev.18",
     "pg": "8.12.0",
     "postgres-array": "3.0.2",
     "postgres-date": "2.1.0",
@@ -68,6 +68,6 @@
     "@mikro-orm/core": "^6.3.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.5-dev.17"
+    "@mikro-orm/core": "6.3.5-dev.18"
   }
 }