relq 1.0.102 → 1.0.104

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

@@ -433,52 +433,58 @@ async function runPull(config, projectRoot, opts = {}) {
         }
         console.log('');
         if (schemaExists && localSnapshot && !force) {
+            const snapshotTables = Object.values(localSnapshot.tables || {});
             const localForCompare = {
-                extensions: localSnapshot.extensions?.map(e => e.name) || [],
+                extensions: Array.isArray(localSnapshot.extensions)
+                    ? localSnapshot.extensions
+                    : [],
                 enums: localSnapshot.enums || [],
-                domains: localSnapshot.domains?.map(d => ({
+                domains: (localSnapshot.domains || []).map((d) => ({
                     name: d.name,
                     baseType: d.baseType,
-                    isNotNull: d.notNull,
-                    defaultValue: d.default,
-                    checkExpression: d.check,
-                })) || [],
+                    isNotNull: d.isNotNull ?? d.notNull,
+                    defaultValue: d.defaultValue ?? d.default,
+                    checkExpression: d.checkExpression ?? d.check,
+                })),
                 compositeTypes: localSnapshot.compositeTypes || [],
                 sequences: localSnapshot.sequences || [],
-                tables: localSnapshot.tables.map(t => ({
+                tables: snapshotTables.map(t => ({
                     name: t.name,
                     schema: t.schema,
-                    columns: t.columns.map(c => ({
+                    columns: Object.values(t.columns || {}).map((c) => ({
                         name: c.name,
-                        dataType: c.type,
-                        isNullable: c.nullable,
-                        defaultValue: c.default,
-                        isPrimaryKey: c.primaryKey,
-                        isUnique: c.unique,
+                        dataType: c.dataType ?? c.type,
+                        isNullable: c.isNullable ?? c.nullable ?? false,
+                        defaultValue: c.defaultValue ?? c.default ?? null,
+                        isPrimaryKey: c.isPrimaryKey ?? c.primaryKey ?? false,
+                        isUnique: c.isUnique ?? c.unique ?? false,
+                        maxLength: c.maxLength ?? null,
+                        precision: c.precision ?? null,
+                        scale: c.scale ?? null,
                         comment: c.comment,
                     })),
-                    indexes: t.indexes.map(i => ({
+                    indexes: Object.values(t.indexes || {}).map((i) => ({
                         name: i.name,
                         columns: i.columns,
-                        isUnique: i.unique,
+                        isUnique: i.isUnique ?? i.unique ?? false,
                         type: i.type,
                         comment: i.comment,
                     })),
-                    constraints: t.constraints || [],
+                    constraints: Object.values(t.constraints || {}),
                     isPartitioned: t.isPartitioned,
                     partitionType: t.partitionType,
                     partitionKey: t.partitionKey,
                     comment: t.comment,
                 })),
                 functions: localSnapshot.functions || [],
-                triggers: (localSnapshot.triggers || []).map(t => ({
+                triggers: (localSnapshot.triggers || []).map((t) => ({
                     name: t.name,
-                    tableName: t.table,
-                    event: t.events?.[0] || 'UPDATE',
+                    tableName: t.tableName ?? t.table,
+                    event: t.event ?? t.events?.[0] ?? 'UPDATE',
                     timing: t.timing,
                     forEach: t.forEach || 'STATEMENT',
                     functionName: t.functionName,
-                    definition: '',
+                    definition: t.definition || '',
                     isEnabled: true,
                 })),
             };

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

@@ -480,7 +480,22 @@ async function runPush(config, projectRoot, opts = {}) {
             + comparison.removed.views.length + comparison.removed.functions.length
             + comparison.removed.triggers.length + comparison.removed.extensions.length;
         const ddlModified = comparison.modified.enums.length;
-        console.log(`   ${colors_1.colors.green(`${s.tablesAdded + s.columnsAdded + ddlAdded} added`)}, ${colors_1.colors.yellow(`${s.tablesModified + s.columnsModified + ddlModified} modified`)}, ${colors_1.colors.red(`${s.tablesRemoved + s.columnsRemoved + ddlRemoved} removed`)}`);
+        const totalAdded = s.tablesAdded + s.columnsAdded + s.indexesAdded + ddlAdded;
+        const totalModified = s.tablesModified + s.columnsModified + ddlModified;
+        const totalRemoved = s.tablesRemoved + s.columnsRemoved + s.indexesRemoved + ddlRemoved;
+        const parts = [];
+        if (totalAdded > 0 || totalModified > 0 || totalRemoved > 0) {
+            if (totalAdded > 0)
+                parts.push(colors_1.colors.green(`${totalAdded} added`));
+            if (totalModified > 0)
+                parts.push(colors_1.colors.yellow(`${totalModified} modified`));
+            if (totalRemoved > 0)
+                parts.push(colors_1.colors.red(`${totalRemoved} removed`));
+        }
+        else {
+            parts.push('no changes');
+        }
+        console.log(`   ${parts.join(', ')}`);
         console.log('');
     }
     catch (err) {

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

@@ -415,6 +415,25 @@ function generateColumnModification(tableName, columnName, changes) {
                 }
                 break;
             }
+            case 'precision':
+            case 'scale': {
+                if (change.field === 'precision') {
+                    const newPrec = change.to;
+                    const scaleChange = changes.find(c => c.field === 'scale');
+                    const newScale = scaleChange ? scaleChange.to : undefined;
+                    const oldPrec = change.from;
+                    const oldScale = scaleChange ? scaleChange.from : undefined;
+                    const newFullType = newPrec != null
+                        ? (newScale != null ? `NUMERIC(${newPrec}, ${newScale})` : `NUMERIC(${newPrec})`)
+                        : 'NUMERIC';
+                    const oldFullType = oldPrec != null
+                        ? (oldScale != null ? `NUMERIC(${oldPrec}, ${oldScale})` : `NUMERIC(${oldPrec})`)
+                        : 'NUMERIC';
+                    upSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" TYPE ${newFullType};`);
+                    downSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" TYPE ${oldFullType};`);
+                }
+                break;
+            }
         }
     }
     return { upSQL, downSQL };
@@ -484,7 +503,19 @@ function buildParsedConstraintDef(con) {
     }
 }
 function generateParsedColumnDef(col) {
-    const parts = [`"${col.name}"`, col.type];
+    let typeName = col.type;
+    if (col.typeParams?.length != null) {
+        typeName = `${typeName}(${col.typeParams.length})`;
+    }
+    else if (col.typeParams?.precision != null) {
+        typeName = col.typeParams.scale != null
+            ? `${typeName}(${col.typeParams.precision}, ${col.typeParams.scale})`
+            : `${typeName}(${col.typeParams.precision})`;
+    }
+    if (col.isArray) {
+        typeName = `${typeName}[]`;
+    }
+    const parts = [`"${col.name}"`, typeName];
     if (col.isPrimaryKey) {
         parts.push('PRIMARY KEY');
     }

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

@@ -1072,6 +1072,21 @@ function compareColumnProperties(oldCol, newCol) {
     if (oldCol.defaultValue !== newCol.defaultValue) {
         changes.push({ field: 'default', from: oldCol.defaultValue, to: newCol.defaultValue });
     }
+    const oldLength = oldCol.typeParams?.length;
+    const newLength = newCol.typeParams?.length;
+    if (oldLength !== newLength) {
+        changes.push({ field: 'length', from: oldLength, to: newLength });
+    }
+    const oldPrecision = oldCol.typeParams?.precision;
+    const newPrecision = newCol.typeParams?.precision;
+    if (oldPrecision !== newPrecision) {
+        changes.push({ field: 'precision', from: oldPrecision, to: newPrecision });
+    }
+    const oldScale = oldCol.typeParams?.scale;
+    const newScale = newCol.typeParams?.scale;
+    if (oldScale !== newScale) {
+        changes.push({ field: 'scale', from: oldScale, to: newScale });
+    }
     return changes;
 }
 function compareTableIndexes(oldTable, newTable, tableName, result) {

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

@@ -397,52 +397,58 @@ export async function runPull(config, projectRoot, opts = {}) {
         }
         console.log('');
         if (schemaExists && localSnapshot && !force) {
+            const snapshotTables = Object.values(localSnapshot.tables || {});
             const localForCompare = {
-                extensions: localSnapshot.extensions?.map(e => e.name) || [],
+                extensions: Array.isArray(localSnapshot.extensions)
+                    ? localSnapshot.extensions
+                    : [],
                 enums: localSnapshot.enums || [],
-                domains: localSnapshot.domains?.map(d => ({
+                domains: (localSnapshot.domains || []).map((d) => ({
                     name: d.name,
                     baseType: d.baseType,
-                    isNotNull: d.notNull,
-                    defaultValue: d.default,
-                    checkExpression: d.check,
-                })) || [],
+                    isNotNull: d.isNotNull ?? d.notNull,
+                    defaultValue: d.defaultValue ?? d.default,
+                    checkExpression: d.checkExpression ?? d.check,
+                })),
                 compositeTypes: localSnapshot.compositeTypes || [],
                 sequences: localSnapshot.sequences || [],
-                tables: localSnapshot.tables.map(t => ({
+                tables: snapshotTables.map(t => ({
                     name: t.name,
                     schema: t.schema,
-                    columns: t.columns.map(c => ({
+                    columns: Object.values(t.columns || {}).map((c) => ({
                         name: c.name,
-                        dataType: c.type,
-                        isNullable: c.nullable,
-                        defaultValue: c.default,
-                        isPrimaryKey: c.primaryKey,
-                        isUnique: c.unique,
+                        dataType: c.dataType ?? c.type,
+                        isNullable: c.isNullable ?? c.nullable ?? false,
+                        defaultValue: c.defaultValue ?? c.default ?? null,
+                        isPrimaryKey: c.isPrimaryKey ?? c.primaryKey ?? false,
+                        isUnique: c.isUnique ?? c.unique ?? false,
+                        maxLength: c.maxLength ?? null,
+                        precision: c.precision ?? null,
+                        scale: c.scale ?? null,
                         comment: c.comment,
                     })),
-                    indexes: t.indexes.map(i => ({
+                    indexes: Object.values(t.indexes || {}).map((i) => ({
                         name: i.name,
                         columns: i.columns,
-                        isUnique: i.unique,
+                        isUnique: i.isUnique ?? i.unique ?? false,
                         type: i.type,
                         comment: i.comment,
                     })),
-                    constraints: t.constraints || [],
+                    constraints: Object.values(t.constraints || {}),
                     isPartitioned: t.isPartitioned,
                     partitionType: t.partitionType,
                     partitionKey: t.partitionKey,
                     comment: t.comment,
                 })),
                 functions: localSnapshot.functions || [],
-                triggers: (localSnapshot.triggers || []).map(t => ({
+                triggers: (localSnapshot.triggers || []).map((t) => ({
                     name: t.name,
-                    tableName: t.table,
-                    event: t.events?.[0] || 'UPDATE',
+                    tableName: t.tableName ?? t.table,
+                    event: t.event ?? t.events?.[0] ?? 'UPDATE',
                     timing: t.timing,
                     forEach: t.forEach || 'STATEMENT',
                     functionName: t.functionName,
-                    definition: '',
+                    definition: t.definition || '',
                     isEnabled: true,
                 })),
             };

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

@@ -444,7 +444,22 @@ export async function runPush(config, projectRoot, opts = {}) {
             + comparison.removed.views.length + comparison.removed.functions.length
             + comparison.removed.triggers.length + comparison.removed.extensions.length;
         const ddlModified = comparison.modified.enums.length;
-        console.log(`   ${colors.green(`${s.tablesAdded + s.columnsAdded + ddlAdded} added`)}, ${colors.yellow(`${s.tablesModified + s.columnsModified + ddlModified} modified`)}, ${colors.red(`${s.tablesRemoved + s.columnsRemoved + ddlRemoved} removed`)}`);
+        const totalAdded = s.tablesAdded + s.columnsAdded + s.indexesAdded + ddlAdded;
+        const totalModified = s.tablesModified + s.columnsModified + ddlModified;
+        const totalRemoved = s.tablesRemoved + s.columnsRemoved + s.indexesRemoved + ddlRemoved;
+        const parts = [];
+        if (totalAdded > 0 || totalModified > 0 || totalRemoved > 0) {
+            if (totalAdded > 0)
+                parts.push(colors.green(`${totalAdded} added`));
+            if (totalModified > 0)
+                parts.push(colors.yellow(`${totalModified} modified`));
+            if (totalRemoved > 0)
+                parts.push(colors.red(`${totalRemoved} removed`));
+        }
+        else {
+            parts.push('no changes');
+        }
+        console.log(`   ${parts.join(', ')}`);
         console.log('');
     }
     catch (err) {

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

@@ -373,6 +373,25 @@ function generateColumnModification(tableName, columnName, changes) {
                 }
                 break;
             }
+            case 'precision':
+            case 'scale': {
+                if (change.field === 'precision') {
+                    const newPrec = change.to;
+                    const scaleChange = changes.find(c => c.field === 'scale');
+                    const newScale = scaleChange ? scaleChange.to : undefined;
+                    const oldPrec = change.from;
+                    const oldScale = scaleChange ? scaleChange.from : undefined;
+                    const newFullType = newPrec != null
+                        ? (newScale != null ? `NUMERIC(${newPrec}, ${newScale})` : `NUMERIC(${newPrec})`)
+                        : 'NUMERIC';
+                    const oldFullType = oldPrec != null
+                        ? (oldScale != null ? `NUMERIC(${oldPrec}, ${oldScale})` : `NUMERIC(${oldPrec})`)
+                        : 'NUMERIC';
+                    upSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" TYPE ${newFullType};`);
+                    downSQL.push(`ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" TYPE ${oldFullType};`);
+                }
+                break;
+            }
         }
     }
     return { upSQL, downSQL };
@@ -442,7 +461,19 @@ function buildParsedConstraintDef(con) {
     }
 }
 function generateParsedColumnDef(col) {
-    const parts = [`"${col.name}"`, col.type];
+    let typeName = col.type;
+    if (col.typeParams?.length != null) {
+        typeName = `${typeName}(${col.typeParams.length})`;
+    }
+    else if (col.typeParams?.precision != null) {
+        typeName = col.typeParams.scale != null
+            ? `${typeName}(${col.typeParams.precision}, ${col.typeParams.scale})`
+            : `${typeName}(${col.typeParams.precision})`;
+    }
+    if (col.isArray) {
+        typeName = `${typeName}[]`;
+    }
+    const parts = [`"${col.name}"`, typeName];
     if (col.isPrimaryKey) {
         parts.push('PRIMARY KEY');
     }

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

@@ -1061,6 +1061,21 @@ function compareColumnProperties(oldCol, newCol) {
     if (oldCol.defaultValue !== newCol.defaultValue) {
         changes.push({ field: 'default', from: oldCol.defaultValue, to: newCol.defaultValue });
     }
+    const oldLength = oldCol.typeParams?.length;
+    const newLength = newCol.typeParams?.length;
+    if (oldLength !== newLength) {
+        changes.push({ field: 'length', from: oldLength, to: newLength });
+    }
+    const oldPrecision = oldCol.typeParams?.precision;
+    const newPrecision = newCol.typeParams?.precision;
+    if (oldPrecision !== newPrecision) {
+        changes.push({ field: 'precision', from: oldPrecision, to: newPrecision });
+    }
+    const oldScale = oldCol.typeParams?.scale;
+    const newScale = newCol.typeParams?.scale;
+    if (oldScale !== newScale) {
+        changes.push({ field: 'scale', from: oldScale, to: newScale });
+    }
     return changes;
 }
 function compareTableIndexes(oldTable, newTable, tableName, result) {

package/package.json

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