relq 1.0.46 → 1.0.48

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

@@ -178,7 +178,7 @@ async function pullCommand(context) {
     const connection = config.connection;
     const force = flags['force'] === true;
     const merge = flags['merge'] === true;
-    const noCommit = flags['no-commit'] === true;
+    const autoCommit = flags['commit'] === true;
     const dryRun = flags['dry-run'] === true;
     const author = config.author || 'Relq CLI';
     const schemaPathRaw = (0, config_loader_1.getSchemaPath)(config);
@@ -880,7 +880,7 @@ async function pullCommand(context) {
         (0, ast_codegen_1.copyTrackingIdsToNormalized)(parsedSchema, currentSchema);
         (0, repo_manager_1.saveSnapshot)(currentSchema, projectRoot);
         const duration = Date.now() - startTime;
-        if (noCommit) {
+        if (!autoCommit) {
             if (schemaChanges.length > 0) {
                 (0, repo_manager_1.addUnstagedChanges)(schemaChanges, projectRoot);
                 spinner.succeed(`Detected ${schemaChanges.length} schema change(s)`);

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

@@ -380,7 +380,18 @@ async function pushCommand(context) {
                 catch {
                     spinner.fail('SQL execution failed');
                 }
-                throw error;
+                const dbError = error?.message || String(error);
+                const enhancedError = new Error(`${dbError}\n\n` +
+                    `${cli_utils_1.colors.muted('This usually means:')}\n` +
+                    `  • The SQL statements were generated in the wrong order\n` +
+                    `  • A column/table is referenced before it's created\n` +
+                    `  • The schema is out of sync with the database\n\n` +
+                    `${cli_utils_1.colors.muted('To fix:')}\n` +
+                    `  1. Run ${cli_utils_1.colors.cyan('relq reset --hard HEAD~1')} to undo the commit\n` +
+                    `  2. Run ${cli_utils_1.colors.cyan('relq pull')} to sync with database\n` +
+                    `  3. Run ${cli_utils_1.colors.cyan('relq add')} and ${cli_utils_1.colors.cyan('relq commit')} again\n\n` +
+                    `${cli_utils_1.colors.muted('To debug, run:')} ${cli_utils_1.colors.cyan('relq push --dry-run')} ${cli_utils_1.colors.muted('to see the SQL')}`);
+                throw enhancedError;
             }
             finally {
                 await client.end();

package/dist/cjs/cli/commands/reset.cjs

@@ -114,7 +114,7 @@ async function resetCommand(context) {
             (0, cli_utils_1.fatal)('Cannot find commit data - repository may be corrupt');
         }
         const commitData = JSON.parse(fs.readFileSync(commitPath, 'utf-8'));
-        const targetSnapshot = commitData.snapshot;
+        const targetSnapshot = (commitData.snapshot || commitData.schema);
         if (!targetSnapshot) {
             spinner.stop();
             (0, cli_utils_1.fatal)('Commit has no snapshot data - repository may be corrupt');
@@ -122,6 +122,18 @@ async function resetCommand(context) {
         if (hard) {
             (0, repo_manager_1.saveSnapshot)(targetSnapshot, projectRoot);
             (0, repo_manager_1.setHead)(targetHash, projectRoot);
+            const commitsDir = path.join(projectRoot, '.relq', 'commits');
+            const headIndex = allCommits.findIndex(c => c.hash === currentHead);
+            const targetIndex = allCommits.findIndex(c => c.hash === targetHash);
+            if (headIndex >= 0 && targetIndex > headIndex) {
+                for (let i = headIndex; i < targetIndex; i++) {
+                    const commitToDelete = allCommits[i];
+                    const commitFile = path.join(commitsDir, `${commitToDelete.hash}.json`);
+                    if (fs.existsSync(commitFile)) {
+                        fs.unlinkSync(commitFile);
+                    }
+                }
+            }
             const stagedPath = path.join(projectRoot, '.relq', 'staged.json');
             const unstagedPath = path.join(projectRoot, '.relq', 'unstaged.json');
             if (fs.existsSync(stagedPath))
@@ -131,6 +143,9 @@ async function resetCommand(context) {
             const mergeStatePath = path.join(projectRoot, '.relq', 'MERGE_STATE');
             if (fs.existsSync(mergeStatePath))
                 fs.unlinkSync(mergeStatePath);
+            const fileHashPath = path.join(projectRoot, '.relq', 'file_hash');
+            if (fs.existsSync(fileHashPath))
+                fs.unlinkSync(fileHashPath);
         }
         spinner.succeed(`Reset to ${cli_utils_1.colors.yellow((0, repo_manager_1.shortHash)(targetHash))}`);
         console.log('');

package/dist/cjs/cli/index.cjs

@@ -92,6 +92,11 @@ function parseArgs(argv) {
     const args = [];
     const flags = {};
     let command = '';
+    const booleanFlags = new Set([
+        'hard', 'soft', 'force', 'yes', 'y', 'dry-run', 'verbose', 'quiet', 'q',
+        'help', 'h', 'version', 'v', 'all', 'a', 'cached', 'staged', 'no-verify',
+        'metadata-only', 'skip-prompt', 'interactive', 'i'
+    ]);
     for (let i = 2; i < argv.length; i++) {
         const arg = argv[i];
         if (arg.startsWith('--')) {
@@ -100,25 +105,36 @@ function parseArgs(argv) {
                 flags[arg.slice(2, eqIndex)] = arg.slice(eqIndex + 1);
             }
             else {
-                const nextArg = argv[i + 1];
-                if (nextArg && !nextArg.startsWith('-')) {
-                    flags[arg.slice(2)] = nextArg;
-                    i++;
+                const flagName = arg.slice(2);
+                if (booleanFlags.has(flagName)) {
+                    flags[flagName] = true;
                 }
                 else {
-                    flags[arg.slice(2)] = true;
+                    const nextArg = argv[i + 1];
+                    if (nextArg && !nextArg.startsWith('-')) {
+                        flags[flagName] = nextArg;
+                        i++;
+                    }
+                    else {
+                        flags[flagName] = true;
+                    }
                 }
             }
         }
         else if (arg.startsWith('-') && arg.length === 2) {
             const flag = arg.slice(1);
-            const nextArg = argv[i + 1];
-            if (nextArg && !nextArg.startsWith('-')) {
-                flags[flag] = nextArg;
-                i++;
+            if (booleanFlags.has(flag)) {
+                flags[flag] = true;
             }
             else {
-                flags[flag] = true;
+                const nextArg = argv[i + 1];
+                if (nextArg && !nextArg.startsWith('-')) {
+                    flags[flag] = nextArg;
+                    i++;
+                }
+                else {
+                    flags[flag] = true;
+                }
             }
         }
         else if (arg.startsWith('-') && arg.length > 2) {

package/dist/cjs/cli/utils/change-tracker.cjs

@@ -559,14 +559,14 @@ function sortChangesByDependency(changes) {
         'PARTITION': 11,
         'PARTITION_CHILD': 12,
         'COLUMN': 13,
-        'COLUMN_COMMENT': 12,
-        'INDEX': 13,
-        'INDEX_COMMENT': 13,
-        'CONSTRAINT': 14,
-        'PRIMARY_KEY': 14,
-        'FOREIGN_KEY': 15,
-        'CHECK': 14,
-        'EXCLUSION': 14,
+        'COLUMN_COMMENT': 14,
+        'INDEX': 15,
+        'INDEX_COMMENT': 16,
+        'CONSTRAINT': 17,
+        'PRIMARY_KEY': 17,
+        'FOREIGN_KEY': 18,
+        'CHECK': 17,
+        'EXCLUSION': 17,
         'VIEW': 20,
         'MATERIALIZED_VIEW': 21,
         'FUNCTION': 30,

package/dist/cjs/cli/utils/commit-manager.cjs

@@ -77,6 +77,18 @@ function getLocalCommits(baseDir = process.cwd()) {
         return [];
     }
 }
+function getLocalCommitByHash(hash, baseDir = process.cwd()) {
+    const commitPath = path.join(baseDir, '.relq', 'commits', `${hash}.json`);
+    if (!fs.existsSync(commitPath)) {
+        return null;
+    }
+    try {
+        return JSON.parse(fs.readFileSync(commitPath, 'utf-8'));
+    }
+    catch {
+        return null;
+    }
+}
 function saveLocalCommits(commits, baseDir = process.cwd()) {
     ensureRelqDir(baseDir);
     const filePath = path.join(baseDir, RELQ_DIR, COMMITS_FILE);
@@ -263,7 +275,21 @@ function generateASTHash(ast) {
 function createCommitFromSchema(schema, author, message, commitLimit = 1000, baseDir = process.cwd()) {
     const parsedSchema = (0, schema_to_ast_1.schemaToAST)(schema);
     const hash = generateASTHash(parsedSchema);
-    const parentHash = getLocalHead(baseDir);
+    const currentHead = getLocalHead(baseDir);
+    let parentHash = currentHead;
+    if (currentHead) {
+        const headCommit = getLocalCommitByHash(currentHead, baseDir);
+        const isUnpushed = headCommit && (!headCommit.remotes?.pushed || headCommit.remotes.pushed.length === 0);
+        const isPullCommit = headCommit?.message?.startsWith('pull: sync from ');
+        if (isUnpushed && !isPullCommit) {
+            parentHash = headCommit?.parentHash || null;
+            const commitsDir = path.join(baseDir, '.relq', 'commits');
+            const oldCommitFile = path.join(commitsDir, `${currentHead}.json`);
+            if (fs.existsSync(oldCommitFile)) {
+                fs.unlinkSync(oldCommitFile);
+            }
+        }
+    }
     const commit = {
         hash,
         parentHash,

package/dist/cjs/cli/utils/repo-manager.cjs

@@ -404,9 +404,21 @@ function detectFileChanges(schemaPath, projectRoot = process.cwd()) {
     const currentContent = fs.readFileSync(schemaPath, 'utf-8');
     const currentHash = hashFileContent(currentContent);
     const savedHash = getSavedFileHash(projectRoot);
-    if (!savedHash || currentHash === savedHash) {
+    if (savedHash && currentHash === savedHash) {
         return null;
     }
+    if (!savedHash) {
+        return {
+            id: `file_${currentHash.substring(0, 8)}`,
+            type: 'ALTER',
+            objectType: 'SCHEMA_FILE',
+            objectName: path.basename(schemaPath),
+            before: null,
+            after: { hash: currentHash },
+            sql: '-- Schema file needs comparison (no previous hash)',
+            detectedAt: new Date().toISOString(),
+        };
+    }
     return {
         id: `file_${currentHash.substring(0, 8)}`,
         type: 'ALTER',

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

@@ -142,7 +142,7 @@ export async function pullCommand(context) {
     const connection = config.connection;
     const force = flags['force'] === true;
     const merge = flags['merge'] === true;
-    const noCommit = flags['no-commit'] === true;
+    const autoCommit = flags['commit'] === true;
     const dryRun = flags['dry-run'] === true;
     const author = config.author || 'Relq CLI';
     const schemaPathRaw = getSchemaPath(config);
@@ -844,7 +844,7 @@ export async function pullCommand(context) {
         copyTrackingIdsToNormalized(parsedSchema, currentSchema);
         saveSnapshot(currentSchema, projectRoot);
         const duration = Date.now() - startTime;
-        if (noCommit) {
+        if (!autoCommit) {
             if (schemaChanges.length > 0) {
                 addUnstagedChanges(schemaChanges, projectRoot);
                 spinner.succeed(`Detected ${schemaChanges.length} schema change(s)`);

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

@@ -344,7 +344,18 @@ export async function pushCommand(context) {
                 catch {
                     spinner.fail('SQL execution failed');
                 }
-                throw error;
+                const dbError = error?.message || String(error);
+                const enhancedError = new Error(`${dbError}\n\n` +
+                    `${colors.muted('This usually means:')}\n` +
+                    `  • The SQL statements were generated in the wrong order\n` +
+                    `  • A column/table is referenced before it's created\n` +
+                    `  • The schema is out of sync with the database\n\n` +
+                    `${colors.muted('To fix:')}\n` +
+                    `  1. Run ${colors.cyan('relq reset --hard HEAD~1')} to undo the commit\n` +
+                    `  2. Run ${colors.cyan('relq pull')} to sync with database\n` +
+                    `  3. Run ${colors.cyan('relq add')} and ${colors.cyan('relq commit')} again\n\n` +
+                    `${colors.muted('To debug, run:')} ${colors.cyan('relq push --dry-run')} ${colors.muted('to see the SQL')}`);
+                throw enhancedError;
             }
             finally {
                 await client.end();

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

@@ -78,7 +78,7 @@ export async function resetCommand(context) {
             fatal('Cannot find commit data - repository may be corrupt');
         }
         const commitData = JSON.parse(fs.readFileSync(commitPath, 'utf-8'));
-        const targetSnapshot = commitData.snapshot;
+        const targetSnapshot = (commitData.snapshot || commitData.schema);
         if (!targetSnapshot) {
             spinner.stop();
             fatal('Commit has no snapshot data - repository may be corrupt');
@@ -86,6 +86,18 @@ export async function resetCommand(context) {
         if (hard) {
             saveSnapshot(targetSnapshot, projectRoot);
             setHead(targetHash, projectRoot);
+            const commitsDir = path.join(projectRoot, '.relq', 'commits');
+            const headIndex = allCommits.findIndex(c => c.hash === currentHead);
+            const targetIndex = allCommits.findIndex(c => c.hash === targetHash);
+            if (headIndex >= 0 && targetIndex > headIndex) {
+                for (let i = headIndex; i < targetIndex; i++) {
+                    const commitToDelete = allCommits[i];
+                    const commitFile = path.join(commitsDir, `${commitToDelete.hash}.json`);
+                    if (fs.existsSync(commitFile)) {
+                        fs.unlinkSync(commitFile);
+                    }
+                }
+            }
             const stagedPath = path.join(projectRoot, '.relq', 'staged.json');
             const unstagedPath = path.join(projectRoot, '.relq', 'unstaged.json');
             if (fs.existsSync(stagedPath))
@@ -95,6 +107,9 @@ export async function resetCommand(context) {
             const mergeStatePath = path.join(projectRoot, '.relq', 'MERGE_STATE');
             if (fs.existsSync(mergeStatePath))
                 fs.unlinkSync(mergeStatePath);
+            const fileHashPath = path.join(projectRoot, '.relq', 'file_hash');
+            if (fs.existsSync(fileHashPath))
+                fs.unlinkSync(fileHashPath);
         }
         spinner.succeed(`Reset to ${colors.yellow(shortHash(targetHash))}`);
         console.log('');

package/dist/esm/cli/index.js

@@ -56,6 +56,11 @@ function parseArgs(argv) {
     const args = [];
     const flags = {};
     let command = '';
+    const booleanFlags = new Set([
+        'hard', 'soft', 'force', 'yes', 'y', 'dry-run', 'verbose', 'quiet', 'q',
+        'help', 'h', 'version', 'v', 'all', 'a', 'cached', 'staged', 'no-verify',
+        'metadata-only', 'skip-prompt', 'interactive', 'i'
+    ]);
     for (let i = 2; i < argv.length; i++) {
         const arg = argv[i];
         if (arg.startsWith('--')) {
@@ -64,25 +69,36 @@ function parseArgs(argv) {
                 flags[arg.slice(2, eqIndex)] = arg.slice(eqIndex + 1);
             }
             else {
-                const nextArg = argv[i + 1];
-                if (nextArg && !nextArg.startsWith('-')) {
-                    flags[arg.slice(2)] = nextArg;
-                    i++;
+                const flagName = arg.slice(2);
+                if (booleanFlags.has(flagName)) {
+                    flags[flagName] = true;
                 }
                 else {
-                    flags[arg.slice(2)] = true;
+                    const nextArg = argv[i + 1];
+                    if (nextArg && !nextArg.startsWith('-')) {
+                        flags[flagName] = nextArg;
+                        i++;
+                    }
+                    else {
+                        flags[flagName] = true;
+                    }
                 }
             }
         }
         else if (arg.startsWith('-') && arg.length === 2) {
             const flag = arg.slice(1);
-            const nextArg = argv[i + 1];
-            if (nextArg && !nextArg.startsWith('-')) {
-                flags[flag] = nextArg;
-                i++;
+            if (booleanFlags.has(flag)) {
+                flags[flag] = true;
             }
             else {
-                flags[flag] = true;
+                const nextArg = argv[i + 1];
+                if (nextArg && !nextArg.startsWith('-')) {
+                    flags[flag] = nextArg;
+                    i++;
+                }
+                else {
+                    flags[flag] = true;
+                }
             }
         }
         else if (arg.startsWith('-') && arg.length > 2) {

package/dist/esm/cli/utils/change-tracker.js

@@ -517,14 +517,14 @@ export function sortChangesByDependency(changes) {
         'PARTITION': 11,
         'PARTITION_CHILD': 12,
         'COLUMN': 13,
-        'COLUMN_COMMENT': 12,
-        'INDEX': 13,
-        'INDEX_COMMENT': 13,
-        'CONSTRAINT': 14,
-        'PRIMARY_KEY': 14,
-        'FOREIGN_KEY': 15,
-        'CHECK': 14,
-        'EXCLUSION': 14,
+        'COLUMN_COMMENT': 14,
+        'INDEX': 15,
+        'INDEX_COMMENT': 16,
+        'CONSTRAINT': 17,
+        'PRIMARY_KEY': 17,
+        'FOREIGN_KEY': 18,
+        'CHECK': 17,
+        'EXCLUSION': 17,
         'VIEW': 20,
         'MATERIALIZED_VIEW': 21,
         'FUNCTION': 30,

package/dist/esm/cli/utils/commit-manager.js

@@ -26,6 +26,18 @@ export function getLocalCommits(baseDir = process.cwd()) {
         return [];
     }
 }
+function getLocalCommitByHash(hash, baseDir = process.cwd()) {
+    const commitPath = path.join(baseDir, '.relq', 'commits', `${hash}.json`);
+    if (!fs.existsSync(commitPath)) {
+        return null;
+    }
+    try {
+        return JSON.parse(fs.readFileSync(commitPath, 'utf-8'));
+    }
+    catch {
+        return null;
+    }
+}
 export function saveLocalCommits(commits, baseDir = process.cwd()) {
     ensureRelqDir(baseDir);
     const filePath = path.join(baseDir, RELQ_DIR, COMMITS_FILE);
@@ -212,7 +224,21 @@ export function generateASTHash(ast) {
 export function createCommitFromSchema(schema, author, message, commitLimit = 1000, baseDir = process.cwd()) {
     const parsedSchema = schemaToAST(schema);
     const hash = generateASTHash(parsedSchema);
-    const parentHash = getLocalHead(baseDir);
+    const currentHead = getLocalHead(baseDir);
+    let parentHash = currentHead;
+    if (currentHead) {
+        const headCommit = getLocalCommitByHash(currentHead, baseDir);
+        const isUnpushed = headCommit && (!headCommit.remotes?.pushed || headCommit.remotes.pushed.length === 0);
+        const isPullCommit = headCommit?.message?.startsWith('pull: sync from ');
+        if (isUnpushed && !isPullCommit) {
+            parentHash = headCommit?.parentHash || null;
+            const commitsDir = path.join(baseDir, '.relq', 'commits');
+            const oldCommitFile = path.join(commitsDir, `${currentHead}.json`);
+            if (fs.existsSync(oldCommitFile)) {
+                fs.unlinkSync(oldCommitFile);
+            }
+        }
+    }
     const commit = {
         hash,
         parentHash,

package/dist/esm/cli/utils/repo-manager.js

@@ -313,9 +313,21 @@ export function detectFileChanges(schemaPath, projectRoot = process.cwd()) {
     const currentContent = fs.readFileSync(schemaPath, 'utf-8');
     const currentHash = hashFileContent(currentContent);
     const savedHash = getSavedFileHash(projectRoot);
-    if (!savedHash || currentHash === savedHash) {
+    if (savedHash && currentHash === savedHash) {
         return null;
     }
+    if (!savedHash) {
+        return {
+            id: `file_${currentHash.substring(0, 8)}`,
+            type: 'ALTER',
+            objectType: 'SCHEMA_FILE',
+            objectName: path.basename(schemaPath),
+            before: null,
+            after: { hash: currentHash },
+            sql: '-- Schema file needs comparison (no previous hash)',
+            detectedAt: new Date().toISOString(),
+        };
+    }
     return {
         id: `file_${currentHash.substring(0, 8)}`,
         type: 'ALTER',

package/package.json

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