bun-query-builder 0.2.46 → 0.2.48

package/dist/bin/cli.js

@@ -15600,6 +15600,10 @@ function createQueryBuilder(state) {
             const newBase = fromIdx !== -1 ? `${baseText2.slice(0, fromIdx)}, ${frag}${baseText2.slice(fromIdx)}` : `${baseText2}, ${frag}`;
             return makeSub(newBase, terms, params, tail);
           },
+          $call(callback) {
+            const next = callback(this);
+            return next ?? this;
+          },
           where(expr, op, value) {
             return withTerm("AND", expr, op, value);
           },
@@ -18631,21 +18635,48 @@ class MySQLDriver {
   createEnumType(_enumTypeName, _values) {
     return "";
   }
+  foreignKeyClauses(table) {
+    return table.columns.filter((column) => column.references).map((column) => {
+      const reference = column.references;
+      const name = `${table.table}_${column.name}_fk`;
+      let clause = `CONSTRAINT ${this.quoteIdentifier(name)} FOREIGN KEY (${this.quoteIdentifier(column.name)}) REFERENCES ${this.quoteIdentifier(reference.table)}(${this.quoteIdentifier(reference.column)})`;
+      if (reference.onDelete)
+        clause += ` ON DELETE ${reference.onDelete.toUpperCase()}`;
+      if (reference.onUpdate)
+        clause += ` ON UPDATE ${reference.onUpdate.toUpperCase()}`;
+      return clause;
+    });
+  }
   createTable(table) {
-    const columns = table.columns.map((c) => this.renderColumn(c)).join(`,
-  `);
+    const parts = [
+      ...table.columns.map((c) => this.renderColumn(c)),
+      ...this.foreignKeyClauses(table)
+    ];
     return `CREATE TABLE IF NOT EXISTS ${this.quoteIdentifier(table.table)} (
-  ${columns}
-);`;
+  ${parts.join(`,
+  `)}
+) DEFAULT CHARSET=utf8mb4;`;
+  }
+  static KEY_PREFIX_CHARACTERS = 255;
+  needsKeyPrefix(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;
   }
-  createIndex(tableName, index) {
+  createIndex(tableName, index, columns) {
     if (index.where) {
       throw new Error(`[migrations] Partial indexes (CompositeIndex.where) are not supported on MySQL. Index '${index.name}' on table '${tableName}' uses WHERE clause: ${index.where}`);
     }
     const kind = index.type === "unique" ? "UNIQUE " : "";
     const idxName = qualifiedIndexName(tableName, index.name);
-    const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
-    return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns});`;
+    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(", ");
+    return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${keyParts});`;
   }
   addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
     const fkName = `${tableName}_${columnName}_fk`;
@@ -18757,14 +18788,6 @@ ${sql};` : `${sql};`;
     if (defaultValue) {
       parts.push(defaultValue);
     }
-    if (column.references) {
-      let reference = `REFERENCES ${this.quoteIdentifier(column.references.table)}(${this.quoteIdentifier(column.references.column)})`;
-      if (column.references.onDelete)
-        reference += ` ON DELETE ${column.references.onDelete.toUpperCase()}`;
-      if (column.references.onUpdate)
-        reference += ` ON UPDATE ${column.references.onUpdate.toUpperCase()}`;
-      parts.push(reference);
-    }
     return parts.join(" ");
   }
 }
@@ -19024,11 +19047,11 @@ var init_singlestore = __esm(() => {
     addForeignKey() {
       return "";
     }
-    createIndex(tableName, index) {
+    createIndex(tableName, index, columns) {
       if (index.where) {
         throw new Error(`[migrations] Partial indexes (CompositeIndex.where) are not supported on SingleStore. Index '${index.name}' on table '${tableName}' uses WHERE clause: ${index.where}`);
       }
-      return super.createIndex(tableName, index);
+      return super.createIndex(tableName, index, columns);
     }
   };
 });
