relq 1.0.104 → 1.0.106

package/dist/cjs/cli/commands/push.cjs

@@ -157,6 +157,35 @@ async function runPush(config, projectRoot, opts = {}) {
         const diff = (0, schema_diff_1.diffSchemas)((0, schema_hash_1.normalizeSchema)(dbSchema), (0, schema_hash_1.normalizeSchema)(desiredSchema));
         let filteredDiff = (0, schema_diff_1.filterDiff)(diff, ignorePatterns.map(pat => pat.raw));
         const dbParsedSchema = await (0, ast_transformer_1.introspectedToParsedSchema)(dbSchema);
+        const snapshot = (0, snapshot_manager_1.loadSnapshot)(snapshotPath);
+        if (snapshot) {
+            const snapTables = Object.values(snapshot.tables || {});
+            for (const dbTable of dbParsedSchema.tables) {
+                const snapTable = snapTables.find(s => s.name === dbTable.name);
+                if (!snapTable)
+                    continue;
+                if (snapTable.trackingId)
+                    dbTable.trackingId = snapTable.trackingId;
+                const snapCols = Object.values(snapTable.columns || {});
+                for (const dbCol of dbTable.columns) {
+                    const snapCol = snapCols.find(s => s.name === dbCol.name);
+                    if (snapCol?.trackingId)
+                        dbCol.trackingId = snapCol.trackingId;
+                }
+                const snapIdxs = Object.values(snapTable.indexes || {});
+                for (const dbIdx of dbTable.indexes) {
+                    const snapIdx = snapIdxs.find(s => s.name === dbIdx.name);
+                    if (snapIdx?.trackingId)
+                        dbIdx.trackingId = snapIdx.trackingId;
+                }
+                const snapCons = Object.values(snapTable.constraints || {});
+                for (const dbCon of dbTable.constraints) {
+                    const snapCon = snapCons.find(s => s.name === dbCon.name);
+                    if (snapCon?.trackingId)
+                        dbCon.trackingId = snapCon.trackingId;
+                }
+            }
+        }
         const desiredASTCopy = { ...desiredAST };
         if (!includeFunctions) {
             dbParsedSchema.functions = [];
@@ -176,7 +205,20 @@ async function runPush(config, projectRoot, opts = {}) {
         }
         console.log('');
         console.log(`${colors_1.colors.bold('Changes to push:')}`);
+        const renamedFromNames = new Set(comparison.renamed.tables.map(r => r.from));
+        const renamedToNames = new Set(comparison.renamed.tables.map(r => r.to));
+        for (const rename of comparison.renamed.tables) {
+            console.log(`  ${colors_1.colors.cyan('→')} ${colors_1.colors.bold(rename.from)} → ${colors_1.colors.bold(rename.to)} ${colors_1.colors.muted('(rename)')}`);
+        }
+        for (const rename of comparison.renamed.columns) {
+            console.log(`  ${colors_1.colors.cyan('→')} ${colors_1.colors.bold(rename.table)}.${rename.from} → ${rename.to} ${colors_1.colors.muted('(rename column)')}`);
+        }
+        for (const rename of comparison.renamed.indexes) {
+            console.log(`  ${colors_1.colors.cyan('→')} index ${rename.from} → ${rename.to} ${colors_1.colors.muted('(rename index)')}`);
+        }
         for (const table of filteredDiff.tables) {
+            if (renamedFromNames.has(table.name) || renamedToNames.has(table.name))
+                continue;
             if (table.type === 'added') {
                 console.log(`  ${colors_1.colors.green('+')} ${colors_1.colors.bold(table.name)} ${colors_1.colors.muted('(new table)')}`);
                 for (const col of table.columns || []) {
@@ -273,8 +315,11 @@ async function runPush(config, projectRoot, opts = {}) {
             || comparison.removed.triggers.length > 0;
         if ((0, schema_diff_1.hasDestructiveChanges)(filteredDiff) || hasNonTableDestructive) {
             const destructiveItems = [];
-            for (const t of (0, schema_diff_1.getDestructiveTables)(filteredDiff))
+            for (const t of (0, schema_diff_1.getDestructiveTables)(filteredDiff)) {
+                if (renamedFromNames.has(t) || renamedToNames.has(t))
+                    continue;
                 destructiveItems.push(t);
+            }
             for (const e of comparison.removed.enums)
                 destructiveItems.push(`enum ${e.name}`);
             for (const d of comparison.removed.domains)
@@ -289,33 +334,35 @@ async function runPush(config, projectRoot, opts = {}) {
                 destructiveItems.push(`function ${f.name}`);
             for (const tr of comparison.removed.triggers)
                 destructiveItems.push(`trigger ${tr.name}`);
-            (0, ui_1.warning)('Destructive changes detected:');
-            for (const item of destructiveItems) {
-                console.log(`   ${colors_1.colors.red('-')} ${item}`);
-            }
-            console.log('');
-            if (!force && !skipPrompt) {
-                const proceed = await p.confirm({
-                    message: 'Include destructive changes?',
-                    initialValue: false,
-                });
-                if (p.isCancel(proceed)) {
-                    (0, ui_1.fatal)('Operation cancelled by user');
+            if (destructiveItems.length > 0) {
+                (0, ui_1.warning)('Destructive changes detected:');
+                for (const item of destructiveItems) {
+                    console.log(`   ${colors_1.colors.red('-')} ${item}`);
                 }
-                if (!proceed) {
-                    filteredDiff = (0, schema_diff_1.stripDestructiveChanges)(filteredDiff);
-                    comparison.removed.enums = [];
-                    comparison.removed.domains = [];
-                    comparison.removed.sequences = [];
-                    comparison.removed.compositeTypes = [];
-                    comparison.removed.views = [];
-                    comparison.removed.functions = [];
-                    comparison.removed.triggers = [];
-                    if (!filteredDiff.hasChanges && !comparison.hasChanges) {
-                        p.log.info('No non-destructive changes to push.');
-                        process.exit(0);
+                console.log('');
+                if (!force && !skipPrompt) {
+                    const proceed = await p.confirm({
+                        message: 'Include destructive changes?',
+                        initialValue: false,
+                    });
+                    if (p.isCancel(proceed)) {
+                        (0, ui_1.fatal)('Operation cancelled by user');
+                    }
+                    if (!proceed) {
+                        filteredDiff = (0, schema_diff_1.stripDestructiveChanges)(filteredDiff);
+                        comparison.removed.enums = [];
+                        comparison.removed.domains = [];
+                        comparison.removed.sequences = [];
+                        comparison.removed.compositeTypes = [];
+                        comparison.removed.views = [];
+                        comparison.removed.functions = [];
+                        comparison.removed.triggers = [];
+                        if (!filteredDiff.hasChanges && !comparison.hasChanges) {
+                            p.log.info('No non-destructive changes to push.');
+                            process.exit(0);
+                        }
+                        p.log.info('Destructive changes excluded. Continuing with safe changes only.');
                     }
-                    p.log.info('Destructive changes excluded. Continuing with safe changes only.');
                 }
             }
         }

package/dist/cjs/cli/utils/schema-diff.cjs

@@ -1069,7 +1069,7 @@ function compareColumnProperties(oldCol, newCol) {
     if (oldCol.isUnique !== newCol.isUnique) {
         changes.push({ field: 'unique', from: oldCol.isUnique, to: newCol.isUnique });
     }
-    if (oldCol.defaultValue !== newCol.defaultValue) {
+    if (!defaultsEqual(oldCol.defaultValue, newCol.defaultValue)) {
         changes.push({ field: 'default', from: oldCol.defaultValue, to: newCol.defaultValue });
     }
     const oldLength = oldCol.typeParams?.length;
@@ -1089,6 +1089,24 @@ function compareColumnProperties(oldCol, newCol) {
     }
     return changes;
 }
+function defaultsEqual(a, b) {
+    if (a === b)
+        return true;
+    if (a == null && b == null)
+        return true;
+    if (a == null || b == null)
+        return false;
+    return normalizeDefault(a) === normalizeDefault(b);
+}
+function normalizeDefault(val) {
+    let v = val.trim();
+    v = v.replace(/::[\w\s]+(\[\])?$/i, '');
+    const upper = v.toUpperCase();
+    if (upper === 'NOW()' || upper === 'CURRENT_TIMESTAMP' || upper === 'CURRENT_TIMESTAMP()') {
+        return 'CURRENT_TIMESTAMP';
+    }
+    return v;
+}
 function compareTableIndexes(oldTable, newTable, tableName, result) {
     const oldByName = new Map(oldTable.indexes.map(i => [i.name, i]));
     const newByName = new Map(newTable.indexes.map(i => [i.name, i]));

package/dist/esm/cli/commands/push.js

@@ -14,7 +14,7 @@ import { validateForDialect, formatDialectErrors } from "../utils/dialect-valida
 import { validateSchemaFile, formatValidationErrors } from "../utils/schema-validator.js";
 import { loadRelqignore } from "../utils/relqignore.js";
 import { isInitialized } from "../utils/repo-manager.js";
-import { saveSnapshot } from "../utils/snapshot-manager.js";
+import { loadSnapshot, saveSnapshot } from "../utils/snapshot-manager.js";
 import { loadSchemaFile } from "../utils/schema-loader.js";
 import { diffSchemas, filterDiff, hasDestructiveChanges, getDestructiveTables, stripDestructiveChanges, formatCategorizedSummary, compareSchemas } from "../utils/schema-diff.js";
 import { normalizeSchema } from "../utils/schema-hash.js";
@@ -121,6 +121,35 @@ export async function runPush(config, projectRoot, opts = {}) {
         const diff = diffSchemas(normalizeSchema(dbSchema), normalizeSchema(desiredSchema));
         let filteredDiff = filterDiff(diff, ignorePatterns.map(pat => pat.raw));
         const dbParsedSchema = await introspectedToParsedSchema(dbSchema);
+        const snapshot = loadSnapshot(snapshotPath);
+        if (snapshot) {
+            const snapTables = Object.values(snapshot.tables || {});
+            for (const dbTable of dbParsedSchema.tables) {
+                const snapTable = snapTables.find(s => s.name === dbTable.name);
+                if (!snapTable)
+                    continue;
+                if (snapTable.trackingId)
+                    dbTable.trackingId = snapTable.trackingId;
+                const snapCols = Object.values(snapTable.columns || {});
+                for (const dbCol of dbTable.columns) {
+                    const snapCol = snapCols.find(s => s.name === dbCol.name);
+                    if (snapCol?.trackingId)
+                        dbCol.trackingId = snapCol.trackingId;
+                }
+                const snapIdxs = Object.values(snapTable.indexes || {});
+                for (const dbIdx of dbTable.indexes) {
+                    const snapIdx = snapIdxs.find(s => s.name === dbIdx.name);
+                    if (snapIdx?.trackingId)
+                        dbIdx.trackingId = snapIdx.trackingId;
+                }
+                const snapCons = Object.values(snapTable.constraints || {});
+                for (const dbCon of dbTable.constraints) {
+                    const snapCon = snapCons.find(s => s.name === dbCon.name);
+                    if (snapCon?.trackingId)
+                        dbCon.trackingId = snapCon.trackingId;
+                }
+            }
+        }
         const desiredASTCopy = { ...desiredAST };
         if (!includeFunctions) {
             dbParsedSchema.functions = [];
@@ -140,7 +169,20 @@ export async function runPush(config, projectRoot, opts = {}) {
         }
         console.log('');
         console.log(`${colors.bold('Changes to push:')}`);
+        const renamedFromNames = new Set(comparison.renamed.tables.map(r => r.from));
+        const renamedToNames = new Set(comparison.renamed.tables.map(r => r.to));
+        for (const rename of comparison.renamed.tables) {
+            console.log(`  ${colors.cyan('→')} ${colors.bold(rename.from)} → ${colors.bold(rename.to)} ${colors.muted('(rename)')}`);
+        }
+        for (const rename of comparison.renamed.columns) {
+            console.log(`  ${colors.cyan('→')} ${colors.bold(rename.table)}.${rename.from} → ${rename.to} ${colors.muted('(rename column)')}`);
+        }
+        for (const rename of comparison.renamed.indexes) {
+            console.log(`  ${colors.cyan('→')} index ${rename.from} → ${rename.to} ${colors.muted('(rename index)')}`);
+        }
         for (const table of filteredDiff.tables) {
+            if (renamedFromNames.has(table.name) || renamedToNames.has(table.name))
+                continue;
             if (table.type === 'added') {
                 console.log(`  ${colors.green('+')} ${colors.bold(table.name)} ${colors.muted('(new table)')}`);
                 for (const col of table.columns || []) {
@@ -237,8 +279,11 @@ export async function runPush(config, projectRoot, opts = {}) {
             || comparison.removed.triggers.length > 0;
         if (hasDestructiveChanges(filteredDiff) || hasNonTableDestructive) {
             const destructiveItems = [];
-            for (const t of getDestructiveTables(filteredDiff))
+            for (const t of getDestructiveTables(filteredDiff)) {
+                if (renamedFromNames.has(t) || renamedToNames.has(t))
+                    continue;
                 destructiveItems.push(t);
+            }
             for (const e of comparison.removed.enums)
                 destructiveItems.push(`enum ${e.name}`);
             for (const d of comparison.removed.domains)
@@ -253,33 +298,35 @@ export async function runPush(config, projectRoot, opts = {}) {
                 destructiveItems.push(`function ${f.name}`);
             for (const tr of comparison.removed.triggers)
                 destructiveItems.push(`trigger ${tr.name}`);
-            warning('Destructive changes detected:');
-            for (const item of destructiveItems) {
-                console.log(`   ${colors.red('-')} ${item}`);
-            }
-            console.log('');
-            if (!force && !skipPrompt) {
-                const proceed = await p.confirm({
-                    message: 'Include destructive changes?',
-                    initialValue: false,
-                });
-                if (p.isCancel(proceed)) {
-                    fatal('Operation cancelled by user');
+            if (destructiveItems.length > 0) {
+                warning('Destructive changes detected:');
+                for (const item of destructiveItems) {
+                    console.log(`   ${colors.red('-')} ${item}`);
                 }
-                if (!proceed) {
-                    filteredDiff = stripDestructiveChanges(filteredDiff);
-                    comparison.removed.enums = [];
-                    comparison.removed.domains = [];
-                    comparison.removed.sequences = [];
-                    comparison.removed.compositeTypes = [];
-                    comparison.removed.views = [];
-                    comparison.removed.functions = [];
-                    comparison.removed.triggers = [];
-                    if (!filteredDiff.hasChanges && !comparison.hasChanges) {
-                        p.log.info('No non-destructive changes to push.');
-                        process.exit(0);
+                console.log('');
+                if (!force && !skipPrompt) {
+                    const proceed = await p.confirm({
+                        message: 'Include destructive changes?',
+                        initialValue: false,
+                    });
+                    if (p.isCancel(proceed)) {
+                        fatal('Operation cancelled by user');
+                    }
+                    if (!proceed) {
+                        filteredDiff = stripDestructiveChanges(filteredDiff);
+                        comparison.removed.enums = [];
+                        comparison.removed.domains = [];
+                        comparison.removed.sequences = [];
+                        comparison.removed.compositeTypes = [];
+                        comparison.removed.views = [];
+                        comparison.removed.functions = [];
+                        comparison.removed.triggers = [];
+                        if (!filteredDiff.hasChanges && !comparison.hasChanges) {
+                            p.log.info('No non-destructive changes to push.');
+                            process.exit(0);
+                        }
+                        p.log.info('Destructive changes excluded. Continuing with safe changes only.');
                     }
-                    p.log.info('Destructive changes excluded. Continuing with safe changes only.');
                 }
             }
         }

package/dist/esm/cli/utils/schema-diff.js

@@ -1058,7 +1058,7 @@ function compareColumnProperties(oldCol, newCol) {
     if (oldCol.isUnique !== newCol.isUnique) {
         changes.push({ field: 'unique', from: oldCol.isUnique, to: newCol.isUnique });
     }
-    if (oldCol.defaultValue !== newCol.defaultValue) {
+    if (!defaultsEqual(oldCol.defaultValue, newCol.defaultValue)) {
         changes.push({ field: 'default', from: oldCol.defaultValue, to: newCol.defaultValue });
     }
     const oldLength = oldCol.typeParams?.length;
@@ -1078,6 +1078,24 @@ function compareColumnProperties(oldCol, newCol) {
     }
     return changes;
 }
+function defaultsEqual(a, b) {
+    if (a === b)
+        return true;
+    if (a == null && b == null)
+        return true;
+    if (a == null || b == null)
+        return false;
+    return normalizeDefault(a) === normalizeDefault(b);
+}
+function normalizeDefault(val) {
+    let v = val.trim();
+    v = v.replace(/::[\w\s]+(\[\])?$/i, '');
+    const upper = v.toUpperCase();
+    if (upper === 'NOW()' || upper === 'CURRENT_TIMESTAMP' || upper === 'CURRENT_TIMESTAMP()') {
+        return 'CURRENT_TIMESTAMP';
+    }
+    return v;
+}
 function compareTableIndexes(oldTable, newTable, tableName, result) {
     const oldByName = new Map(oldTable.indexes.map(i => [i.name, i]));
     const newByName = new Map(newTable.indexes.map(i => [i.name, i]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relq",
-  "version": "1.0.104",
+  "version": "1.0.106",
   "description": "The Fully-Typed PostgreSQL ORM for TypeScript",
   "author": "Olajide Mathew O. <olajide.mathew@yuniq.solutions>",
   "license": "MIT",