@mikro-orm/postgresql 6.6.8-dev.4 → 6.6.8-dev.5

package/PostgreSqlSchemaHelper.js

@@ -180,10 +180,16 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
         const sql = this.getChecksSQL(tablesBySchemas);
         const allChecks = await connection.execute(sql);
         const ret = {};
+        const seen = new Set();
         for (const check of allChecks) {
             const key = this.getTableKey(check);
+            const dedupeKey = `${key}:${check.name}`;
+            if (seen.has(dedupeKey)) {
+                continue;
+            }
+            seen.add(dedupeKey);
             ret[key] ??= [];
-            const m = check.expression.match(/^check \(\((.*)\)\)$/i);
+            const m = check.expression.match(/^check \(\((.*)\)\)$/is);
             const def = m?.[1].replace(/\((.*?)\)::\w+/g, '$1');
             ret[key].push({
                 name: check.name,
@@ -523,7 +529,7 @@ class PostgreSqlSchemaHelper extends knex_1.SchemaHelper {
       from pg_constraint pgc
       join pg_namespace nsp on nsp.oid = pgc.connamespace
       join pg_class cls on pgc.conrelid = cls.oid
-      join information_schema.constraint_column_usage ccu on pgc.conname = ccu.constraint_name and nsp.nspname = ccu.constraint_schema
+      join information_schema.constraint_column_usage ccu on pgc.conname = ccu.constraint_name and nsp.nspname = ccu.constraint_schema and cls.relname = ccu.table_name
       where contype = 'c' and (${[...tablesBySchemas.entries()].map(([schema, tables]) => `ccu.table_name in (${tables.map(t => this.platform.quoteValue(t.table_name)).join(',')}) and ccu.table_schema = ${this.platform.quoteValue(schema ?? this.platform.getDefaultSchemaName() ?? '')}`).join(' or ')})
       order by pgc.conname`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/postgresql",
-  "version": "6.6.8-dev.4",
+  "version": "6.6.8-dev.5",
   "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.6.8-dev.4",
+    "@mikro-orm/knex": "6.6.8-dev.5",
     "pg": "8.19.0",
     "postgres-array": "3.0.4",
     "postgres-date": "2.1.0",
@@ -68,6 +68,6 @@
     "@mikro-orm/core": "^6.6.7"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.6.8-dev.4"
+    "@mikro-orm/core": "6.6.8-dev.5"
   }
 }