@mikro-orm/postgresql 6.2.10-dev.8 → 6.2.10-dev.80

package/PostgreSqlMikroORM.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.definePostgreSqlConfig = exports.PostgreSqlMikroORM = void 0;
+exports.PostgreSqlMikroORM = void 0;
+exports.definePostgreSqlConfig = definePostgreSqlConfig;
 const core_1 = require("@mikro-orm/core");
 const PostgreSqlDriver_1 = require("./PostgreSqlDriver");
 /**
@@ -26,4 +27,3 @@ exports.PostgreSqlMikroORM = PostgreSqlMikroORM;
 function definePostgreSqlConfig(options) {
     return (0, core_1.defineConfig)({ driver: PostgreSqlDriver_1.PostgreSqlDriver, ...options });
 }
-exports.definePostgreSqlConfig = definePostgreSqlConfig;

package/PostgreSqlPlatform.d.ts

@@ -10,12 +10,6 @@ export declare class PostgreSqlPlatform extends AbstractSqlPlatform {
     usesCascadeStatement(): boolean;
     supportsNativeEnums(): boolean;
     supportsCustomPrimaryKeyNames(): boolean;
-    /**
-     * Postgres will complain if we try to batch update uniquely constrained property (moving the value from one entity to another).
-     * This flag will result in postponing 1:1 updates (removing them from the batched query).
-     * @see https://stackoverflow.com/questions/5403437/atomic-multi-row-update-with-a-unique-constraint
-     */
-    allowsUniqueBatchUpdates(): boolean;
     getCurrentTimestampSQL(length: number): string;
     getDateTimeTypeDeclarationSQL(column: {
         length?: number;
@@ -61,6 +55,12 @@ export declare class PostgreSqlPlatform extends AbstractSqlPlatform {
     supportsMultipleStatements(): boolean;
     marshallArray(values: string[]): string;
     unmarshallArray(value: string): string[];
+    getVarcharTypeDeclarationSQL(column: {
+        length?: number;
+    }): string;
+    getCharTypeDeclarationSQL(column: {
+        length?: number;
+    }): string;
     getBlobDeclarationSQL(): string;
     getJsonDeclarationSQL(): string;
     getSearchJsonPropertyKey(path: string[], type: string | undefined | Type, aliased: boolean, value?: unknown): string;

package/PostgreSqlPlatform.js

@@ -27,14 +27,6 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
     supportsCustomPrimaryKeyNames() {
         return true;
     }
-    /**
-     * Postgres will complain if we try to batch update uniquely constrained property (moving the value from one entity to another).
-     * This flag will result in postponing 1:1 updates (removing them from the batched query).
-     * @see https://stackoverflow.com/questions/5403437/atomic-multi-row-update-with-a-unique-constraint
-     */
-    allowsUniqueBatchUpdates() {
-        return false;
-    }
     getCurrentTimestampSQL(length) {
         return `current_timestamp(${length})`;
     }
@@ -156,6 +148,18 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
         /* istanbul ignore next */
         return value.substring(1, value.length - 1).split(',').map(v => v === `""` ? '' : v);
     }
+    getVarcharTypeDeclarationSQL(column) {
+        if (column.length === -1) {
+            return 'varchar';
+        }
+        return super.getVarcharTypeDeclarationSQL(column);
+    }
+    getCharTypeDeclarationSQL(column) {
+        if (column.length === -1) {
+            return 'char';
+        }
+        return super.getCharTypeDeclarationSQL(column);
+    }
     getBlobDeclarationSQL() {
         return 'bytea';
     }
@@ -242,6 +246,7 @@ class PostgreSqlPlatform extends knex_1.AbstractSqlPlatform {
             'bytea': 'blob',
             'jsonb': 'json',
             'character varying': 'varchar',
+            'bpchar': 'character',
         };
         return super.getDefaultMappedType(map[normalizedType] ?? type);
     }

package/PostgreSqlSchemaHelper.d.ts

@@ -51,4 +51,5 @@ export declare class PostgreSqlSchemaHelper extends SchemaHelper {
     getChecks(connection: AbstractSqlConnection, tableName: string, schemaName: string, columns?: Column[]): Promise<CheckDef[]>;
     getColumns(connection: AbstractSqlConnection, tableName: string, schemaName?: string): Promise<Column[]>;
     getIndexes(connection: AbstractSqlConnection, tableName: string, schemaName?: string): Promise<IndexDef[]>;
+    inferLengthFromColumnType(type: string): number | undefined;
 }

package/PostgreSqlSchemaHelper.js

@@ -26,6 +26,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             + `from information_schema.tables `
             + `where ${this.getIgnoredNamespacesConditionSQL('table_schema')} `
             + `and table_name != 'geometry_columns' and table_name != 'spatial_ref_sys' and table_type != 'VIEW' `
+            + `and table_name not in (select inhrelid::regclass::text from pg_inherits) `
             + `order by table_name`;
     }
     async getNamespaces(connection) {
@@ -105,16 +106,17 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
       is_nullable,
       udt_name,
       coalesce(datetime_precision, character_maximum_length) length,
+      atttypmod custom_length,
       numeric_precision,
       numeric_scale,
       data_type,
       is_identity,
       identity_generation,
       generation_expression,
-      (select pg_catalog.col_description(c.oid, cols.ordinal_position::int)
-        from pg_catalog.pg_class c
-        where c.oid = (select ('"' || cols.table_schema || '"."' || cols.table_name || '"')::regclass::oid) and c.relname = cols.table_name) as column_comment
+      pg_catalog.col_description(pgc.oid, cols.ordinal_position::int) column_comment
       from information_schema.columns cols
+      join pg_class pgc on cols.table_name = pgc.relname
+      join pg_attribute pga on pgc.oid = pga.attrelid and cols.column_name = pga.attname
       where (${tables.map(t => `(table_schema = ${this.platform.quoteValue(t.schema_name)} and table_name = ${this.platform.quoteValue(t.table_name)})`).join(' or ')})
       order by ordinal_position`;
         const allColumns = await connection.execute(sql);
@@ -128,17 +130,21 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             let type = col.data_type.toLowerCase() === 'array'
                 ? col.udt_name.replace(/^_(.*)$/, '$1[]')
                 : col.udt_name;
+            if (type === 'vector' && col.length == null && col.custom_length != null) {
+                col.length = col.custom_length;
+            }
             if (col.length != null && !type.endsWith(`(${col.length})`)) {
                 type += `(${col.length})`;
             }
             if (type === 'numeric' && col.numeric_precision != null && col.numeric_scale != null) {
                 type += `(${col.numeric_precision},${col.numeric_scale})`;
             }
+            const length = this.inferLengthFromColumnType(type) === -1 ? -1 : col.length;
             const column = {
                 name: col.column_name,
                 type,
                 mappedType,
-                length: col.length,
+                length,
                 precision: col.numeric_precision,
                 scale: col.numeric_scale,
                 nullable: col.is_nullable === 'YES',
@@ -178,7 +184,8 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
     async getAllForeignKeys(connection, tables) {
         const sql = `select nsp1.nspname schema_name, cls1.relname table_name, nsp2.nspname referenced_schema_name,
       cls2.relname referenced_table_name, a.attname column_name, af.attname referenced_column_name, conname constraint_name,
-      confupdtype update_rule, confdeltype delete_rule, array_position(con.conkey,a.attnum) as ord, condeferrable, condeferred
+      confupdtype update_rule, confdeltype delete_rule, array_position(con.conkey,a.attnum) as ord, condeferrable, condeferred,
+      pg_get_constraintdef(con.oid) as constraint_def
       from pg_attribute a
       join pg_constraint con on con.conrelid = a.attrelid AND a.attnum = ANY (con.conkey)
       join pg_attribute af on af.attnum = con.confkey[array_position(con.conkey,a.attnum)] AND af.attrelid = con.confrelid
@@ -191,7 +198,11 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
       order by nsp1.nspname, cls1.relname, constraint_name, ord`;
         const allFks = await connection.execute(sql);
         const ret = {};
-        function mapReferencialIntegrity(value) {
+        function mapReferentialIntegrity(value, def) {
+            const match = ['n', 'd'].includes(value) && def.match(/ON DELETE (SET (NULL|DEFAULT) \(.*?\))/);
+            if (match) {
+                return match[1];
+            }
             switch (value) {
                 case 'r': return 'RESTRICT';
                 case 'c': return 'CASCADE';
@@ -202,8 +213,8 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             }
         }
         for (const fk of allFks) {
-            fk.update_rule = mapReferencialIntegrity(fk.update_rule);
-            fk.delete_rule = mapReferencialIntegrity(fk.delete_rule);
+            fk.update_rule = mapReferentialIntegrity(fk.update_rule, fk.constraint_def);
+            fk.delete_rule = mapReferentialIntegrity(fk.delete_rule, fk.constraint_def);
             if (fk.condeferrable) {
                 fk.defer_mode = fk.condeferred ? core_1.DeferMode.INITIALLY_DEFERRED : core_1.DeferMode.INITIALLY_IMMEDIATE;
             }
@@ -268,7 +279,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
             const m1 = item.definition?.match(/check \(\(\("?(\w+)"?\)::/i) || item.definition?.match(/check \(\("?(\w+)"? = /i);
             const m2 = item.definition?.match(/\(array\[(.*)]\)/i) || item.definition?.match(/ = (.*)\)/i);
             if (item.columnName && m1 && m2) {
-                const m3 = m2[1].match(/('[^']+'::text)/g);
+                const m3 = m2[1].match(/('[^']*'::text)/g);
                 let items;
                 /* istanbul ignore else */
                 if (m3) {
@@ -277,7 +288,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
                 else {
                     items = m2[1].split(',').map((item) => item.trim().match(/^\(?'(.*)'/)?.[1]);
                 }
-                items = items.filter(Boolean);
+                items = items.filter(item => item !== undefined);
                 if (items.length > 0) {
                     o[item.columnName] = items;
                     found.push(index);
@@ -494,5 +505,27 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         const res = await this.getAllIndexes(connection, [{ table_name: tableName, schema_name: schemaName }]);
         return res[tableName];
     }
+    inferLengthFromColumnType(type) {
+        const match = type.match(/^(\w+(?:\s+\w+)*)\s*(?:\(\s*(\d+)\s*\)|$)/);
+        if (!match) {
+            return;
+        }
+        if (!match[2]) {
+            switch (match[1]) {
+                case 'character varying':
+                case 'varchar':
+                case 'bpchar':
+                case 'char':
+                case 'character':
+                    return -1;
+                case 'interval':
+                case 'time':
+                case 'timestamptz':
+                    return this.platform.getDefaultDateTimeLength();
+            }
+            return;
+        }
+        return +match[2];
+    }
 }
 exports.PostgreSqlSchemaHelper = PostgreSqlSchemaHelper;

package/index.mjs

@@ -33,6 +33,7 @@ export const ChangeSet = mod.ChangeSet;
 export const ChangeSetComputer = mod.ChangeSetComputer;
 export const ChangeSetPersister = mod.ChangeSetPersister;
 export const ChangeSetType = mod.ChangeSetType;
+export const CharacterType = mod.CharacterType;
 export const Check = mod.Check;
 export const CheckConstraintViolationException = mod.CheckConstraintViolationException;
 export const Collection = mod.Collection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/postgresql",
-  "version": "6.2.10-dev.8",
+  "version": "6.2.10-dev.80",
   "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,8 +58,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.2.10-dev.8",
-    "pg": "8.11.5",
+    "@mikro-orm/knex": "6.2.10-dev.80",
+    "pg": "8.12.0",
     "postgres-array": "3.0.2",
     "postgres-date": "2.1.0",
     "postgres-interval": "4.0.2"
@@ -68,6 +68,6 @@
     "@mikro-orm/core": "^6.2.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.2.10-dev.8"
+    "@mikro-orm/core": "6.2.10-dev.80"
   }
 }