relq 1.0.49 → 1.0.50

package/dist/cjs/cli/commands/pull.cjs

@@ -244,6 +244,14 @@ async function pullCommand(context) {
         if (remoteHead) {
             (0, repo_manager_1.setFetchHead)(remoteHead, projectRoot);
         }
+        const localCommits = (0, repo_manager_1.getAllCommits)(projectRoot);
+        const localHashes = new Set(localCommits.map(c => c.hash));
+        const missingCommits = remoteCommits.filter(c => !localHashes.has(c.hash));
+        if (missingCommits.length > 0) {
+            for (const commit of missingCommits.reverse()) {
+                (0, repo_manager_1.saveCommit)(commit, projectRoot);
+            }
+        }
         spinner.succeed(`Fetched ${remoteCommits.length} remote commits`);
         console.log('');
         console.log(cli_utils_1.colors.bold('Introspecting database...'));
@@ -423,7 +431,16 @@ async function pullCommand(context) {
                     comment: t.comment,
                 })),
                 functions: localSnapshot.functions || [],
-                triggers: localSnapshot.triggers || [],
+                triggers: (localSnapshot.triggers || []).map(t => ({
+                    name: t.name,
+                    tableName: t.table,
+                    event: t.events?.[0] || 'UPDATE',
+                    timing: t.timing,
+                    forEach: t.forEach || 'STATEMENT',
+                    functionName: t.functionName,
+                    definition: '',
+                    isEnabled: true,
+                })),
             };
             const remoteForCompare = {
                 extensions: dbSchema.extensions || [],
@@ -864,7 +881,16 @@ async function pullCommand(context) {
                 comment: t.comment,
             })),
             functions: oldSnapshot.functions || [],
