bun-query-builder 0.2.48 → 0.2.50

package/dist/bin/cli.js

@@ -18658,12 +18658,39 @@ class MySQLDriver {
 ) DEFAULT CHARSET=utf8mb4;`;
   }
   static KEY_PREFIX_CHARACTERS = 255;
-  needsKeyPrefix(column) {
+  static MAX_KEY_BYTES = 3072;
+  static BYTES_PER_CHARACTER = 4;
+  keyPartWidth(column) {
     const rendered = this.getColumnType(column).toLowerCase();
     if (rendered.includes("text") || rendered.includes("blob") || rendered === "json")
-      return true;
-    const width = rendered.match(/^(?:var)?char\((\d+)\)$/)?.[1];
-    return width !== undefined && Number(width) >= 768;
+      return { bytes: Number.POSITIVE_INFINITY, indexableWhole: false };
+    const characters = rendered.match(/^(?:var)?char\((\d+)\)$/)?.[1];
+    if (characters !== undefined)
+      return { bytes: Number(characters) * MySQLDriver.BYTES_PER_CHARACTER, indexableWhole: true };
+    return { bytes: 8, indexableWhole: true };
+  }
+  keyParts(tableName, index, columns) {
+    const parts = index.columns.map((name) => {
+      const column = columns?.find((one) => one.name === name);
+      const width = column ? this.keyPartWidth(column) : { bytes: 0, indexableWhole: true };
+      const prefixed = !width.indexableWhole;
+      return {
+        name,
+        prefixed,
+        bytes: prefixed ? MySQLDriver.KEY_PREFIX_CHARACTERS * MySQLDriver.BYTES_PER_CHARACTER : width.bytes,
+        narrowable: !width.indexableWhole || width.bytes > MySQLDriver.KEY_PREFIX_CHARACTERS * MySQLDriver.BYTES_PER_CHARACTER
+      };
+    });
+    const total = () => parts.reduce((sum, part) => sum + part.bytes, 0);
+    while (total() > MySQLDriver.MAX_KEY_BYTES) {
+      const widest = parts.filter((part) => part.narrowable && !part.prefixed).sort((a, b) => b.bytes - a.bytes)[0];
+      if (!widest) {
+        throw new Error(`[migrations] Index '${index.name}' on table '${tableName}' needs ${total()} bytes of key, over MySQL's ${MySQLDriver.MAX_KEY_BYTES}. ` + `Every column in it is already at its ${MySQLDriver.KEY_PREFIX_CHARACTERS}-character prefix, so shorten a column or drop one from the index.`);
+      }
+      widest.prefixed = true;
+      widest.bytes = MySQLDriver.KEY_PREFIX_CHARACTERS * MySQLDriver.BYTES_PER_CHARACTER;
+    }
+    return parts.map((part) => part.prefixed ? `${this.quoteIdentifier(part.name)}(${MySQLDriver.KEY_PREFIX_CHARACTERS})` : this.quoteIdentifier(part.name));
   }
   createIndex(tableName, index, columns) {
     if (index.where) {
@@ -18671,11 +18698,7 @@ class MySQLDriver {
     }
     const kind = index.type === "unique" ? "UNIQUE " : "";
     const idxName = qualifiedIndexName(tableName, index.name);
-    const keyParts = index.columns.map((name) => {
-      const column = columns?.find((one) => one.name === name);
-      const quoted = this.quoteIdentifier(name);
-      return column && this.needsKeyPrefix(column) ? `${quoted}(${MySQLDriver.KEY_PREFIX_CHARACTERS})` : quoted;
-    }).join(", ");
+    const keyParts = this.keyParts(tableName, index, columns).join(", ");
     return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${keyParts});`;
   }
   addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
@@ -30394,6 +30417,8 @@ function satisfies(declared, actual, dialect) {
     if ((declared === "date" || declared === "json") && actual === "text")
       return true;
   }
+  if (isMysqlLike(dialect) && declared === "boolean" && actual === "integer")
+    return true;
   if (declared === "varchar" && actual === "text")
     return true;
   if (declared === "integer" && actual === "fractional")
@@ -32570,7 +32595,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.48";
+var version2 = "0.2.50";
 
 // bin/cli.ts
 init_actions();

package/dist/drivers/mysql.d.ts

@@ -28,7 +28,10 @@ export declare class MySQLDriver implements DialectDriver {
   protected foreignKeyClauses(table: TablePlan): string[];
   createTable(table: TablePlan): string;
   protected static readonly KEY_PREFIX_CHARACTERS: 255;
-  protected needsKeyPrefix(column: ColumnPlan): boolean;
+  protected static readonly MAX_KEY_BYTES: 3072;
+  protected static readonly BYTES_PER_CHARACTER: 4;
+  protected keyPartWidth(column: ColumnPlan): { bytes: number, indexableWhole: boolean };
+  protected keyParts(tableName: string, index: IndexPlan, columns?: readonly ColumnPlan[]): string[];
   createIndex(tableName: string, index: IndexPlan, columns?: readonly ColumnPlan[]): string;
   addForeignKey(tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string, existingConstraintNames?: string[]): string;
   addColumn(tableName: string, column: ColumnPlan): string;

package/dist/src/index.js

@@ -18657,12 +18657,39 @@ class MySQLDriver {
 ) DEFAULT CHARSET=utf8mb4;`;
   }
   static KEY_PREFIX_CHARACTERS = 255;
