pgterra 0.2.7 → 0.2.8

package/dist/index.js

@@ -22926,6 +22926,7 @@ class DatabaseInspector {
       SELECT
         tc.constraint_name,
         kcu.column_name,
+        ccu.table_schema AS referenced_schema,
         ccu.table_name AS referenced_table,
         ccu.column_name AS referenced_column,
         rc.delete_rule,
@@ -22968,7 +22969,7 @@ class DatabaseInspector {
       foreignKeys.push({
         name: constraintName,
         columns,
-        referencedTable: firstRow.referenced_table,
+        referencedTable: firstRow.referenced_schema === "public" ? firstRow.referenced_table : `${firstRow.referenced_schema}.${firstRow.referenced_table}`,
         referencedColumns,
         onDelete,
         onUpdate
@@ -23622,6 +23623,17 @@ class SQLBuilder {
 }
 
 // src/utils/sql.ts
+function splitSchemaTable(qualifiedName) {
+  const parts = qualifiedName.split(".");
+  if (parts.length === 2) {
+    return [parts[1], parts[0]];
+  }
+  return [qualifiedName, undefined];
+}
+function getBareTableName(tableName) {
+  const parts = tableName.split(".");
+  return parts[parts.length - 1];
+}
 function getQualifiedTableName(table, schema) {
   if (typeof table === "string") {
     return schema ? `${schema}.${table}` : table;
@@ -23726,18 +23738,18 @@ function generateCreateTableStatement(table) {
     return builder2.build();
   });
   if (table.primaryKey) {
-    const primaryKeyClause = generatePrimaryKeyClause(table.primaryKey);
+    const primaryKeyClause = generatePrimaryKeyClause(table.primaryKey, table.name);
     columnDefs.push(primaryKeyClause);
   }
   if (table.checkConstraints) {
     for (const checkConstraint of table.checkConstraints) {
-      const checkClause = generateCheckConstraintClause(checkConstraint);
+      const checkClause = generateCheckConstraintClause(checkConstraint, table.name);
       columnDefs.push(checkClause);
     }
   }
   if (table.uniqueConstraints) {
     for (const uniqueConstraint of table.uniqueConstraints) {
-      const uniqueClause = generateUniqueConstraintClause(uniqueConstraint);
+      const uniqueClause = generateUniqueConstraintClause(uniqueConstraint, table.name);
       columnDefs.push(uniqueClause);
     }
   }
@@ -23747,17 +23759,20 @@ function generateCreateTableStatement(table) {
 )`);
   return builder.build() + ";";
 }
-function generatePrimaryKeyClause(primaryKey) {
+function generatePrimaryKeyClause(primaryKey, tableName) {
   const columns = primaryKey.columns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
-  if (primaryKey.name) {
-    const builder = new SQLBuilder().p("CONSTRAINT").ident(primaryKey.name).p(`PRIMARY KEY (${columns})`);
+  const bareTable = tableName ? getBareTableName(tableName) : undefined;
+  const constraintName = primaryKey.name ? primaryKey.name : bareTable ? `${bareTable}_pkey` : undefined;
+  if (constraintName) {
+    const builder = new SQLBuilder().p("CONSTRAINT").ident(constraintName).p(`PRIMARY KEY (${columns})`);
     return builder.build();
   } else {
     return `PRIMARY KEY (${columns})`;
   }
 }
 function generateAddPrimaryKeySQL(tableName, primaryKey) {
-  const constraintName = primaryKey.name || `pk_${tableName}`;
+  const bareTable = getBareTableName(tableName);
+  const constraintName = primaryKey.name || `${bareTable}_pkey`;
   const columns = primaryKey.columns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
   return new SQLBuilder().p("ALTER TABLE").table(tableName).p("ADD CONSTRAINT").ident(constraintName).p(`PRIMARY KEY (${columns});`).build();
 }
@@ -23768,7 +23783,7 @@ function generateAddForeignKeySQL(tableName, foreignKey) {
   const constraintName = foreignKey.name || `fk_${tableName}_${foreignKey.referencedTable}`;
   const columns = foreignKey.columns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
   const referencedColumns = foreignKey.referencedColumns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
-  const builder = new SQLBuilder().p("ALTER TABLE").table(tableName).p("ADD CONSTRAINT").ident(constraintName).p(`FOREIGN KEY (${columns}) REFERENCES`).table(foreignKey.referencedTable).p(`(${referencedColumns})`);
+  const builder = new SQLBuilder().p("ALTER TABLE").table(tableName).p("ADD CONSTRAINT").ident(constraintName).p(`FOREIGN KEY (${columns}) REFERENCES`).table(...splitSchemaTable(foreignKey.referencedTable)).p(`(${referencedColumns})`);
   if (foreignKey.onDelete) {
     builder.p(`ON DELETE ${foreignKey.onDelete}`);
   }
@@ -23781,13 +23796,14 @@ function generateDropForeignKeySQL(tableName, constraintName) {
   return new SQLBuilder().p("ALTER TABLE").table(tableName).p("DROP CONSTRAINT").ident(constraintName).p(";").build();
 }
 function generateAddCheckConstraintSQL(tableName, checkConstraint) {
-  const constraintName = checkConstraint.name || `check_${tableName}_${Date.now()}`;
+  const bareTable = getBareTableName(tableName);
+  const constraintName = checkConstraint.name || `${bareTable}_check`;
   return new SQLBuilder().p("ALTER TABLE").table(tableName).p("ADD CONSTRAINT").ident(constraintName).p(`CHECK (${checkConstraint.expression});`).build();
 }
 function generateDropCheckConstraintSQL(tableName, constraintName) {
   return new SQLBuilder().p("ALTER TABLE").table(tableName).p("DROP CONSTRAINT").ident(constraintName).p(";").build();
 }
-function generateCheckConstraintClause(checkConstraint) {
+function generateCheckConstraintClause(checkConstraint, tableName) {
   const builder = new SQLBuilder;
   if (checkConstraint.name) {
     builder.p("CONSTRAINT").ident(checkConstraint.name);
@@ -23796,18 +23812,21 @@ function generateCheckConstraintClause(checkConstraint) {
   return builder.build();
 }
 function generateAddUniqueConstraintSQL(tableName, uniqueConstraint) {
-  const constraintName = uniqueConstraint.name || `unique_${tableName}_${uniqueConstraint.columns.join("_")}`;
+  const bareTable = getBareTableName(tableName);
+  const constraintName = uniqueConstraint.name || `${bareTable}_${uniqueConstraint.columns.join("_")}_unique`;
   const columns = uniqueConstraint.columns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
   return new SQLBuilder().p("ALTER TABLE").table(tableName).p("ADD CONSTRAINT").ident(constraintName).p(`UNIQUE (${columns});`).build();
 }
 function generateDropUniqueConstraintSQL(tableName, constraintName) {
   return new SQLBuilder().p("ALTER TABLE").table(tableName).p("DROP CONSTRAINT").ident(constraintName).p(";").build();
 }
-function generateUniqueConstraintClause(uniqueConstraint) {
+function generateUniqueConstraintClause(uniqueConstraint, tableName) {
   const columns = uniqueConstraint.columns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
+  const bareTable = tableName ? getBareTableName(tableName) : undefined;
+  const constraintName = uniqueConstraint.name ? uniqueConstraint.name : bareTable ? `${bareTable}_${uniqueConstraint.columns.join("_")}_unique` : undefined;
   const builder = new SQLBuilder;
-  if (uniqueConstraint.name) {
-    builder.p("CONSTRAINT").ident(uniqueConstraint.name);
+  if (constraintName) {
+    builder.p("CONSTRAINT").ident(constraintName);
   }
   builder.p(`UNIQUE (${columns})`);
   return builder.build();
@@ -24749,8 +24768,9 @@ class SchemaDiffer {
   }
   generateCheckConstraintStatements(tableName, desiredConstraints, currentConstraints) {
     const statements = [];
-    const currentMap = new Map(currentConstraints.map((c) => [c.name || c.expression, c]));
-    const desiredMap = new Map(desiredConstraints.map((c) => [c.name || c.expression, c]));
+    const normalizeExpression = (expr) => expr.replace(/\s+/g, " ").trim();
+    const currentMap = new Map(currentConstraints.map((c) => [normalizeExpression(c.expression), c]));
+    const desiredMap = new Map(desiredConstraints.map((c) => [normalizeExpression(c.expression), c]));
     for (const [key, constraint] of currentMap) {
       if (!desiredMap.has(key)) {
         if (constraint.name) {
@@ -24761,14 +24781,6 @@ class SchemaDiffer {
     for (const [key, constraint] of desiredMap) {
       if (!currentMap.has(key)) {
         statements.push(generateAddCheckConstraintSQL(tableName, constraint));
-      } else {
-        const currentConstraint = currentMap.get(key);
-        if (constraint.expression !== currentConstraint.expression) {
-          if (currentConstraint.name) {
-            statements.push(generateDropCheckConstraintSQL(tableName, currentConstraint.name));
-          }
-          statements.push(generateAddCheckConstraintSQL(tableName, constraint));
-        }
       }
     }
     return statements;
@@ -24821,14 +24833,9 @@ class SchemaDiffer {
   }
   generateUniqueConstraintStatements(tableName, desiredConstraints, currentConstraints) {
     const statements = [];
-    const currentMap = new Map(currentConstraints.map((c) => [
-      c.name || `unique_${c.columns.join("_")}`,
-      c
-    ]));
-    const desiredMap = new Map(desiredConstraints.map((c) => [
-      c.name || `unique_${c.columns.join("_")}`,
-      c
-    ]));
+    const getStructuralKey = (c) => [...c.columns].sort().join(",");
+    const currentMap = new Map(currentConstraints.map((c) => [getStructuralKey(c), c]));
+    const desiredMap = new Map(desiredConstraints.map((c) => [getStructuralKey(c), c]));
     for (const [key, constraint] of currentMap) {
       if (!desiredMap.has(key)) {
         if (constraint.name) {
@@ -24942,8 +24949,9 @@ class SchemaDiffer {
     }
   }
   collectCheckConstraintAlterations(desiredConstraints, currentConstraints, alterations) {
-    const currentMap = new Map(currentConstraints.map((c) => [c.name || c.expression, c]));
-    const desiredMap = new Map(desiredConstraints.map((c) => [c.name || c.expression, c]));
+    const normalizeExpression = (expr) => expr.replace(/\s+/g, " ").trim();
+    const currentMap = new Map(currentConstraints.map((c) => [normalizeExpression(c.expression), c]));
+    const desiredMap = new Map(desiredConstraints.map((c) => [normalizeExpression(c.expression), c]));
     for (const [key, constraint] of currentMap) {
       if (!desiredMap.has(key) && constraint.name) {
         alterations.push({
@@ -24958,18 +24966,6 @@ class SchemaDiffer {
           type: "add_check",
           constraint
         });
-      } else {
-        const currentConstraint = currentMap.get(key);
-        if (constraint.expression !== currentConstraint.expression && currentConstraint.name) {
-          alterations.push({
-            type: "drop_check",
-            constraintName: currentConstraint.name
-          });
-          alterations.push({
-            type: "add_check",
-            constraint
-          });
-        }
       }
     }
   }
@@ -25010,14 +25006,9 @@ class SchemaDiffer {
     }
   }
   collectUniqueConstraintAlterations(desiredConstraints, currentConstraints, alterations) {
-    const currentMap = new Map(currentConstraints.map((c) => [
-      c.name || `unique_${c.columns.join("_")}`,
-      c
-    ]));
-    const desiredMap = new Map(desiredConstraints.map((c) => [
-      c.name || `unique_${c.columns.join("_")}`,
-      c
-    ]));
+    const getStructuralKey = (c) => [...c.columns].sort().join(",");
+    const currentMap = new Map(currentConstraints.map((c) => [getStructuralKey(c), c]));
+    const desiredMap = new Map(desiredConstraints.map((c) => [getStructuralKey(c), c]));
     for (const [key, constraint] of currentMap) {
       if (!desiredMap.has(key) && constraint.name) {
         alterations.push({
@@ -25086,7 +25077,8 @@ class SchemaDiffer {
           b.p("ALTER COLUMN").ident(alt.columnName).p("DROP NOT NULL");
           break;
         case "add_primary_key": {
-          const constraintName = alt.constraint.name || `pk_${table.name}`;
+          const bareTable = getBareTableName(table.name);
+          const constraintName = alt.constraint.name || `${bareTable}_pkey`;
           const columns = alt.constraint.columns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
           b.p("ADD CONSTRAINT").ident(constraintName).p(`PRIMARY KEY (${columns})`);
           break;
@@ -25095,7 +25087,8 @@ class SchemaDiffer {
           b.p("DROP CONSTRAINT").ident(alt.constraintName);
           break;
         case "add_check": {
-          const constraintName = alt.constraint.name || `check_${table.name}_${Date.now()}`;
+          const bareTable = getBareTableName(table.name);
+          const constraintName = alt.constraint.name || `${bareTable}_check`;
           b.p("ADD CONSTRAINT").ident(constraintName).p(`CHECK (${alt.constraint.expression})`);
           break;
         }
@@ -25106,7 +25099,7 @@ class SchemaDiffer {
           const constraintName = alt.constraint.name || `fk_${table.name}_${alt.constraint.referencedTable}`;
           const columns = alt.constraint.columns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
           const referencedColumns = alt.constraint.referencedColumns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
-          b.p("ADD CONSTRAINT").ident(constraintName).p(`FOREIGN KEY (${columns}) REFERENCES`).table(alt.constraint.referencedTable).p(`(${referencedColumns})`);
+          b.p("ADD CONSTRAINT").ident(constraintName).p(`FOREIGN KEY (${columns}) REFERENCES`).table(...splitSchemaTable(alt.constraint.referencedTable)).p(`(${referencedColumns})`);
           if (alt.constraint.onDelete) {
             b.p(`ON DELETE ${alt.constraint.onDelete}`);
           }
@@ -25119,7 +25112,8 @@ class SchemaDiffer {
           b.p("DROP CONSTRAINT").ident(alt.constraintName);
           break;
         case "add_unique": {
-          const constraintName = alt.constraint.name || `unique_${table.name}_${alt.constraint.columns.join("_")}`;
+          const bareTable = getBareTableName(table.name);
+          const constraintName = alt.constraint.name || `${bareTable}_${alt.constraint.columns.join("_")}_unique`;
           const columns = alt.constraint.columns.map((col) => `"${col.replace(/"/g, '""')}"`).join(", ");
           b.p("ADD CONSTRAINT").ident(constraintName).p(`UNIQUE (${columns})`);
           break;
@@ -25934,7 +25928,7 @@ async function applyCommand(options, config) {
 // package.json
 var package_default = {
   name: "pgterra",
-  version: "0.2.7",
+  version: "0.2.8",
   description: "Declarative schema management for Postgres",
   keywords: [
     "postgres",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgterra",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Declarative schema management for Postgres",
   "keywords": [
     "postgres",