relq 1.0.104 → 1.0.105

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 = [];

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 = [];

package/package.json

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