@mikro-orm/postgresql 6.2.10-dev.5 → 6.2.10-dev.50

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;

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})`;
     }

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) {
@@ -178,7 +179,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 +193,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 +208,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;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/postgresql",
-  "version": "6.2.10-dev.5",
+  "version": "6.2.10-dev.50",
   "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.5",
-    "pg": "8.11.5",
+    "@mikro-orm/knex": "6.2.10-dev.50",
+    "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.5"
+    "@mikro-orm/core": "6.2.10-dev.50"
   }
 }