bun-query-builder 0.2.14 → 0.2.16

package/dist/bin/cli.js

@@ -28885,6 +28885,20 @@ function buildMigrationPlan2(models, options) {
       ensureTable({ table: pivotTable, columns: cols, indexes: idx });
     }
   }
+  const tablesByName = new Map(tables.map((table) => [table.table, table]));
+  for (const table of tables) {
+    for (const column of table.columns) {
+      if (!column.references)
+        continue;
+      const referenced = tablesByName.get(column.references.table)?.columns.find((candidate) => candidate.name === column.references.column);
+      if (!referenced || column.type === referenced.type)
+        continue;
+      column.type = referenced.type;
+      column.maxLength = referenced.maxLength;
+      column.enumValues = referenced.enumValues;
+      column.enumTypeName = referenced.enumTypeName;
+    }
+  }
   return { dialect: options.dialect, vitessSharded: options.vitessSharded, tables };
 }
 function generateSql(plan, opts = {}) {
@@ -29296,14 +29310,20 @@ function generateDiffOperations(previous, next, opts = {}) {
       removedCols = detected.removed;
       addedCols = detected.added;
     }
-    if (preserveUnknownColumns && removedCols.length > 0) {
+    if (preserveUnknownColumns) {
       const preserved = removedCols.map((name) => prevCols[name]);
-      const preservedNames = new Set(removedCols);
-      const keptIndexes = prev.indexes.filter((idx) => idx.columns.some((c2) => preservedNames.has(c2)) && !currIdx[indexKey(idx, prev.table)]);
-      info2(`-- Keeping ${preserved.length} column(s) on "${curr.table}" no model declares: ${removedCols.join(", ")} \u2014 reconciled from the database, where an undeclared column is out of scope rather than removed`);
-      curr = { ...curr, columns: [...curr.columns, ...preserved], indexes: [...curr.indexes, ...keptIndexes] };
-      currCols = mapColumnsByName(curr.columns);
-      currIdx = mapIndexesByKey(curr.indexes, curr.table);
+      const keptIndexes = prev.indexes.filter((idx) => !currIdx[indexKey(idx, prev.table)]);
+      if (preserved.length > 0 || keptIndexes.length > 0) {
+        if (preserved.length > 0) {
+          info2(`-- Keeping ${preserved.length} column(s) on "${curr.table}" no model declares: ${removedCols.join(", ")} \u2014 reconciled from the database, where an undeclared column is out of scope rather than removed`);
+        }
+        if (keptIndexes.length > 0) {
+          info2(`-- Keeping ${keptIndexes.length} index(es) on "${curr.table}" no model declares: ${keptIndexes.map((index) => index.name).join(", ")} \u2014 reconciled from the database, where an undeclared index is out of scope rather than removed`);
+        }
+        curr = { ...curr, columns: [...curr.columns, ...preserved], indexes: [...curr.indexes, ...keptIndexes] };
+        currCols = mapColumnsByName(curr.columns);
+        currIdx = mapIndexesByKey(curr.indexes, curr.table);
+      }
       removedCols = [];
     }
     const modifiedCols = Object.keys(currCols).filter((n2) => prevCols[n2] && columnsAreDifferent(prevCols[n2], currCols[n2], dialect));
@@ -31542,7 +31562,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.14";
+var version2 = "0.2.16";
 
 // bin/cli.ts
 init_actions();

package/dist/src/index.js

@@ -28884,6 +28884,20 @@ function buildMigrationPlan2(models, options) {
       ensureTable({ table: pivotTable, columns: cols, indexes: idx });
     }
   }
+  const tablesByName = new Map(tables.map((table) => [table.table, table]));
+  for (const table of tables) {
+    for (const column of table.columns) {
+      if (!column.references)
+        continue;
+      const referenced = tablesByName.get(column.references.table)?.columns.find((candidate) => candidate.name === column.references.column);
+      if (!referenced || column.type === referenced.type)
+        continue;
+      column.type = referenced.type;
+      column.maxLength = referenced.maxLength;
+      column.enumValues = referenced.enumValues;
+      column.enumTypeName = referenced.enumTypeName;
+    }
+  }
   return { dialect: options.dialect, vitessSharded: options.vitessSharded, tables };
 }
 function generateSql(plan, opts = {}) {
@@ -29295,14 +29309,20 @@ function generateDiffOperations(previous, next, opts = {}) {
       removedCols = detected.removed;
       addedCols = detected.added;
     }
-    if (preserveUnknownColumns && removedCols.length > 0) {
+    if (preserveUnknownColumns) {
       const preserved = removedCols.map((name) => prevCols[name]);
-      const preservedNames = new Set(removedCols);
-      const keptIndexes = prev.indexes.filter((idx) => idx.columns.some((c2) => preservedNames.has(c2)) && !currIdx[indexKey(idx, prev.table)]);
-      info2(`-- Keeping ${preserved.length} column(s) on "${curr.table}" no model declares: ${removedCols.join(", ")} \u2014 reconciled from the database, where an undeclared column is out of scope rather than removed`);
-      curr = { ...curr, columns: [...curr.columns, ...preserved], indexes: [...curr.indexes, ...keptIndexes] };
-      currCols = mapColumnsByName(curr.columns);
-      currIdx = mapIndexesByKey(curr.indexes, curr.table);
+      const keptIndexes = prev.indexes.filter((idx) => !currIdx[indexKey(idx, prev.table)]);
+      if (preserved.length > 0 || keptIndexes.length > 0) {
+        if (preserved.length > 0) {
+          info2(`-- Keeping ${preserved.length} column(s) on "${curr.table}" no model declares: ${removedCols.join(", ")} \u2014 reconciled from the database, where an undeclared column is out of scope rather than removed`);
+        }
+        if (keptIndexes.length > 0) {
+          info2(`-- Keeping ${keptIndexes.length} index(es) on "${curr.table}" no model declares: ${keptIndexes.map((index) => index.name).join(", ")} \u2014 reconciled from the database, where an undeclared index is out of scope rather than removed`);
+        }
+        curr = { ...curr, columns: [...curr.columns, ...preserved], indexes: [...curr.indexes, ...keptIndexes] };
+        currCols = mapColumnsByName(curr.columns);
+        currIdx = mapIndexesByKey(curr.indexes, curr.table);
+      }
       removedCols = [];
     }
     const modifiedCols = Object.keys(currCols).filter((n2) => prevCols[n2] && columnsAreDifferent(prevCols[n2], currCols[n2], dialect));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",