pgterra 0.2.13 → 0.2.15

package/dist/index.js

@@ -23683,12 +23683,17 @@ function getQualifiedTableName(table, schema) {
 function normalizeType(type) {
   const typeMap = {
     "character varying": "VARCHAR",
+    character: "CHAR",
+    bpchar: "CHAR",
     text: "TEXT",
     boolean: "BOOLEAN",
     bool: "BOOLEAN",
     "timestamp without time zone": "TIMESTAMP",
     "timestamp with time zone": "TIMESTAMPTZ",
     timestamptz: "TIMESTAMPTZ",
+    "time without time zone": "TIME",
+    "time with time zone": "TIMETZ",
+    timetz: "TIMETZ",
     int: "INT4",
     int2: "INT2",
     int4: "INT4",
@@ -23702,11 +23707,19 @@ function normalizeType(type) {
     SMALLINT: "INT2",
     INTEGER: "INT4",
     BIGINT: "INT8",
-    decimal: "NUMERIC"
+    decimal: "NUMERIC",
+    real: "FLOAT4",
+    float4: "FLOAT4",
+    "double precision": "FLOAT8",
+    float8: "FLOAT8"
   };
   if (type.startsWith("character varying")) {
     return type.replace("character varying", "VARCHAR");
   }
+  const lowerTypePrefix = type.toLowerCase();
+  if (lowerTypePrefix.startsWith("character(") || lowerTypePrefix.startsWith("bpchar(")) {
+    return type.replace(/^(character|bpchar)/i, "CHAR");
+  }
   if (type.toLowerCase().startsWith("numeric(") || type.toLowerCase().startsWith("decimal(")) {
     const match = type.match(/^(numeric|decimal)\((\d+),(\d+)\)$/i);
     if (match) {
@@ -23724,11 +23737,25 @@ function normalizeDefault(value) {
   if (normalized.toUpperCase() === "NULL") {
     return;
   }
-  normalized = normalized.replace(/::[a-z_]+(\s+[a-z_]+)*(\([^)]*\))?$/i, "");
-  return normalized.trim();
+  normalized = normalized.replace(/::[a-z_]+(\s+[a-z_]+)*(\([^)]*\))?(\[\])?$/i, "");
+  const castMatch = normalized.match(/^CAST\((.+)\s+AS\s+[a-z_]+(\[\])?\)$/i);
+  if (castMatch) {
+    normalized = castMatch[1].trim();
+  }
+  normalized = normalized.trim();
+  const quotedNumeric = normalized.match(/^'(-?\d+(?:\.\d+)?)'$/);
+  if (quotedNumeric) {
+    normalized = quotedNumeric[1];
+  }
+  return normalized;
 }
 function normalizeExpression(expr) {
-  let normalized = expr.replace(/\s+/g, " ").trim().replace(/::[a-z_]+(\([^)]*\))?/gi, "").replace(/\(([a-z_][a-z0-9_]*)\)/gi, "$1");
+  let normalized = expr.replace(/\s+/g, " ").trim().replace(/::"?[a-z_]+"?(\([^)]*\))?/gi, "").replace(/\bpg_catalog\./gi, "").replace(/\((-?\d+(?:\.\d+)?)\)/g, "$1").replace(/(?<![a-z0-9_])\(([a-z_][a-z0-9_]*)\)/gi, "$1");
+  let prevNormalized;
+  do {
+    prevNormalized = normalized;
+    normalized = normalized.replace(/\(([a-z_][a-z0-9_]*\s*[<>=!]+\s*-?\d+(?:\.\d+)?)\)/gi, "$1").replace(/\(([a-z_][a-z0-9_]*\s+(?:IS\s+(?:NOT\s+)?NULL|IN\s+\([^)]*\)))\)/gi, "$1").replace(/\(([a-z_][a-z0-9_]*\s+IS\s+NOT\s+NULL\s+AND\s+[^)]+)\)/gi, "$1").replace(/\(([a-z_][a-z0-9_]*\s*\*\s*\([^)]+\))\)/gi, "$1");
+  } while (normalized !== prevNormalized);
   while (/^\(.*\)$/.test(normalized)) {
     const inner = normalized.slice(1, -1);
     let depth = 0;
@@ -24681,7 +24708,9 @@ class SchemaDiffer {
       if (index1.columns[i] !== index2.columns[i])
         return false;
     }
-    if (index1.where !== index2.where)
+    const where1 = index1.where ? normalizeExpression(index1.where) : undefined;
+    const where2 = index2.where ? normalizeExpression(index2.where) : undefined;
+    if (where1 !== where2)
       return false;
     if (index1.expression !== index2.expression)
       return false;
@@ -24957,9 +24986,8 @@ class SchemaDiffer {
     }
   }
   collectCheckConstraintAlterations(desiredConstraints, currentConstraints, alterations) {
-    const normalizeExpression2 = (expr) => expr.replace(/\s+/g, " ").trim();
-    const currentMap = new Map(currentConstraints.map((c) => [normalizeExpression2(c.expression), c]));
-    const desiredMap = new Map(desiredConstraints.map((c) => [normalizeExpression2(c.expression), c]));
+    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({
@@ -25014,7 +25042,7 @@ class SchemaDiffer {
     }
   }
   collectUniqueConstraintAlterations(desiredConstraints, currentConstraints, alterations) {
-    const getStructuralKey = (c) => [...c.columns].sort().join(",");
+    const getStructuralKey = (c) => c.columns.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) {
@@ -25864,7 +25892,7 @@ async function applyCommand(options, config6) {
 // package.json
 var package_default = {
   name: "pgterra",
-  version: "0.2.13",
+  version: "0.2.15",
   description: "Declarative schema management for Postgres",
   keywords: [
     "postgres",

package/package.json

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