-            triggers: oldSnapshot.triggers || [],
+            triggers: (oldSnapshot.triggers || []).map(t => ({
+                name: t.name,
+                tableName: t.table,
+                event: t.events?.[0] || 'UPDATE',
+                timing: t.timing,
+                forEach: t.forEach || 'STATEMENT',
+                functionName: t.functionName,
+                definition: '',
+                isEnabled: true,
+            })),
         } : {
             extensions: [],
             enums: [],
@@ -920,6 +946,9 @@ async function pullCommand(context) {
         (0, repo_manager_1.saveSnapshot)(currentSchema, projectRoot);
         const duration = Date.now() - startTime;
         if (!autoCommit) {
+            if (remoteHead) {
+                (0, repo_manager_1.setHead)(remoteHead, projectRoot);
+            }
             if (hadPreviousSnapshot && schemaChanges.length > 0) {
                 (0, repo_manager_1.addUnstagedChanges)(schemaChanges, projectRoot);
                 spinner.succeed(`Detected ${schemaChanges.length} schema change(s)`);

package/dist/cjs/cli/utils/ast-codegen.cjs

@@ -12,6 +12,7 @@ const builder_1 = require("./ast/codegen/builder.cjs");
 const type_map_1 = require("./ast/codegen/type-map.cjs");
 const defaults_1 = require("./ast/codegen/defaults.cjs");
 const constraints_1 = require("./ast/codegen/constraints.cjs");
+const pg_parser_1 = require("./pg-parser.cjs");
 let needsDefaultImport = false;
 let needsSqlImport = false;
 let trackingIdCounter = 0;
@@ -459,14 +460,14 @@ function generateTableCode(table, useCamelCase, enumNames, domainNames, columnTy
     const columnChecks = new Map();
     for (const c of table.constraints) {
         if (c.type === 'CHECK' && c.expression) {
-            for (const col of table.columns) {
-                const colPattern = new RegExp(`\\(${col.name}\\)|\\b${col.name}\\b`, 'i');
-                if (colPattern.test(c.expression)) {
+            const extractedCol = (0, pg_parser_1.extractColumnFromCheck)(c.expression);
+            if (extractedCol) {
+                const matchingCol = table.columns.find(col => col.name.toLowerCase() === extractedCol);
+                if (matchingCol) {
                     const values = (0, constraints_1.extractEnumValues)(c.expression);
                     if (values && values.length > 0) {
-                        columnChecks.set(col.name, { name: c.name, values });
+                        columnChecks.set(matchingCol.name, { name: c.name, values });
                     }
-                    break;
                 }
             }
         }

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

@@ -777,26 +777,25 @@ async function compareFunctions(before, after) {
 }
 function compareTriggers(before, after) {
     const changes = [];
-    const beforeMap = new Map(before.map(t => [t.name, t]));
-    const afterMap = new Map(after.map(t => [t.name, t]));
-    for (const [name, trigger] of afterMap) {
-        if (!beforeMap.has(name)) {
-            changes.push((0, change_tracker_1.createChange)('CREATE', 'TRIGGER', name, null, trigger, trigger.tableName));
+    const beforeMap = new Map(before.map(t => [`${t.tableName}.${t.name}`, t]));
+    const afterMap = new Map(after.map(t => [`${t.tableName}.${t.name}`, t]));
+    for (const [key, trigger] of afterMap) {
+        if (!beforeMap.has(key)) {
+            changes.push((0, change_tracker_1.createChange)('CREATE', 'TRIGGER', trigger.name, null, trigger, trigger.tableName));
         }
         else {
-            const beforeTrigger = beforeMap.get(name);
+            const beforeTrigger = beforeMap.get(key);
             if (beforeTrigger.timing !== trigger.timing ||
                 beforeTrigger.event !== trigger.event ||
-                beforeTrigger.functionName !== trigger.functionName ||
-                beforeTrigger.tableName !== trigger.tableName) {
-                changes.push((0, change_tracker_1.createChange)('DROP', 'TRIGGER', name, beforeTrigger, null, beforeTrigger.tableName));
-                changes.push((0, change_tracker_1.createChange)('CREATE', 'TRIGGER', name, null, trigger, trigger.tableName));
+                beforeTrigger.functionName !== trigger.functionName) {
+                changes.push((0, change_tracker_1.createChange)('DROP', 'TRIGGER', trigger.name, beforeTrigger, null, beforeTrigger.tableName));
+                changes.push((0, change_tracker_1.createChange)('CREATE', 'TRIGGER', trigger.name, null, trigger, trigger.tableName));
             }
         }
     }
-    for (const [name, trigger] of beforeMap) {
-        if (!afterMap.has(name)) {
-            changes.push((0, change_tracker_1.createChange)('DROP', 'TRIGGER', name, trigger, null, trigger.tableName));
+    for (const [key, trigger] of beforeMap) {
+        if (!afterMap.has(key)) {
+            changes.push((0, change_tracker_1.createChange)('DROP', 'TRIGGER', trigger.name, trigger, null, trigger.tableName));
         }
     }
     return changes;

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

@@ -8,7 +8,7 @@ import { syncTypesFromDb, getTypesFilePath, getTypesFromDb } from "../utils/type
 import { getConnectionDescription } from "../utils/env-loader.js";
 import { createSpinner, colors, formatBytes, formatDuration, fatal, confirm, warning, createMultiProgress, select } from "../utils/cli-utils.js";
 import { loadRelqignore, isTableIgnored, isColumnIgnored, isIndexIgnored, isConstraintIgnored, isEnumIgnored, isDomainIgnored, isCompositeTypeIgnored, isFunctionIgnored, } from "../utils/relqignore.js";
-import { isInitialized, initRepository, getHead, saveCommit, saveSnapshot, loadSnapshot, createCommit, shortHash, fetchRemoteCommits, ensureRemoteTable, setFetchHead, addUnstagedChanges, getStagedChanges, getUnstagedChanges, clearWorkingState, hashFileContent, saveFileHash, markCommitAsPulled, getAllCommits, } from "../utils/repo-manager.js";
+import { isInitialized, initRepository, getHead, setHead, saveCommit, saveSnapshot, loadSnapshot, createCommit, shortHash, fetchRemoteCommits, ensureRemoteTable, setFetchHead, addUnstagedChanges, getStagedChanges, getUnstagedChanges, clearWorkingState, hashFileContent, saveFileHash, markCommitAsPulled, getAllCommits, } from "../utils/repo-manager.js";
 import { compareSchemas } from "../utils/schema-comparator.js";
 function toCamelCase(str) {
     return str.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
@@ -208,6 +208,14 @@ export async function pullCommand(context) {
         if (remoteHead) {
             setFetchHead(remoteHead, projectRoot);
         }
+        const localCommits = getAllCommits(projectRoot);
+        const localHashes = new Set(localCommits.map(c => c.hash));
+        const missingCommits = remoteCommits.filter(c => !localHashes.has(c.hash));
+        if (missingCommits.length > 0) {
+            for (const commit of missingCommits.reverse()) {
+                saveCommit(commit, projectRoot);
+            }
+        }
         spinner.succeed(`Fetched ${remoteCommits.length} remote commits`);
         console.log('');
         console.log(colors.bold('Introspecting database...'));
@@ -387,7 +395,16 @@ export async function pullCommand(context) {
                     comment: t.comment,
                 })),
                 functions: localSnapshot.functions || [],
-                triggers: localSnapshot.triggers || [],
+                triggers: (localSnapshot.triggers || []).map(t => ({
+                    name: t.name,
+                    tableName: t.table,
+                    event: t.events?.[0] || 'UPDATE',
+                    timing: t.timing,
+                    forEach: t.forEach || 'STATEMENT',
+                    functionName: t.functionName,
+                    definition: '',
+                    isEnabled: true,
+                })),
             };
             const remoteForCompare = {
                 extensions: dbSchema.extensions || [],
@@ -828,7 +845,16 @@ export async function pullCommand(context) {
                 comment: t.comment,
             })),
             functions: oldSnapshot.functions || [],
-            triggers: oldSnapshot.triggers || [],
+            triggers: (oldSnapshot.triggers || []).map(t => ({
+                name: t.name,
+                tableName: t.table,
+                event: t.events?.[0] || 'UPDATE',
+                timing: t.timing,
+                forEach: t.forEach || 'STATEMENT',
+                functionName: t.functionName,
+                definition: '',
+                isEnabled: true,
+            })),
         } : {
             extensions: [],
             enums: [],
@@ -884,6 +910,9 @@ export async function pullCommand(context) {
         saveSnapshot(currentSchema, projectRoot);
         const duration = Date.now() - startTime;
         if (!autoCommit) {
+            if (remoteHead) {
+                setHead(remoteHead, projectRoot);
+            }
             if (hadPreviousSnapshot && schemaChanges.length > 0) {
                 addUnstagedChanges(schemaChanges, projectRoot);
                 spinner.succeed(`Detected ${schemaChanges.length} schema change(s)`);

package/dist/esm/cli/utils/ast-codegen.js

@@ -4,6 +4,7 @@ import { astToBuilder } from "./ast/codegen/builder.js";
 import { getColumnBuilder, getColumnBuilderWithInfo } from "./ast/codegen/type-map.js";
 import { formatDefaultValue, resetDefaultImportFlags, getDefaultImportNeeded, getDefaultSqlImportNeeded, } from "./ast/codegen/defaults.js";
 import { extractEnumValues, generateConstraintCode, generateCheckConstraintsOption, resetSqlImportFlag, getSqlImportNeeded, } from "./ast/codegen/constraints.js";
+import { extractColumnFromCheck } from "./pg-parser.js";
 let needsDefaultImport = false;
 let needsSqlImport = false;
 let trackingIdCounter = 0;
@@ -451,14 +452,14 @@ function generateTableCode(table, useCamelCase, enumNames, domainNames, columnTy
     const columnChecks = new Map();
     for (const c of table.constraints) {
         if (c.type === 'CHECK' && c.expression) {
-            for (const col of table.columns) {
-                const colPattern = new RegExp(`\\(${col.name}\\)|\\b${col.name}\\b`, 'i');
-                if (colPattern.test(c.expression)) {
+            const extractedCol = extractColumnFromCheck(c.expression);
+            if (extractedCol) {
+                const matchingCol = table.columns.find(col => col.name.toLowerCase() === extractedCol);
+                if (matchingCol) {
                     const values = extractEnumValues(c.expression);
                     if (values && values.length > 0) {
-                        columnChecks.set(col.name, { name: c.name, values });
+                        columnChecks.set(matchingCol.name, { name: c.name, values });
                     }
-                    break;
                 }
             }
         }

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

@@ -770,26 +770,25 @@ async function compareFunctions(before, after) {
 }
 function compareTriggers(before, after) {
     const changes = [];
-    const beforeMap = new Map(before.map(t => [t.name, t]));
-    const afterMap = new Map(after.map(t => [t.name, t]));
-    for (const [name, trigger] of afterMap) {
-        if (!beforeMap.has(name)) {
-            changes.push(createChange('CREATE', 'TRIGGER', name, null, trigger, trigger.tableName));
+    const beforeMap = new Map(before.map(t => [`${t.tableName}.${t.name}`, t]));
+    const afterMap = new Map(after.map(t => [`${t.tableName}.${t.name}`, t]));
+    for (const [key, trigger] of afterMap) {
+        if (!beforeMap.has(key)) {
+            changes.push(createChange('CREATE', 'TRIGGER', trigger.name, null, trigger, trigger.tableName));
         }
         else {
-            const beforeTrigger = beforeMap.get(name);
+            const beforeTrigger = beforeMap.get(key);
             if (beforeTrigger.timing !== trigger.timing ||
                 beforeTrigger.event !== trigger.event ||
-                beforeTrigger.functionName !== trigger.functionName ||
-                beforeTrigger.tableName !== trigger.tableName) {
-                changes.push(createChange('DROP', 'TRIGGER', name, beforeTrigger, null, beforeTrigger.tableName));
-                changes.push(createChange('CREATE', 'TRIGGER', name, null, trigger, trigger.tableName));
+                beforeTrigger.functionName !== trigger.functionName) {
+                changes.push(createChange('DROP', 'TRIGGER', trigger.name, beforeTrigger, null, beforeTrigger.tableName));
+                changes.push(createChange('CREATE', 'TRIGGER', trigger.name, null, trigger, trigger.tableName));
             }
         }
     }
-    for (const [name, trigger] of beforeMap) {
-        if (!afterMap.has(name)) {
-            changes.push(createChange('DROP', 'TRIGGER', name, trigger, null, trigger.tableName));
+    for (const [key, trigger] of beforeMap) {
+        if (!afterMap.has(key)) {
+            changes.push(createChange('DROP', 'TRIGGER', trigger.name, trigger, null, trigger.tableName));
         }
     }
     return changes;

package/package.json

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