relq 1.0.90 → 1.0.91

package/dist/cjs/cli/commands/generate.cjs

@@ -156,21 +156,11 @@ exports.default = (0, citty_1.defineCommand)({
                 console.log('');
                 return;
             }
-            const s = filteredDiff.summary;
             console.log('');
             console.log(`${colors_1.colors.bold('Changes to include:')}`);
-            if (s.tablesAdded > 0)
-                console.log(`   ${colors_1.colors.green('+')} ${s.tablesAdded} table(s) to create`);
-            if (s.tablesRemoved > 0)
-                console.log(`   ${colors_1.colors.red('-')} ${s.tablesRemoved} table(s) to drop`);
-            if (s.tablesModified > 0)
-                console.log(`   ${colors_1.colors.yellow('~')} ${s.tablesModified} table(s) modified`);
-            if (s.columnsAdded > 0)
-                console.log(`   ${colors_1.colors.green('+')} ${s.columnsAdded} column(s) to add`);
-            if (s.columnsRemoved > 0)
-                console.log(`   ${colors_1.colors.red('-')} ${s.columnsRemoved} column(s) to drop`);
-            if (s.columnsModified > 0)
-                console.log(`   ${colors_1.colors.yellow('~')} ${s.columnsModified} column(s) modified`);
+            const changeSummaryLines = (0, schema_diff_1.formatCategorizedSummary)(filteredDiff);
+            for (const line of changeSummaryLines)
+                console.log(line);
             console.log('');
             if ((0, schema_diff_1.hasDestructiveChanges)(filteredDiff)) {
                 const tables = (0, schema_diff_1.getDestructiveTables)(filteredDiff);
@@ -205,7 +195,7 @@ exports.default = (0, citty_1.defineCommand)({
                 includeDown: !noDown,
                 includeComments: true,
             });
-            spin.stop('Migration generated');
+            spin.stop(`Migration generated — ${migration.upSQL.length} statement(s)`);
             let fileName;
             if (format === 'timestamp') {
                 fileName = (0, migration_generator_1.generateTimestampedName)(migrationName) + '.sql';

package/dist/cjs/cli/commands/migrate.cjs

@@ -153,9 +153,15 @@ exports.default = (0, citty_1.defineCommand)({
                         const executeQuery = tx
                             ? (sql, params) => tx.query(sql, params)
                             : (sql, params) => dbClient.query(sql, params);
-                        await executeQuery(up);
-                        const placeholder = await (0, migration_helpers_1.getParamPlaceholder)(dialect);
-                        await executeQuery(`INSERT INTO ${quote}${tableName}${quote} (name) VALUES (${placeholder})`, [file]);
+                        const statements = (0, migration_helpers_1.splitStatements)(up);
+                        for (const stmt of statements) {
+                            await executeQuery(stmt);
+                        }
+                        const p1 = await (0, migration_helpers_1.getParamPlaceholder)(dialect, 1);
+                        const p2 = await (0, migration_helpers_1.getParamPlaceholder)(dialect, 2);
+                        const p3 = await (0, migration_helpers_1.getParamPlaceholder)(dialect, 3);
+                        const p4 = await (0, migration_helpers_1.getParamPlaceholder)(dialect, 4);
+                        await executeQuery(`INSERT INTO ${quote}${tableName}${quote} (name, filename, hash, batch) VALUES (${p1}, ${p2}, ${p3}, ${p4})`, [file.replace(/\.sql$/, ''), file, file, applied + 1]);
                         if (tx)
                             await tx.commit();
                         spin.stop(`Applied ${file}`);

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

@@ -236,6 +236,12 @@ async function runPush(config, projectRoot, opts = {}) {
         });
         const upStatements = migration.upSQL;
         spin.stop(`Generated ${upStatements.length} statement(s)`);
+        const summaryLines = (0, schema_diff_1.formatCategorizedSummary)(filteredDiff);
+        if (summaryLines.length > 0) {
+            for (const line of summaryLines)
+                console.log(line);
+            console.log('');
+        }
         const dialect = (0, dialect_router_1.detectDialect)(config);
         if (dialect !== 'postgres' && upStatements.length > 0) {
             const upSQL = upStatements.join('\n');
@@ -277,6 +283,7 @@ async function runPush(config, projectRoot, opts = {}) {
         spin.start('Applying schema changes...');
         const execClient = await (0, database_client_1.createDatabaseClient)(config);
         let tx = null;
+        let statementsRun = 0;
         try {
             try {
                 tx = await execClient.beginTransaction();
@@ -288,7 +295,6 @@ async function runPush(config, projectRoot, opts = {}) {
             const executeQuery = tx
                 ? (sql) => tx.query(sql)
                 : (sql) => execClient.query(sql);
-            let statementsRun = 0;
             for (const stmt of upStatements) {
                 try {
                     await executeQuery(stmt);
@@ -303,7 +309,6 @@ async function runPush(config, projectRoot, opts = {}) {
             }
             if (tx)
                 await tx.commit();
-            spin.stop(`Applied ${statementsRun} statement(s)`);
             try {
                 const tableName = config.migrations?.tableName || '_relq_migrations';
                 const tableDDL = await (0, migration_helpers_1.getMigrationTableDDL)(config, tableName);
@@ -319,10 +324,11 @@ async function runPush(config, projectRoot, opts = {}) {
                 const hash = (0, migration_generator_1.generateTimestampedName)(migrationName);
                 await execClient.query(`INSERT INTO "${tableName}" (name, filename, hash, batch, sql_up, sql_down, source) ` +
                     `VALUES ($1, $2, $3, 0, $4, $5, 'push')`, [migrationName, '', hash, upSQL, downSQL]);
-                spin.stop(`Applied ${statementsRun} statement(s) — rollback saved`);
+                spin.stop(`Applied ${statementsRun} statement(s) — restore point saved`);
             }
             catch (recordError) {
-                (0, ui_1.warning)(`Schema applied but failed to save rollback point: ${recordError?.message || String(recordError)}`);
+                spin.stop(`Applied ${statementsRun} statement(s)`);
+                (0, ui_1.warning)(`Failed to save restore point: ${recordError?.message || String(recordError)}`);
             }
         }
         catch (error) {
@@ -340,7 +346,12 @@ async function runPush(config, projectRoot, opts = {}) {
             if (error.statementIndex) {
                 errorMsg += `${colors_1.colors.yellow('Statement #:')} ${error.statementIndex}\n`;
             }
-            errorMsg += `\n${colors_1.colors.muted('All changes rolled back.')}\n`;
+            if (tx) {
+                errorMsg += `\n${colors_1.colors.muted('All changes rolled back.')}\n`;
+            }
+            else {
+                errorMsg += `\n${colors_1.colors.yellow('Warning:')} ${statementsRun} statement(s) were already applied (no transaction support).\n`;
+            }
             spin.error('SQL execution failed');
             throw new Error(errorMsg);
         }

package/dist/cjs/cli/utils/migration-generator.cjs

@@ -336,6 +336,39 @@ function generateColumnModification(tableName, columnName, changes) {
                     downSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" DROP DEFAULT;`);
                 }
                 break;
+            case 'length': {
+                const newLen = change.to;
+                const oldLen = change.from;
+                const newFullType = newLen ? `VARCHAR(${newLen})` : 'VARCHAR';
+                const oldFullType = oldLen ? `VARCHAR(${oldLen})` : 'VARCHAR';
+                upSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" TYPE ${newFullType};`);
+                downSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" TYPE ${oldFullType};`);
+                break;
+            }
+            case 'unique': {
+                const constraintName = `${tableName}_${columnName}_key`;
+                if (change.to === true) {
+                    upSQL.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${constraintName}" UNIQUE ("${columnName}");`);
+                    downSQL.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${constraintName}";`);
+                }
+                else {
+                    upSQL.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${constraintName}";`);
+                    downSQL.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${constraintName}" UNIQUE ("${columnName}");`);
+                }
+                break;
+            }
+            case 'primaryKey': {
+                const pkName = `${tableName}_pkey`;
+                if (change.to === true) {
+                    upSQL.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${pkName}" PRIMARY KEY ("${columnName}");`);
+                    downSQL.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${pkName}";`);
+                }
+                else {
+                    upSQL.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${pkName}";`);
+                    downSQL.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${pkName}" PRIMARY KEY ("${columnName}");`);
+                }
+                break;
+            }
         }
     }
     return { upSQL, downSQL };
@@ -549,6 +582,41 @@ function generateColumnChange(tableName, col) {
                     }
                     break;
                 }
+                case 'length': {
+                    const colType = col.after?.dataType ?? col.before?.dataType ?? 'VARCHAR';
+                    const baseType = colType.toUpperCase().replace(/\(.*\)/, '');
+                    const newLen = change.to;
+                    const oldLen = change.from;
+                    const newFullType = newLen ? `${baseType}(${newLen})` : baseType;
+                    const oldFullType = oldLen ? `${baseType}(${oldLen})` : baseType;
+                    up.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${col.name}" TYPE ${newFullType};`);
+                    down.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${col.name}" TYPE ${oldFullType};`);
+                    break;
+                }
+                case 'unique': {
+                    const constraintName = `${tableName}_${col.name}_key`;
+                    if (change.to === true) {
+                        up.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${constraintName}" UNIQUE ("${col.name}");`);
+                        down.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${constraintName}";`);
+                    }
+                    else {
+                        up.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${constraintName}";`);
+                        down.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${constraintName}" UNIQUE ("${col.name}");`);
+                    }
+                    break;
+                }
+                case 'primaryKey': {
+                    const pkName = `${tableName}_pkey`;
+                    if (change.to === true) {
+                        up.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${pkName}" PRIMARY KEY ("${col.name}");`);
+                        down.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${pkName}";`);
+                    }
+                    else {
+                        up.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${pkName}";`);
+                        down.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${pkName}" PRIMARY KEY ("${col.name}");`);
+                    }
+                    break;
+                }
             }
         }
     }

package/dist/cjs/cli/utils/postgres/introspect.cjs

@@ -283,8 +283,13 @@ async function introspectPostgres(connection, options) {
                         continue;
                     const normalizedColName = rawColName.replace(/^"|"$/g, '').toLowerCase();
                     const col = columns.find(c => c.name.toLowerCase() === normalizedColName);
-                    if (col && con.constraint_type === 'PRIMARY KEY') {
-                        col.isPrimaryKey = true;
+                    if (col) {
+                        if (con.constraint_type === 'PRIMARY KEY') {
+                            col.isPrimaryKey = true;
+                        }
+                        if (con.constraint_type === 'UNIQUE' && constraintColumns.length === 1) {
+                            col.isUnique = true;
+                        }
                     }
                 }
             }

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.diffSchemas = diffSchemas;
 exports.formatDiff = formatDiff;
 exports.formatSummary = formatSummary;
+exports.formatCategorizedSummary = formatCategorizedSummary;
 exports.filterDiff = filterDiff;
 exports.hasDestructiveChanges = hasDestructiveChanges;
 exports.stripDestructiveChanges = stripDestructiveChanges;
@@ -266,12 +267,14 @@ function diffTables(local, remote) {
         if (remoteTable) {
             const columnDiffs = diffColumns(localTable.columns, remoteTable.columns);
             const indexDiffs = diffIndexes(localTable.indexes, remoteTable.indexes);
-            if (columnDiffs.length > 0 || indexDiffs.length > 0) {
+            const constraintDiffs = diffConstraints(localTable.constraints, remoteTable.constraints);
+            if (columnDiffs.length > 0 || indexDiffs.length > 0 || constraintDiffs.length > 0) {
                 diffs.push({
                     name,
                     type: 'modified',
                     columns: columnDiffs,
                     indexes: indexDiffs,
+                    constraints: constraintDiffs,
                 });
             }
         }
@@ -340,6 +343,37 @@ function diffIndexes(local, remote) {
     }
     return diffs;
 }
+function diffConstraints(local, remote) {
+    const diffs = [];
+    const sig = (c) => {
+        const def = (c.definition || '').replace(/"/g, '').replace(/\s+/g, ' ').trim().toLowerCase();
+        return `${c.type}:${def}`;
+    };
+    const localSigs = new Map();
+    const remoteSigs = new Map();
+    for (const c of local)
+        localSigs.set(sig(c), c);
+    for (const c of remote)
+        remoteSigs.set(sig(c), c);
+    const toConstraintInfo = (c) => ({
+        name: c.name,
+        type: (c.type || 'CHECK'),
+        columns: [],
+        definition: c.definition || '',
+        trackingId: c.trackingId,
+    });
+    for (const [s, c] of remoteSigs) {
+        if (!localSigs.has(s)) {
+            diffs.push({ name: c.name || c.definition || 'unnamed', type: 'added', after: toConstraintInfo(c) });
+        }
+    }
+    for (const [s, c] of localSigs) {
+        if (!remoteSigs.has(s)) {
+            diffs.push({ name: c.name || c.definition || 'unnamed', type: 'removed', before: toConstraintInfo(c) });
+        }
+    }
+    return diffs;
+}
 function diffExtensions(local, remote) {
     const diffs = [];
     const localSet = new Set(local);
@@ -426,6 +460,11 @@ function formatDiff(diff) {
                 colors_1.colors.red('  -');
             lines.push(`${idxIcon} index: ${idx.name}`);
         }
+        for (const con of table.constraints || []) {
+            const conIcon = con.type === 'added' ? colors_1.colors.green('  +') :
+                colors_1.colors.red('  -');
+            lines.push(`${conIcon} constraint: ${con.name}`);
+        }
     }
     for (const ext of diff.extensions) {
         const icon = ext.type === 'added' ? colors_1.colors.green('+') : colors_1.colors.red('-');
@@ -472,6 +511,105 @@ function formatSummary(diff) {
     }
     return parts.join(', ');
 }
+function formatCategorizedSummary(diff) {
+    let tablesAdded = 0, tablesRemoved = 0, tablesModified = 0;
+    let colsAdded = 0, colsRemoved = 0, colsModified = 0;
+    let idxAdded = 0, idxRemoved = 0;
+    let fkAdded = 0, fkRemoved = 0;
+    let uniqueAdded = 0, uniqueRemoved = 0;
+    let pkAdded = 0, pkRemoved = 0;
+    let checkAdded = 0, checkRemoved = 0;
+    let extAdded = 0, extRemoved = 0;
+    for (const table of diff.tables) {
+        if (table.type === 'added')
+            tablesAdded++;
+        else if (table.type === 'removed')
+            tablesRemoved++;
+        else if (table.type === 'modified')
+            tablesModified++;
+        for (const col of table.columns || []) {
+            if (col.type === 'added')
+                colsAdded++;
+            else if (col.type === 'removed')
+                colsRemoved++;
+            else if (col.type === 'modified')
+                colsModified++;
+        }
+        for (const idx of table.indexes || []) {
+            if (idx.type === 'added')
+                idxAdded++;
+            else if (idx.type === 'removed')
+                idxRemoved++;
+        }
+        for (const con of table.constraints || []) {
+            const name = (con.name || '').toLowerCase();
+            const isFk = name.includes('fkey') || name.includes('foreign');
+            const isUq = name.includes('unique') || name.includes('_key');
+            const isPk = name.includes('pkey') || name.includes('primary');
+            const before = con.before;
+            const after = con.after;
+            const conType = (before?.type || after?.type || '').toUpperCase();
+            if (conType === 'FOREIGN KEY' || isFk) {
+                if (con.type === 'added')
+                    fkAdded++;
+                else if (con.type === 'removed')
+                    fkRemoved++;
+            }
+            else if (conType === 'UNIQUE' || isUq) {
+                if (con.type === 'added')
+                    uniqueAdded++;
+                else if (con.type === 'removed')
+                    uniqueRemoved++;
+            }
+            else if (conType === 'PRIMARY KEY' || isPk) {
+                if (con.type === 'added')
+                    pkAdded++;
+                else if (con.type === 'removed')
+                    pkRemoved++;
+            }
+            else if (conType === 'CHECK') {
+                if (con.type === 'added')
+                    checkAdded++;
+                else if (con.type === 'removed')
+                    checkRemoved++;
+            }
+            else {
+                if (con.type === 'added')
+                    checkAdded++;
+                else if (con.type === 'removed')
+                    checkRemoved++;
+            }
+        }
+    }
+    for (const ext of diff.extensions) {
+        if (ext.type === 'added')
+            extAdded++;
+        else if (ext.type === 'removed')
+            extRemoved++;
+    }
+    const lines = [];
+    const fmt = (label, added, removed, modified = 0) => {
+        const parts = [];
+        if (added)
+            parts.push(colors_1.colors.green(`${added} added`));
+        if (modified)
+            parts.push(colors_1.colors.yellow(`${modified} modified`));
+        if (removed)
+            parts.push(colors_1.colors.red(`${removed} removed`));
+        if (parts.length > 0) {
+            lines.push(`   ${colors_1.colors.muted(label + ':')} ${parts.join(', ')}`);
+        }
+    };
+    fmt('tables', tablesAdded, tablesRemoved, tablesModified);
+    fmt('columns', colsAdded, colsRemoved, colsModified);
+    fmt('indexes', idxAdded, idxRemoved);
+    fmt('primary keys', pkAdded, pkRemoved);
+    fmt('unique constraints', uniqueAdded, uniqueRemoved);
+    fmt('foreign keys', fkAdded, fkRemoved);
+    fmt('check constraints', checkAdded, checkRemoved);
+    fmt('extensions', extAdded, extRemoved);
+    return lines;
+}
 function filterDiff(diff, ignorePatterns) {
     const patterns = ignorePatterns.map(p => {
         const regexStr = p.replace(/\*/g, '.*').replace(/\?/g, '.');

package/dist/cjs/cli/utils/schema-to-ast.cjs

@@ -405,6 +405,20 @@ function tableToAST(table) {
             return { name: p.$name, partitionBound };
         });
     }
+    for (const con of constraints) {
+        if (con.type === 'PRIMARY KEY' && con.columns.length > 0) {
+            for (const colName of con.columns) {
+                const col = columns.find(c => c.name === colName || c.tsName === colName);
+                if (col)
+                    col.isPrimaryKey = true;
+            }
+        }
+        if (con.type === 'UNIQUE' && con.columns.length === 1) {
+            const col = columns.find(c => c.name === con.columns[0] || c.tsName === con.columns[0]);
+            if (col)
+                col.isUnique = true;
+        }
+    }
     return {
         name: table.$name,
         schema: table.$schema || 'public',

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

@@ -11,7 +11,7 @@ import { getConnectionDescription } from "../utils/env-loader.js";
 import { isInitialized } from "../utils/repo-manager.js";
 import { validateSchemaFile, formatValidationErrors } from "../utils/schema-validator.js";
 import { loadSchemaFile } from "../utils/schema-loader.js";
-import { diffSchemas, filterDiff, hasDestructiveChanges, getDestructiveTables, stripDestructiveChanges } from "../utils/schema-diff.js";
+import { diffSchemas, filterDiff, hasDestructiveChanges, getDestructiveTables, stripDestructiveChanges, formatCategorizedSummary } from "../utils/schema-diff.js";
 import { normalizeSchema } from "../utils/schema-hash.js";
 import { generateMigrationFile, generateMigrationName, getNextMigrationNumber, generateTimestampedName } from "../utils/migration-generator.js";
 import { loadRelqignore } from "../utils/relqignore.js";
@@ -121,21 +121,11 @@ export default defineCommand({
                 console.log('');
                 return;
             }
-            const s = filteredDiff.summary;
             console.log('');
             console.log(`${colors.bold('Changes to include:')}`);
-            if (s.tablesAdded > 0)
-                console.log(`   ${colors.green('+')} ${s.tablesAdded} table(s) to create`);
-            if (s.tablesRemoved > 0)
-                console.log(`   ${colors.red('-')} ${s.tablesRemoved} table(s) to drop`);
-            if (s.tablesModified > 0)
-                console.log(`   ${colors.yellow('~')} ${s.tablesModified} table(s) modified`);
-            if (s.columnsAdded > 0)
-                console.log(`   ${colors.green('+')} ${s.columnsAdded} column(s) to add`);
-            if (s.columnsRemoved > 0)
-                console.log(`   ${colors.red('-')} ${s.columnsRemoved} column(s) to drop`);
-            if (s.columnsModified > 0)
-                console.log(`   ${colors.yellow('~')} ${s.columnsModified} column(s) modified`);
+            const changeSummaryLines = formatCategorizedSummary(filteredDiff);
+            for (const line of changeSummaryLines)
+                console.log(line);
             console.log('');
             if (hasDestructiveChanges(filteredDiff)) {
                 const tables = getDestructiveTables(filteredDiff);
@@ -170,7 +160,7 @@ export default defineCommand({
                 includeDown: !noDown,
                 includeComments: true,
             });
-            spin.stop('Migration generated');
+            spin.stop(`Migration generated — ${migration.upSQL.length} statement(s)`);
             let fileName;
             if (format === 'timestamp') {
                 fileName = generateTimestampedName(migrationName) + '.sql';

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

@@ -10,7 +10,7 @@ import { requireValidConfig } from "../utils/config-loader.js";
 import { getConnectionDescription } from "../utils/env-loader.js";
 import { createDatabaseClient } from "../utils/database-client.js";
 import { detectDialect } from "../utils/dialect-router.js";
-import { getQuoteChar, getParamPlaceholder, getMigrationTableDDL, parseMigration, } from "../utils/migration-helpers.js";
+import { getQuoteChar, getParamPlaceholder, getMigrationTableDDL, parseMigration, splitStatements, } from "../utils/migration-helpers.js";
 export default defineCommand({
     meta: { name: 'migrate', description: 'Apply pending migrations' },
     args: {
@@ -118,9 +118,15 @@ export default defineCommand({
                         const executeQuery = tx
                             ? (sql, params) => tx.query(sql, params)
                             : (sql, params) => dbClient.query(sql, params);
-                        await executeQuery(up);
-                        const placeholder = await getParamPlaceholder(dialect);
-                        await executeQuery(`INSERT INTO ${quote}${tableName}${quote} (name) VALUES (${placeholder})`, [file]);
+                        const statements = splitStatements(up);
+                        for (const stmt of statements) {
+                            await executeQuery(stmt);
+                        }
+                        const p1 = await getParamPlaceholder(dialect, 1);
+                        const p2 = await getParamPlaceholder(dialect, 2);
+                        const p3 = await getParamPlaceholder(dialect, 3);
+                        const p4 = await getParamPlaceholder(dialect, 4);
+                        await executeQuery(`INSERT INTO ${quote}${tableName}${quote} (name, filename, hash, batch) VALUES (${p1}, ${p2}, ${p3}, ${p4})`, [file.replace(/\.sql$/, ''), file, file, applied + 1]);
                         if (tx)
                             await tx.commit();
                         spin.stop(`Applied ${file}`);

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

@@ -17,7 +17,7 @@ import { loadRelqignore } from "../utils/relqignore.js";
 import { isInitialized } from "../utils/repo-manager.js";
 import { saveSnapshot } from "../utils/snapshot-manager.js";
 import { loadSchemaFile } from "../utils/schema-loader.js";
-import { diffSchemas, filterDiff, hasDestructiveChanges, getDestructiveTables, stripDestructiveChanges } from "../utils/schema-diff.js";
+import { diffSchemas, filterDiff, hasDestructiveChanges, getDestructiveTables, stripDestructiveChanges, formatCategorizedSummary } from "../utils/schema-diff.js";
 import { normalizeSchema } from "../utils/schema-hash.js";
 import { generateMigrationFile, generateMigrationName, generateTimestampedName } from "../utils/migration-generator.js";
 import { getMigrationTableDDL } from "../utils/migration-helpers.js";
@@ -200,6 +200,12 @@ export async function runPush(config, projectRoot, opts = {}) {
         });
         const upStatements = migration.upSQL;
         spin.stop(`Generated ${upStatements.length} statement(s)`);
+        const summaryLines = formatCategorizedSummary(filteredDiff);
+        if (summaryLines.length > 0) {
+            for (const line of summaryLines)
+                console.log(line);
+            console.log('');
+        }
         const dialect = detectDialect(config);
         if (dialect !== 'postgres' && upStatements.length > 0) {
             const upSQL = upStatements.join('\n');
@@ -241,6 +247,7 @@ export async function runPush(config, projectRoot, opts = {}) {
         spin.start('Applying schema changes...');
         const execClient = await createDatabaseClient(config);
         let tx = null;
+        let statementsRun = 0;
         try {
             try {
                 tx = await execClient.beginTransaction();
@@ -252,7 +259,6 @@ export async function runPush(config, projectRoot, opts = {}) {
             const executeQuery = tx
                 ? (sql) => tx.query(sql)
                 : (sql) => execClient.query(sql);
-            let statementsRun = 0;
             for (const stmt of upStatements) {
                 try {
                     await executeQuery(stmt);
@@ -267,7 +273,6 @@ export async function runPush(config, projectRoot, opts = {}) {
             }
             if (tx)
                 await tx.commit();
-            spin.stop(`Applied ${statementsRun} statement(s)`);
             try {
                 const tableName = config.migrations?.tableName || '_relq_migrations';
                 const tableDDL = await getMigrationTableDDL(config, tableName);
@@ -283,10 +288,11 @@ export async function runPush(config, projectRoot, opts = {}) {
                 const hash = generateTimestampedName(migrationName);
                 await execClient.query(`INSERT INTO "${tableName}" (name, filename, hash, batch, sql_up, sql_down, source) ` +
                     `VALUES ($1, $2, $3, 0, $4, $5, 'push')`, [migrationName, '', hash, upSQL, downSQL]);
-                spin.stop(`Applied ${statementsRun} statement(s) — rollback saved`);
+                spin.stop(`Applied ${statementsRun} statement(s) — restore point saved`);
             }
             catch (recordError) {
-                warning(`Schema applied but failed to save rollback point: ${recordError?.message || String(recordError)}`);
+                spin.stop(`Applied ${statementsRun} statement(s)`);
+                warning(`Failed to save restore point: ${recordError?.message || String(recordError)}`);
             }
         }
         catch (error) {
@@ -304,7 +310,12 @@ export async function runPush(config, projectRoot, opts = {}) {
             if (error.statementIndex) {
                 errorMsg += `${colors.yellow('Statement #:')} ${error.statementIndex}\n`;
             }
-            errorMsg += `\n${colors.muted('All changes rolled back.')}\n`;
+            if (tx) {
+                errorMsg += `\n${colors.muted('All changes rolled back.')}\n`;
+            }
+            else {
+                errorMsg += `\n${colors.yellow('Warning:')} ${statementsRun} statement(s) were already applied (no transaction support).\n`;
+            }
             spin.error('SQL execution failed');
             throw new Error(errorMsg);
         }

package/dist/esm/cli/utils/migration-generator.js

@@ -295,6 +295,39 @@ function generateColumnModification(tableName, columnName, changes) {
                     downSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" DROP DEFAULT;`);
                 }
                 break;
+            case 'length': {
+                const newLen = change.to;
+                const oldLen = change.from;
+                const newFullType = newLen ? `VARCHAR(${newLen})` : 'VARCHAR';
+                const oldFullType = oldLen ? `VARCHAR(${oldLen})` : 'VARCHAR';
+                upSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" TYPE ${newFullType};`);
+                downSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" TYPE ${oldFullType};`);
+                break;
+            }
+            case 'unique': {
+                const constraintName = `${tableName}_${columnName}_key`;
+                if (change.to === true) {
+                    upSQL.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${constraintName}" UNIQUE ("${columnName}");`);
+                    downSQL.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${constraintName}";`);
+                }
+                else {
+                    upSQL.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${constraintName}";`);
+                    downSQL.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${constraintName}" UNIQUE ("${columnName}");`);
+                }
+                break;
+            }
+            case 'primaryKey': {
+                const pkName = `${tableName}_pkey`;
+                if (change.to === true) {
+                    upSQL.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${pkName}" PRIMARY KEY ("${columnName}");`);
+                    downSQL.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${pkName}";`);
+                }
+                else {
+                    upSQL.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${pkName}";`);
+                    downSQL.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${pkName}" PRIMARY KEY ("${columnName}");`);
+                }
+                break;
+            }
         }
     }
     return { upSQL, downSQL };
@@ -508,6 +541,41 @@ function generateColumnChange(tableName, col) {
                     }
                     break;
                 }
+                case 'length': {
+                    const colType = col.after?.dataType ?? col.before?.dataType ?? 'VARCHAR';
+                    const baseType = colType.toUpperCase().replace(/\(.*\)/, '');
+                    const newLen = change.to;
+                    const oldLen = change.from;
+                    const newFullType = newLen ? `${baseType}(${newLen})` : baseType;
+                    const oldFullType = oldLen ? `${baseType}(${oldLen})` : baseType;
+                    up.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${col.name}" TYPE ${newFullType};`);
+                    down.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${col.name}" TYPE ${oldFullType};`);
+                    break;
+                }
+                case 'unique': {
+                    const constraintName = `${tableName}_${col.name}_key`;
+                    if (change.to === true) {
+                        up.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${constraintName}" UNIQUE ("${col.name}");`);
+                        down.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${constraintName}";`);
+                    }
+                    else {
+                        up.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${constraintName}";`);
+                        down.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${constraintName}" UNIQUE ("${col.name}");`);
+                    }
+                    break;
+                }
+                case 'primaryKey': {
+                    const pkName = `${tableName}_pkey`;
+                    if (change.to === true) {
+                        up.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${pkName}" PRIMARY KEY ("${col.name}");`);
+                        down.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${pkName}";`);
+                    }
+                    else {
+                        up.push(`ALTER TABLE "${tableName}" DROP CONSTRAINT IF EXISTS "${pkName}";`);
+                        down.push(`ALTER TABLE "${tableName}" ADD CONSTRAINT "${pkName}" PRIMARY KEY ("${col.name}");`);
+                    }
+                    break;
+                }
             }
         }
     }

package/dist/esm/cli/utils/postgres/introspect.js

@@ -247,8 +247,13 @@ export async function introspectPostgres(connection, options) {
                         continue;
                     const normalizedColName = rawColName.replace(/^"|"$/g, '').toLowerCase();
                     const col = columns.find(c => c.name.toLowerCase() === normalizedColName);
-                    if (col && con.constraint_type === 'PRIMARY KEY') {
-                        col.isPrimaryKey = true;
+                    if (col) {
+                        if (con.constraint_type === 'PRIMARY KEY') {
+                            col.isPrimaryKey = true;
+                        }
+                        if (con.constraint_type === 'UNIQUE' && constraintColumns.length === 1) {
+                            col.isUnique = true;
+                        }
                     }
                 }
             }

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

@@ -256,12 +256,14 @@ function diffTables(local, remote) {
         if (remoteTable) {
             const columnDiffs = diffColumns(localTable.columns, remoteTable.columns);
             const indexDiffs = diffIndexes(localTable.indexes, remoteTable.indexes);
-            if (columnDiffs.length > 0 || indexDiffs.length > 0) {
+            const constraintDiffs = diffConstraints(localTable.constraints, remoteTable.constraints);
+            if (columnDiffs.length > 0 || indexDiffs.length > 0 || constraintDiffs.length > 0) {
                 diffs.push({
                     name,
                     type: 'modified',
                     columns: columnDiffs,
                     indexes: indexDiffs,
+                    constraints: constraintDiffs,
                 });
             }
         }
@@ -330,6 +332,37 @@ function diffIndexes(local, remote) {
     }
     return diffs;
 }
+function diffConstraints(local, remote) {
+    const diffs = [];
+    const sig = (c) => {
+        const def = (c.definition || '').replace(/"/g, '').replace(/\s+/g, ' ').trim().toLowerCase();
+        return `${c.type}:${def}`;
+    };
+    const localSigs = new Map();
+    const remoteSigs = new Map();
+    for (const c of local)
+        localSigs.set(sig(c), c);
+    for (const c of remote)
+        remoteSigs.set(sig(c), c);
+    const toConstraintInfo = (c) => ({
+        name: c.name,
+        type: (c.type || 'CHECK'),
+        columns: [],
+        definition: c.definition || '',
+        trackingId: c.trackingId,
+    });
+    for (const [s, c] of remoteSigs) {
+        if (!localSigs.has(s)) {
+            diffs.push({ name: c.name || c.definition || 'unnamed', type: 'added', after: toConstraintInfo(c) });
+        }
+    }
+    for (const [s, c] of localSigs) {
+        if (!remoteSigs.has(s)) {
+            diffs.push({ name: c.name || c.definition || 'unnamed', type: 'removed', before: toConstraintInfo(c) });
+        }
+    }
+    return diffs;
+}
 function diffExtensions(local, remote) {
     const diffs = [];
     const localSet = new Set(local);
@@ -416,6 +449,11 @@ export function formatDiff(diff) {
                 colors.red('  -');
             lines.push(`${idxIcon} index: ${idx.name}`);
         }
+        for (const con of table.constraints || []) {
+            const conIcon = con.type === 'added' ? colors.green('  +') :
+                colors.red('  -');
+            lines.push(`${conIcon} constraint: ${con.name}`);
+        }
     }
     for (const ext of diff.extensions) {
         const icon = ext.type === 'added' ? colors.green('+') : colors.red('-');
@@ -462,6 +500,105 @@ export function formatSummary(diff) {
     }
     return parts.join(', ');
 }
+export function formatCategorizedSummary(diff) {
+    let tablesAdded = 0, tablesRemoved = 0, tablesModified = 0;
+    let colsAdded = 0, colsRemoved = 0, colsModified = 0;
+    let idxAdded = 0, idxRemoved = 0;
+    let fkAdded = 0, fkRemoved = 0;
+    let uniqueAdded = 0, uniqueRemoved = 0;
+    let pkAdded = 0, pkRemoved = 0;
+    let checkAdded = 0, checkRemoved = 0;
+    let extAdded = 0, extRemoved = 0;
+    for (const table of diff.tables) {
+        if (table.type === 'added')
+            tablesAdded++;
+        else if (table.type === 'removed')
+            tablesRemoved++;
+        else if (table.type === 'modified')
+            tablesModified++;
+        for (const col of table.columns || []) {
+            if (col.type === 'added')
+                colsAdded++;
+            else if (col.type === 'removed')
+                colsRemoved++;
+            else if (col.type === 'modified')
+                colsModified++;
+        }
+        for (const idx of table.indexes || []) {
+            if (idx.type === 'added')
+                idxAdded++;
+            else if (idx.type === 'removed')
+                idxRemoved++;
+        }
+        for (const con of table.constraints || []) {
+            const name = (con.name || '').toLowerCase();
+            const isFk = name.includes('fkey') || name.includes('foreign');
+            const isUq = name.includes('unique') || name.includes('_key');
+            const isPk = name.includes('pkey') || name.includes('primary');
+            const before = con.before;
+            const after = con.after;
+            const conType = (before?.type || after?.type || '').toUpperCase();
+            if (conType === 'FOREIGN KEY' || isFk) {
+                if (con.type === 'added')
+                    fkAdded++;
+                else if (con.type === 'removed')
+                    fkRemoved++;
+            }
+            else if (conType === 'UNIQUE' || isUq) {
+                if (con.type === 'added')
+                    uniqueAdded++;
+                else if (con.type === 'removed')
+                    uniqueRemoved++;
+            }
+            else if (conType === 'PRIMARY KEY' || isPk) {
+                if (con.type === 'added')
+                    pkAdded++;
+                else if (con.type === 'removed')
+                    pkRemoved++;
+            }
+            else if (conType === 'CHECK') {
+                if (con.type === 'added')
+                    checkAdded++;
+                else if (con.type === 'removed')
+                    checkRemoved++;
+            }
+            else {
+                if (con.type === 'added')
+                    checkAdded++;
+                else if (con.type === 'removed')
+                    checkRemoved++;
+            }
+        }
+    }
+    for (const ext of diff.extensions) {
+        if (ext.type === 'added')
+            extAdded++;
+        else if (ext.type === 'removed')
+            extRemoved++;
+    }
+    const lines = [];
+    const fmt = (label, added, removed, modified = 0) => {
+        const parts = [];
+        if (added)
+            parts.push(colors.green(`${added} added`));
+        if (modified)
+            parts.push(colors.yellow(`${modified} modified`));
+        if (removed)
+            parts.push(colors.red(`${removed} removed`));
+        if (parts.length > 0) {
+            lines.push(`   ${colors.muted(label + ':')} ${parts.join(', ')}`);
+        }
+    };
+    fmt('tables', tablesAdded, tablesRemoved, tablesModified);
+    fmt('columns', colsAdded, colsRemoved, colsModified);
+    fmt('indexes', idxAdded, idxRemoved);
+    fmt('primary keys', pkAdded, pkRemoved);
+    fmt('unique constraints', uniqueAdded, uniqueRemoved);
+    fmt('foreign keys', fkAdded, fkRemoved);
+    fmt('check constraints', checkAdded, checkRemoved);
+    fmt('extensions', extAdded, extRemoved);
+    return lines;
+}
 export function filterDiff(diff, ignorePatterns) {
     const patterns = ignorePatterns.map(p => {
         const regexStr = p.replace(/\*/g, '.*').replace(/\?/g, '.');

package/dist/esm/cli/utils/schema-to-ast.js

@@ -371,6 +371,20 @@ export function tableToAST(table) {
             return { name: p.$name, partitionBound };
         });
     }
+    for (const con of constraints) {
+        if (con.type === 'PRIMARY KEY' && con.columns.length > 0) {
+            for (const colName of con.columns) {
+                const col = columns.find(c => c.name === colName || c.tsName === colName);
+                if (col)
+                    col.isPrimaryKey = true;
+            }
+        }
+        if (con.type === 'UNIQUE' && con.columns.length === 1) {
+            const col = columns.find(c => c.name === con.columns[0] || c.tsName === con.columns[0]);
+            if (col)
+                col.isUnique = true;
+        }
+    }
     return {
         name: table.$name,
         schema: table.$schema || 'public',

package/package.json

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