@@ -19052,6 +19075,9 @@ var init_vitess = __esm(() => {
       const { references: _references, ...withoutReference } = column;
       return super.renderColumn(withoutReference);
     }
+    foreignKeyClauses(table) {
+      return this.sharded ? [] : super.foreignKeyClauses(table);
+    }
     createTable(table) {
       return super.createTable(table);
     }
@@ -29714,7 +29740,7 @@ function generateSql(plan, opts = {}) {
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes)
-      tableStatements.push(driver.createIndex(t2.table, idx));
+      tableStatements.push(driver.createIndex(t2.table, idx, t2.columns));
     if (tableIndex === tables.length - 1) {
       for (const deferredTable of tables) {
         for (const column of deferredTable.columns) {
@@ -30049,7 +30075,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes) {
-      const createIndexStatement = driver.createIndex(t2.table, idx);
+      const createIndexStatement = driver.createIndex(t2.table, idx, t2.columns);
       tableStatements.push(createIndexStatement);
       operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
     }
@@ -30253,7 +30279,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     for (const key of Object.keys(currIdx)) {
       if (!prevIdx[key]) {
         const idx = currIdx[key];
-        const createIndexStatement = driver.createIndex(curr.table, idx);
+        const createIndexStatement = driver.createIndex(curr.table, idx, curr.columns);
         tableChanges.push(createIndexStatement);
         chunks.push(createIndexStatement);
         operations.push({ kind: "create_index", table: curr.table, column: idx.name, destructive: false, sql: createIndexStatement });
@@ -32544,7 +32570,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.46";
+var version2 = "0.2.48";
 
 // bin/cli.ts
 init_actions();

package/dist/drivers/mysql.d.ts

@@ -3,7 +3,7 @@ import type { DateBucketGrain } from './postgres';
 export declare interface DialectDriver {
   createEnumType: (enumTypeName: string, values: string[]) => string
   createTable: (table: TablePlan) => string
-  createIndex: (tableName: string, index: IndexPlan) => 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
   modifyColumn: (tableName: string, column: ColumnPlan) => string
@@ -25,8 +25,11 @@ export declare class MySQLDriver implements DialectDriver {
   protected getAutoIncrementClause(column: ColumnPlan): string;
   protected getDefaultValue(column: ColumnPlan): string;
   createEnumType(_enumTypeName: string, _values: string[]): string;
+  protected foreignKeyClauses(table: TablePlan): string[];
   createTable(table: TablePlan): string;
-  createIndex(tableName: string, index: IndexPlan): string;
+  protected static readonly KEY_PREFIX_CHARACTERS: 255;
+  protected needsKeyPrefix(column: ColumnPlan): boolean;
+  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;
   modifyColumn(tableName: string, column: ColumnPlan): string;

package/dist/drivers/postgres.d.ts

@@ -9,7 +9,7 @@ export declare const DATE_BUCKET_FORMAT: 'YYYY-MM-DDTHH:MM:SS.000Z';
 export declare interface DialectDriver {
   createEnumType: (enumTypeName: string, values: string[]) => string
   createTable: (table: TablePlan) => string
-  createIndex: (tableName: string, index: IndexPlan) => 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
   modifyColumn: (tableName: string, column: ColumnPlan) => string

package/dist/drivers/singlestore.d.ts

@@ -1,5 +1,5 @@
 import { MySQLDriver } from './mysql';
-import type { IndexPlan, TablePlan } from '../migrations';
+import type { ColumnPlan, IndexPlan, TablePlan } from '../migrations';
 /**
  * SingleStore DDL driver.
  *
@@ -24,5 +24,5 @@ import type { IndexPlan, TablePlan } from '../migrations';
 export declare class SingleStoreDriver extends MySQLDriver {
   createTable(table: TablePlan): string;
   addForeignKey(): string;
-  createIndex(tableName: string, index: IndexPlan): string;
+  createIndex(tableName: string, index: IndexPlan, columns?: readonly ColumnPlan[]): string;
 }

package/dist/drivers/sqlite.d.ts

@@ -4,7 +4,7 @@ import type { DateBucketGrain } from './postgres';
 export declare interface DialectDriver {
   createEnumType: (enumTypeName: string, values: string[]) => string
   createTable: (table: TablePlan) => string
-  createIndex: (tableName: string, index: IndexPlan) => string
+  createIndex: (tableName: string, index: IndexPlan, columns?: readonly ColumnPlan[]) => string
   addForeignKey: (tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string) => string
   addColumn: (tableName: string, column: ColumnPlan) => string
   modifyColumn: (tableName: string, column: ColumnPlan) => string

package/dist/drivers/vitess.d.ts

@@ -35,6 +35,7 @@ export declare class VitessDriver extends MySQLDriver {
   constructor(sharded?: boolean);
   protected getAutoIncrementClause(column: ColumnPlan): string;
   protected renderColumn(column: ColumnPlan): string;
+  protected foreignKeyClauses(table: TablePlan): string[];
   createTable(table: TablePlan): string;
   addForeignKey(...args: Parameters<MySQLDriver['addForeignKey']>): string;
   createMigrationsTable(): string;

package/dist/src/index.js

@@ -15599,6 +15599,10 @@ function createQueryBuilder(state) {
             const newBase = fromIdx !== -1 ? `${baseText2.slice(0, fromIdx)}, ${frag}${baseText2.slice(fromIdx)}` : `${baseText2}, ${frag}`;
             return makeSub(newBase, terms, params, tail);
           },
+          $call(callback) {
+            const next = callback(this);
+            return next ?? this;
+          },
           where(expr, op, value) {
             return withTerm("AND", expr, op, value);
           },
@@ -18630,21 +18634,48 @@ class MySQLDriver {
   createEnumType(_enumTypeName, _values) {
     return "";
   }
+  foreignKeyClauses(table) {
+    return table.columns.filter((column) => column.references).map((column) => {
+      const reference = column.references;
+      const name = `${table.table}_${column.name}_fk`;
+      let clause = `CONSTRAINT ${this.quoteIdentifier(name)} FOREIGN KEY (${this.quoteIdentifier(column.name)}) REFERENCES ${this.quoteIdentifier(reference.table)}(${this.quoteIdentifier(reference.column)})`;
+      if (reference.onDelete)
+        clause += ` ON DELETE ${reference.onDelete.toUpperCase()}`;
+      if (reference.onUpdate)
+        clause += ` ON UPDATE ${reference.onUpdate.toUpperCase()}`;
+      return clause;
+    });
+  }
   createTable(table) {
-    const columns = table.columns.map((c) => this.renderColumn(c)).join(`,
-  `);
+    const parts = [
+      ...table.columns.map((c) => this.renderColumn(c)),
+      ...this.foreignKeyClauses(table)
+    ];
     return `CREATE TABLE IF NOT EXISTS ${this.quoteIdentifier(table.table)} (
-  ${columns}
-);`;
+  ${parts.join(`,
+  `)}
+) DEFAULT CHARSET=utf8mb4;`;
+  }
+  static KEY_PREFIX_CHARACTERS = 255;
+  needsKeyPrefix(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;
   }
-  createIndex(tableName, index) {
+  createIndex(tableName, index, columns) {
     if (index.where) {
       throw new Error(`[migrations] Partial indexes (CompositeIndex.where) are not supported on MySQL. Index '${index.name}' on table '${tableName}' uses WHERE clause: ${index.where}`);
     }
     const kind = index.type === "unique" ? "UNIQUE " : "";
     const idxName = qualifiedIndexName(tableName, index.name);
-    const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
-    return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns});`;
+    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(", ");
+    return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${keyParts});`;
   }
   addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
     const fkName = `${tableName}_${columnName}_fk`;
@@ -18756,14 +18787,6 @@ ${sql};` : `${sql};`;
     if (defaultValue) {
       parts.push(defaultValue);
     }
-    if (column.references) {
-      let reference = `REFERENCES ${this.quoteIdentifier(column.references.table)}(${this.quoteIdentifier(column.references.column)})`;
-      if (column.references.onDelete)
-        reference += ` ON DELETE ${column.references.onDelete.toUpperCase()}`;
-      if (column.references.onUpdate)
-        reference += ` ON UPDATE ${column.references.onUpdate.toUpperCase()}`;
-      parts.push(reference);
-    }
     return parts.join(" ");
   }
 }
@@ -19023,11 +19046,11 @@ var init_singlestore = __esm(() => {
     addForeignKey() {
       return "";
     }
-    createIndex(tableName, index) {
+    createIndex(tableName, index, columns) {
       if (index.where) {
         throw new Error(`[migrations] Partial indexes (CompositeIndex.where) are not supported on SingleStore. Index '${index.name}' on table '${tableName}' uses WHERE clause: ${index.where}`);
       }
-      return super.createIndex(tableName, index);
+      return super.createIndex(tableName, index, columns);
     }
   };
 });
@@ -19051,6 +19074,9 @@ var init_vitess = __esm(() => {
       const { references: _references, ...withoutReference } = column;
       return super.renderColumn(withoutReference);
     }
+    foreignKeyClauses(table) {
+      return this.sharded ? [] : super.foreignKeyClauses(table);
+    }
     createTable(table) {
       return super.createTable(table);
     }
@@ -29713,7 +29739,7 @@ function generateSql(plan, opts = {}) {
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes)
-      tableStatements.push(driver.createIndex(t2.table, idx));
+      tableStatements.push(driver.createIndex(t2.table, idx, t2.columns));
     if (tableIndex === tables.length - 1) {
       for (const deferredTable of tables) {
         for (const column of deferredTable.columns) {
@@ -30048,7 +30074,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes) {
-      const createIndexStatement = driver.createIndex(t2.table, idx);
+      const createIndexStatement = driver.createIndex(t2.table, idx, t2.columns);
       tableStatements.push(createIndexStatement);
       operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
     }
@@ -30252,7 +30278,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     for (const key of Object.keys(currIdx)) {
       if (!prevIdx[key]) {
         const idx = currIdx[key];
-        const createIndexStatement = driver.createIndex(curr.table, idx);
+        const createIndexStatement = driver.createIndex(curr.table, idx, curr.columns);
         tableChanges.push(createIndexStatement);
         chunks.push(createIndexStatement);
         operations.push({ kind: "create_index", table: curr.table, column: idx.name, destructive: false, sql: createIndexStatement });

package/package.json

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