-  needsKeyPrefix(column) {
+  static MAX_KEY_BYTES = 3072;
+  static BYTES_PER_CHARACTER = 4;
+  keyPartWidth(column) {
     const rendered = this.getColumnType(column).toLowerCase();
     if (rendered.includes("text") || rendered.includes("blob") || rendered === "json")
-      return true;
-    const width = rendered.match(/^(?:var)?char\((\d+)\)$/)?.[1];
-    return width !== undefined && Number(width) >= 768;
+      return { bytes: Number.POSITIVE_INFINITY, indexableWhole: false };
+    const characters = rendered.match(/^(?:var)?char\((\d+)\)$/)?.[1];
+    if (characters !== undefined)
+      return { bytes: Number(characters) * MySQLDriver.BYTES_PER_CHARACTER, indexableWhole: true };
+    return { bytes: 8, indexableWhole: true };
+  }
+  keyParts(tableName, index, columns) {
+    const parts = index.columns.map((name) => {
+      const column = columns?.find((one) => one.name === name);
+      const width = column ? this.keyPartWidth(column) : { bytes: 0, indexableWhole: true };
+      const prefixed = !width.indexableWhole;
+      return {
+        name,
+        prefixed,
+        bytes: prefixed ? MySQLDriver.KEY_PREFIX_CHARACTERS * MySQLDriver.BYTES_PER_CHARACTER : width.bytes,
+        narrowable: !width.indexableWhole || width.bytes > MySQLDriver.KEY_PREFIX_CHARACTERS * MySQLDriver.BYTES_PER_CHARACTER
+      };
+    });
+    const total = () => parts.reduce((sum, part) => sum + part.bytes, 0);
+    while (total() > MySQLDriver.MAX_KEY_BYTES) {
+      const widest = parts.filter((part) => part.narrowable && !part.prefixed).sort((a, b) => b.bytes - a.bytes)[0];
+      if (!widest) {
+        throw new Error(`[migrations] Index '${index.name}' on table '${tableName}' needs ${total()} bytes of key, over MySQL's ${MySQLDriver.MAX_KEY_BYTES}. ` + `Every column in it is already at its ${MySQLDriver.KEY_PREFIX_CHARACTERS}-character prefix, so shorten a column or drop one from the index.`);
+      }
+      widest.prefixed = true;
+      widest.bytes = MySQLDriver.KEY_PREFIX_CHARACTERS * MySQLDriver.BYTES_PER_CHARACTER;
+    }
+    return parts.map((part) => part.prefixed ? `${this.quoteIdentifier(part.name)}(${MySQLDriver.KEY_PREFIX_CHARACTERS})` : this.quoteIdentifier(part.name));
   }
   createIndex(tableName, index, columns) {
     if (index.where) {
@@ -18670,11 +18697,7 @@ class MySQLDriver {
     }
     const kind = index.type === "unique" ? "UNIQUE " : "";
     const idxName = qualifiedIndexName(tableName, index.name);
-    const keyParts = index.columns.map((name) => {
-      const column = columns?.find((one) => one.name === name);
-      const quoted = this.quoteIdentifier(name);
-      return column && this.needsKeyPrefix(column) ? `${quoted}(${MySQLDriver.KEY_PREFIX_CHARACTERS})` : quoted;
-    }).join(", ");
+    const keyParts = this.keyParts(tableName, index, columns).join(", ");
     return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${keyParts});`;
   }
   addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
@@ -30393,6 +30416,8 @@ function satisfies(declared, actual, dialect) {
     if ((declared === "date" || declared === "json") && actual === "text")
       return true;
   }
+  if (isMysqlLike(dialect) && declared === "boolean" && actual === "integer")
+    return true;
   if (declared === "varchar" && actual === "text")
     return true;
   if (declared === "integer" && actual === "fractional")

package/package.json

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