@platformatic/sql-mapper 3.63.0 → 3.65.0

package/lib/entity.js

@@ -604,6 +604,16 @@ export function buildEntity (
       schemaList?.length > 0 ? schemaList.includes(constraint.foreign_table_schema) : true
     /* istanbul ignore if */
     if (constraint.constraint_type === 'FOREIGN KEY' && isForeignKeySchemaInConfig) {
+      /* istanbul ignore next */
+      if (!constraint.foreign_table_name) {
+        // The referenced side of the foreign key could not be resolved by the introspection
+        // query. Ignore the relation rather than failing the whole boot.
+        log.warn(
+          { constraint },
+          `Could not resolve the table referenced by the foreign key "${constraint.constraint_name}" on "${constraint.table_name}.${constraint.column_name}". The relation will be ignored.`
+        )
+        continue
+      }
       field.foreignKey = true
       const foreignEntityName = singularize(
         camelcase(

package/lib/queries/pg.js

@@ -80,8 +80,8 @@ export async function listColumns (db, sql, table, schema) {
 
 export async function listConstraints (db, sql, table, schema) {
   const query = sql`
-    SELECT constraints.*, usage.*, foreign_usage.table_name AS foreign_table_name,
-      foreign_usage.column_name AS foreign_column_name, foreign_usage.table_schema AS foreign_table_schema
+    SELECT constraints.*, usage.*, foreign_table.relname AS foreign_table_name,
+      foreign_column.attname AS foreign_column_name, foreign_namespace.nspname AS foreign_table_schema
     FROM information_schema.table_constraints constraints
       JOIN information_schema.key_column_usage usage
         ON constraints.constraint_catalog = usage.constraint_catalog
@@ -89,15 +89,22 @@ export async function listConstraints (db, sql, table, schema) {
         AND constraints.constraint_name = usage.constraint_name
         AND constraints.table_schema = usage.table_schema
         AND constraints.table_name = usage.table_name
-      LEFT JOIN information_schema.referential_constraints referential
-        ON constraints.constraint_catalog = referential.constraint_catalog
-        AND constraints.constraint_schema = referential.constraint_schema
-        AND constraints.constraint_name = referential.constraint_name
-      LEFT JOIN information_schema.key_column_usage foreign_usage
-        ON referential.unique_constraint_catalog = foreign_usage.constraint_catalog
-        AND referential.unique_constraint_schema = foreign_usage.constraint_schema
-        AND referential.unique_constraint_name = foreign_usage.constraint_name
-        AND usage.position_in_unique_constraint = foreign_usage.ordinal_position
+      LEFT JOIN pg_catalog.pg_namespace local_namespace
+        ON local_namespace.nspname = constraints.table_schema
+      LEFT JOIN pg_catalog.pg_class local_table
+        ON local_table.relname = constraints.table_name
+        AND local_table.relnamespace = local_namespace.oid
+      LEFT JOIN pg_catalog.pg_constraint foreign_constraint
+        ON foreign_constraint.conrelid = local_table.oid
+        AND foreign_constraint.conname = constraints.constraint_name
+        AND foreign_constraint.contype = 'f'
+      LEFT JOIN pg_catalog.pg_class foreign_table
+        ON foreign_table.oid = foreign_constraint.confrelid
+      LEFT JOIN pg_catalog.pg_namespace foreign_namespace
+        ON foreign_namespace.oid = foreign_table.relnamespace
+      LEFT JOIN pg_catalog.pg_attribute foreign_column
+        ON foreign_column.attrelid = foreign_constraint.confrelid
+        AND foreign_column.attnum = foreign_constraint.confkey[usage.ordinal_position]
     WHERE constraints.table_name = ${table}
       AND constraints.table_schema = ${schema}
     ORDER BY usage.constraint_name, usage.ordinal_position

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "3.63.0",
+  "version": "3.65.0",
   "description": "A data mapper utility for SQL databases",
   "main": "index.js",
   "type": "module",
@@ -35,8 +35,8 @@
     "camelcase": "^6.3.0",
     "fastify-plugin": "^6.0.0",
     "inflected": "^2.1.0",
-    "@platformatic/telemetry": "3.63.0",
-    "@platformatic/foundation": "3.63.0"
+    "@platformatic/foundation": "3.65.0",
+    "@platformatic/telemetry": "3.65.0"
   },
   "engines": {
     "node": ">=22.19.0"