bun-query-builder 0.2.15 → 0.2.17

package/dist/actions/introspect-db.d.ts

@@ -13,6 +13,11 @@ export declare function generateModelSource(table: string, columns: Introspected
 export declare function introspectDatabase(opts?: { tables?: string[] }): Promise<IntrospectedModel[]>;
 /** Map a raw SQL column type back to a normalized model column type. */
 export declare function sqlTypeToNormalized(rawType: string, dialect: SupportedDialect, ctx?: { enumValues?: string[] }): NormalizedColumnType;
+/**
+ * Normalize a MySQL information_schema column without discarding physical
+ * details carried only by COLUMN_TYPE (for example TINYINT(1) and VARCHAR(n)).
+ */
+export declare function mysqlColumnType(dataType: unknown, columnType: unknown, enumValues?: string[]): NormalizedColumnType;
 /**
  * The plan type for one Postgres column, given what the catalogue knows.
  *

package/dist/bin/cli.js

@@ -17764,6 +17764,9 @@ function sqlTypeToNormalized(rawType, dialect, ctx) {
     return "enum";
   return "string";
 }
+function mysqlColumnType(dataType, columnType, enumValues) {
+  return sqlTypeToNormalized(String(columnType || dataType || ""), "mysql", { enumValues });
+}
 function asAction(raw2) {
   const v = String(raw2 ?? "").toLowerCase().trim();
   if (v === "cascade" || v === "restrict" || v === "set null")
@@ -17959,7 +17962,7 @@ async function buildMysqlTable(qb, table) {
     const hasDefault = rawDefault != null;
     return {
       name,
-      type: sqlTypeToNormalized(String(r.data_type ?? r.DATA_TYPE ?? columnType), "mysql", { enumValues }),
+      type: mysqlColumnType(r.data_type ?? r.DATA_TYPE, columnType, enumValues),
       isPrimaryKey,
       isUnique: uniqueColumns.has(name),
       isNullable: isPrimaryKey ? false : String(r.is_nullable ?? r.IS_NULLABLE).toUpperCase() === "YES",
@@ -28885,6 +28888,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 = {}) {
@@ -31548,7 +31565,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.15";
+var version2 = "0.2.17";
 
 // bin/cli.ts
 init_actions();

package/dist/src/index.js

@@ -17763,6 +17763,9 @@ function sqlTypeToNormalized(rawType, dialect, ctx) {
     return "enum";
   return "string";
 }
+function mysqlColumnType(dataType, columnType, enumValues) {
+  return sqlTypeToNormalized(String(columnType || dataType || ""), "mysql", { enumValues });
+}
 function asAction(raw2) {
   const v = String(raw2 ?? "").toLowerCase().trim();
   if (v === "cascade" || v === "restrict" || v === "set null")
@@ -17958,7 +17961,7 @@ async function buildMysqlTable(qb, table) {
     const hasDefault = rawDefault != null;
     return {
       name,
-      type: sqlTypeToNormalized(String(r.data_type ?? r.DATA_TYPE ?? columnType), "mysql", { enumValues }),
+      type: mysqlColumnType(r.data_type ?? r.DATA_TYPE, columnType, enumValues),
       isPrimaryKey,
       isUnique: uniqueColumns.has(name),
       isNullable: isPrimaryKey ? false : String(r.is_nullable ?? r.IS_NULLABLE).toUpperCase() === "YES",
@@ -28884,6 +28887,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 = {}) {

package/package.json

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