bun-query-builder 0.2.18 → 0.2.20

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

@@ -18,6 +18,8 @@ export declare function sqlTypeToNormalized(rawType: string, dialect: SupportedD
  * details carried only by COLUMN_TYPE (for example TINYINT(1) and VARCHAR(n)).
  */
 export declare function mysqlColumnType(dataType: unknown, columnType: unknown, enumValues?: string[]): NormalizedColumnType;
+/** Preserve the physical bound of a MySQL VARCHAR column for round-trip diffs. */
+export declare function mysqlColumnMaxLength(columnType: unknown): number | undefined;
 /**
  * The plan type for one Postgres column, given what the catalogue knows.
  *

package/dist/bin/cli.js

@@ -17740,6 +17740,8 @@ function sqlTypeToNormalized(rawType, dialect, ctx) {
   if (/^(?:varchar|character varying|nvarchar|nchar|char|character|bpchar)/.test(base)) {
     const m = t.match(/\((\d+)\)/);
     const len = m ? Number(m[1]) : undefined;
+    if (isMysqlLike(dialect))
+      return "string";
     return len !== undefined && len > 255 ? "text" : "string";
   }
   if (/text|clob/.test(base))
@@ -17767,6 +17769,13 @@ function sqlTypeToNormalized(rawType, dialect, ctx) {
 function mysqlColumnType(dataType, columnType, enumValues) {
   return sqlTypeToNormalized(String(columnType || dataType || ""), "mysql", { enumValues });
 }
+function mysqlColumnMaxLength(columnType) {
+  const match = String(columnType || "").trim().match(/^varchar\((\d+)\)/i);
+  if (!match)
+    return;
+  const length = Number(match[1]);
+  return Number.isSafeInteger(length) && length > 0 ? length : undefined;
+}
 function asAction(raw2) {
   const v = String(raw2 ?? "").toLowerCase().trim();
   if (v === "cascade" || v === "restrict" || v === "set null")
@@ -17881,7 +17890,10 @@ async function buildPgTable(qb, table, enumLabels) {
     WHERE t.relname = $1 AND t.relkind = 'r'
     ORDER BY i.relname, ord`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, ccu.table_name AS ref_table, ccu.column_name AS ref_column,
-            rc.delete_rule, rc.update_rule
+            tc.constraint_name, rc.delete_rule, rc.update_rule,
+            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
+              WHERE count_kcu.constraint_name = tc.constraint_name
+                AND count_kcu.constraint_schema = tc.constraint_schema) AS constraint_column_count
     FROM information_schema.table_constraints tc
       JOIN information_schema.key_column_usage kcu ON kcu.constraint_name = tc.constraint_name
       JOIN information_schema.constraint_column_usage ccu ON ccu.constraint_name = tc.constraint_name
@@ -17889,11 +17901,15 @@ async function buildPgTable(qb, table, enumLabels) {
     WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = $1 AND tc.table_schema = 'public'`, [table]);
   const fkByColumn = new Map;
   for (const fk of fkRows) {
-    fkByColumn.set(String(fk.column_name), {
+    const name = String(fk.column_name);
+    const existing = fkByColumn.get(name);
+    const constraintNames = Number(fk.constraint_column_count) === 1 ? [...new Set([...existing?.constraintNames ?? [], String(fk.constraint_name)])] : existing?.constraintNames;
+    fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table),
       column: String(fk.ref_column ?? "id"),
       onDelete: asAction(fk.delete_rule),
-      onUpdate: asAction(fk.update_rule)
+      onUpdate: asAction(fk.update_rule),
+      constraintNames
     });
   }
   const { indexes, uniqueColumns } = groupPhysicalIndexes(table, idxRows.map((r) => ({
@@ -17932,18 +17948,27 @@ async function buildMysqlTable(qb, table) {
     WHERE table_name = ? AND table_schema = DATABASE()
     ORDER BY index_name, seq_in_index`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, kcu.referenced_table_name AS ref_table, kcu.referenced_column_name AS ref_column,
-            rc.delete_rule, rc.update_rule
+            kcu.constraint_name, rc.delete_rule, rc.update_rule,
+            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
+              WHERE count_kcu.constraint_name = kcu.constraint_name
+                AND count_kcu.constraint_schema = kcu.constraint_schema) AS constraint_column_count
     FROM information_schema.key_column_usage kcu
       JOIN information_schema.referential_constraints rc
         ON rc.constraint_name = kcu.constraint_name AND rc.constraint_schema = kcu.table_schema
     WHERE kcu.table_name = ? AND kcu.table_schema = DATABASE() AND kcu.referenced_table_name IS NOT NULL`, [table]);
   const fkByColumn = new Map;
   for (const fk of fkRows) {
-    fkByColumn.set(String(fk.column_name ?? fk.COLUMN_NAME), {
+    const name = String(fk.column_name ?? fk.COLUMN_NAME);
+    const existing = fkByColumn.get(name);
+    const columnCount = Number(fk.constraint_column_count ?? fk.CONSTRAINT_COLUMN_COUNT);
+    const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
+    const constraintNames = columnCount === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
+    fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table ?? fk.REF_TABLE),
       column: String(fk.ref_column ?? fk.REF_COLUMN ?? "id"),
       onDelete: asAction(fk.delete_rule ?? fk.DELETE_RULE),
-      onUpdate: asAction(fk.update_rule ?? fk.UPDATE_RULE)
+      onUpdate: asAction(fk.update_rule ?? fk.UPDATE_RULE),
+      constraintNames
     });
   }
   const { indexes, uniqueColumns } = groupPhysicalIndexes(table, idxRows.map((r) => ({
@@ -17969,6 +17994,7 @@ async function buildMysqlTable(qb, table) {
       hasDefault,
       defaultValue: hasDefault ? normalizeRawDefault(rawDefault) : undefined,
       enumValues,
+      maxLength: mysqlColumnMaxLength(columnType),
       references: fkByColumn.get(name)
     };
   });
@@ -18203,49 +18229,17 @@ class MySQLDriver {
     const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
     return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns});`;
   }
-  addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate) {
+  addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
     const fkName = `${tableName}_${columnName}_fk`;
     let sql = `ALTER TABLE ${this.quoteIdentifier(tableName)} ADD CONSTRAINT ${this.quoteIdentifier(fkName)} FOREIGN KEY (${this.quoteIdentifier(columnName)}) REFERENCES ${this.quoteIdentifier(refTable)}(${this.quoteIdentifier(refColumn)})`;
     if (onDelete)
       sql += ` ON DELETE ${onDelete.toUpperCase()}`;
     if (onUpdate)
       sql += ` ON UPDATE ${onUpdate.toUpperCase()}`;
-    return `${this.dropForeignKeysOn(tableName, columnName)}
-${sql};`;
-  }
-  dropForeignKeysOn(tableName, columnName) {
-    const table = this.quoteLiteral(tableName);
-    const column = this.quoteLiteral(columnName);
-    return `SET @drop_fks := (
-  SELECT CONCAT(
-    'ALTER TABLE \`', ${table}, '\` DROP FOREIGN KEY \`',
-    GROUP_CONCAT(kcu.CONSTRAINT_NAME SEPARATOR '\`, DROP FOREIGN KEY \`'),
-    '\`'
-  )
-  FROM information_schema.KEY_COLUMN_USAGE kcu
-  WHERE kcu.TABLE_SCHEMA = DATABASE()
-    AND kcu.TABLE_NAME = ${table}
-    AND kcu.COLUMN_NAME = ${column}
-    AND kcu.REFERENCED_TABLE_NAME IS NOT NULL
-    AND kcu.CONSTRAINT_NAME IN (
-      SELECT single.CONSTRAINT_NAME FROM (
-        SELECT inner_kcu.CONSTRAINT_NAME
-        FROM information_schema.KEY_COLUMN_USAGE inner_kcu
-        WHERE inner_kcu.TABLE_SCHEMA = DATABASE()
-          AND inner_kcu.TABLE_NAME = ${table}
-          AND inner_kcu.REFERENCED_TABLE_NAME IS NOT NULL
-        GROUP BY inner_kcu.CONSTRAINT_NAME
-        HAVING COUNT(*) = 1
-      ) AS single
-    )
-);
-SET @drop_fks := IFNULL(@drop_fks, 'SELECT 1');
-PREPARE drop_fks_stmt FROM @drop_fks;
-EXECUTE drop_fks_stmt;
-DEALLOCATE PREPARE drop_fks_stmt;`;
-  }
-  quoteLiteral(value) {
-    return `'${value.replace(/'/g, "''")}'`;
+    const drops = [...new Set(existingConstraintNames)].map((name) => `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP FOREIGN KEY ${this.quoteIdentifier(name)};`).join(`
+`);
+    return drops ? `${drops}
+${sql};` : `${sql};`;
   }
   addColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
@@ -18428,41 +18422,17 @@ class PostgresDriver {
     const where = index.where ? ` WHERE ${index.where}` : "";
     return `CREATE ${kind}INDEX IF NOT EXISTS ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns})${where};`;
   }
-  addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate) {
+  addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
     const fkName = `${tableName}_${columnName}_fk`;
     let sql = `ALTER TABLE ${this.quoteIdentifier(tableName)} ADD CONSTRAINT ${this.quoteIdentifier(fkName)} FOREIGN KEY (${this.quoteIdentifier(columnName)}) REFERENCES ${this.quoteIdentifier(refTable)}(${this.quoteIdentifier(refColumn)})`;
     if (onDelete)
       sql += ` ON DELETE ${onDelete.toUpperCase()}`;
     if (onUpdate)
       sql += ` ON UPDATE ${onUpdate.toUpperCase()}`;
-    return `${this.dropForeignKeysOn(tableName, columnName)}
-${sql};`;
-  }
-  dropForeignKeysOn(tableName, columnName) {
-    const table = this.quoteLiteral(tableName);
-    const column = this.quoteLiteral(columnName);
-    return `DO $$
-DECLARE existing_name text;
-BEGIN
-  FOR existing_name IN
-    SELECT con.conname
-    FROM pg_constraint con
-    JOIN pg_class rel ON rel.oid = con.conrelid
-    JOIN pg_namespace nsp ON nsp.oid = rel.relnamespace
-    WHERE con.contype = 'f'
-      AND rel.relname = ${table}
-      AND nsp.nspname = current_schema()
-      AND con.conkey = ARRAY[(
-        SELECT att.attnum FROM pg_attribute att
-        WHERE att.attrelid = rel.oid AND att.attname = ${column} AND att.attnum > 0
-      )]::smallint[]
-  LOOP
-    EXECUTE format('ALTER TABLE %I DROP CONSTRAINT %I', ${table}, existing_name);
-  END LOOP;
-END $$;`;
-  }
-  quoteLiteral(value) {
-    return `'${value.replace(/'/g, "''")}'`;
+    const drops = [...new Set(existingConstraintNames)].map((name) => `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP CONSTRAINT ${this.quoteIdentifier(name)};`).join(`
+`);
+    return drops ? `${drops}
+${sql};` : `${sql};`;
   }
   addColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
@@ -29124,6 +29094,37 @@ function canonicalStorageType(col, dialect) {
         return "TEXT";
     }
   }
+  if (dialect === "mysql" || dialect === "vitess" || dialect === "singlestore") {
+    switch (col.type) {
+      case "string":
+        return `VARCHAR(${col.maxLength ?? 255})`;
+      case "text":
+        return "TEXT";
+      case "boolean":
+        return "TINYINT(1)";
+      case "integer":
+        return "INTEGER";
+      case "bigint":
+        return "BIGINT";
+      case "float":
+        return "REAL";
+      case "double":
+        return "DOUBLE";
+      case "decimal":
+        return "DECIMAL";
+      case "date":
+        return "DATE";
+      case "datetime":
+      case "timestamptz":
+        return "DATETIME";
+      case "json":
+        return "JSON";
+      case "enum":
+        return "ENUM";
+      default:
+        return col.type;
+    }
+  }
   return col.type;
 }
 function canonicalizeDefault(col) {
@@ -29230,6 +29231,8 @@ function referencesAreDifferent(r1, r2) {
     return true;
   if (!r1 || !r2)
     return false;
+  if ((r1.constraintNames?.length ?? 0) > 1)
+    return true;
   const act = (a2) => (a2 ?? "no action").toLowerCase();
   return r1.table !== r2.table || r1.column !== r2.column || act(r1.onDelete) !== act(r2.onDelete) || act(r1.onUpdate) !== act(r2.onUpdate);
 }
@@ -29477,7 +29480,7 @@ function generateDiffOperations(previous, next, opts = {}) {
       const currCol = currCols[colName];
       if (!currCol.references)
         continue;
-      const addFkStatement = driver.addForeignKey(curr.table, currCol.name, currCol.references.table, currCol.references.column, currCol.references.onDelete, currCol.references.onUpdate);
+      const addFkStatement = driver.addForeignKey(curr.table, currCol.name, currCol.references.table, currCol.references.column, currCol.references.onDelete, currCol.references.onUpdate, prevCols[colName].references?.constraintNames);
       if (!addFkStatement)
         continue;
       tableChanges.push(addFkStatement);
@@ -31627,7 +31630,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.18";
+var version2 = "0.2.20";
 
 // bin/cli.ts
 init_actions();

package/dist/drivers/mysql.d.ts

@@ -3,7 +3,7 @@ export declare interface DialectDriver {
   createEnumType: (enumTypeName: string, values: string[]) => string
   createTable: (table: TablePlan) => string
   createIndex: (tableName: string, index: IndexPlan) => string
-  addForeignKey: (tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string) => 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
   renameColumn: (tableName: string, from: string, to: string) => string
@@ -26,7 +26,7 @@ export declare class MySQLDriver implements DialectDriver {
   createEnumType(_enumTypeName: string, _values: string[]): string;
   createTable(table: TablePlan): string;
   createIndex(tableName: string, index: IndexPlan): string;
-  addForeignKey(tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string): 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;
   renameColumn(tableName: string, from: string, to: string): string;

package/dist/drivers/postgres.d.ts

@@ -3,7 +3,7 @@ export declare interface DialectDriver {
   createEnumType: (enumTypeName: string, values: string[]) => string
   createTable: (table: TablePlan) => string
   createIndex: (tableName: string, index: IndexPlan) => string
-  addForeignKey: (tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string) => 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
   renameColumn: (tableName: string, from: string, to: string) => string
@@ -21,7 +21,7 @@ export declare class PostgresDriver implements DialectDriver {
   createEnumType(enumTypeName: string, values: string[]): string;
   createTable(table: TablePlan): string;
   createIndex(tableName: string, index: IndexPlan): string;
-  addForeignKey(tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string): 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;
   renameColumn(tableName: string, from: string, to: string): string;

package/dist/migrations.d.ts

@@ -91,7 +91,13 @@ export declare interface ColumnPlan {
   isNullable: boolean
   hasDefault: boolean
   defaultValue?: PrimitiveDefault
-  references?: { table: string, column: string, onDelete?: OnForeignKeyAction, onUpdate?: OnForeignKeyAction }
+  references?: {
+    table: string
+    column: string
+    onDelete?: OnForeignKeyAction
+    onUpdate?: OnForeignKeyAction
+    constraintNames?: string[]
+  }
   enumValues?: string[]
   maxLength?: number
   enumTypeName?: string

package/dist/src/index.js

@@ -17739,6 +17739,8 @@ function sqlTypeToNormalized(rawType, dialect, ctx) {
   if (/^(?:varchar|character varying|nvarchar|nchar|char|character|bpchar)/.test(base)) {
     const m = t.match(/\((\d+)\)/);
     const len = m ? Number(m[1]) : undefined;
+    if (isMysqlLike(dialect))
+      return "string";
     return len !== undefined && len > 255 ? "text" : "string";
   }
   if (/text|clob/.test(base))
@@ -17766,6 +17768,13 @@ function sqlTypeToNormalized(rawType, dialect, ctx) {
 function mysqlColumnType(dataType, columnType, enumValues) {
   return sqlTypeToNormalized(String(columnType || dataType || ""), "mysql", { enumValues });
 }
+function mysqlColumnMaxLength(columnType) {
+  const match = String(columnType || "").trim().match(/^varchar\((\d+)\)/i);
+  if (!match)
+    return;
+  const length = Number(match[1]);
+  return Number.isSafeInteger(length) && length > 0 ? length : undefined;
+}
 function asAction(raw2) {
   const v = String(raw2 ?? "").toLowerCase().trim();
   if (v === "cascade" || v === "restrict" || v === "set null")
@@ -17880,7 +17889,10 @@ async function buildPgTable(qb, table, enumLabels) {
     WHERE t.relname = $1 AND t.relkind = 'r'
     ORDER BY i.relname, ord`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, ccu.table_name AS ref_table, ccu.column_name AS ref_column,
-            rc.delete_rule, rc.update_rule
+            tc.constraint_name, rc.delete_rule, rc.update_rule,
+            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
+              WHERE count_kcu.constraint_name = tc.constraint_name
+                AND count_kcu.constraint_schema = tc.constraint_schema) AS constraint_column_count
     FROM information_schema.table_constraints tc
       JOIN information_schema.key_column_usage kcu ON kcu.constraint_name = tc.constraint_name
       JOIN information_schema.constraint_column_usage ccu ON ccu.constraint_name = tc.constraint_name
@@ -17888,11 +17900,15 @@ async function buildPgTable(qb, table, enumLabels) {
     WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = $1 AND tc.table_schema = 'public'`, [table]);
   const fkByColumn = new Map;
   for (const fk of fkRows) {
-    fkByColumn.set(String(fk.column_name), {
+    const name = String(fk.column_name);
+    const existing = fkByColumn.get(name);
+    const constraintNames = Number(fk.constraint_column_count) === 1 ? [...new Set([...existing?.constraintNames ?? [], String(fk.constraint_name)])] : existing?.constraintNames;
+    fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table),
       column: String(fk.ref_column ?? "id"),
       onDelete: asAction(fk.delete_rule),
-      onUpdate: asAction(fk.update_rule)
+      onUpdate: asAction(fk.update_rule),
+      constraintNames
     });
   }
   const { indexes, uniqueColumns } = groupPhysicalIndexes(table, idxRows.map((r) => ({
@@ -17931,18 +17947,27 @@ async function buildMysqlTable(qb, table) {
     WHERE table_name = ? AND table_schema = DATABASE()
     ORDER BY index_name, seq_in_index`, [table]);
   const fkRows = await qb.unsafe(`SELECT kcu.column_name, kcu.referenced_table_name AS ref_table, kcu.referenced_column_name AS ref_column,
-            rc.delete_rule, rc.update_rule
+            kcu.constraint_name, rc.delete_rule, rc.update_rule,
+            (SELECT COUNT(*) FROM information_schema.key_column_usage count_kcu
+              WHERE count_kcu.constraint_name = kcu.constraint_name
+                AND count_kcu.constraint_schema = kcu.constraint_schema) AS constraint_column_count
     FROM information_schema.key_column_usage kcu
       JOIN information_schema.referential_constraints rc
         ON rc.constraint_name = kcu.constraint_name AND rc.constraint_schema = kcu.table_schema
     WHERE kcu.table_name = ? AND kcu.table_schema = DATABASE() AND kcu.referenced_table_name IS NOT NULL`, [table]);
   const fkByColumn = new Map;
   for (const fk of fkRows) {
-    fkByColumn.set(String(fk.column_name ?? fk.COLUMN_NAME), {
+    const name = String(fk.column_name ?? fk.COLUMN_NAME);
+    const existing = fkByColumn.get(name);
+    const columnCount = Number(fk.constraint_column_count ?? fk.CONSTRAINT_COLUMN_COUNT);
+    const constraintName = String(fk.constraint_name ?? fk.CONSTRAINT_NAME);
+    const constraintNames = columnCount === 1 ? [...new Set([...existing?.constraintNames ?? [], constraintName])] : existing?.constraintNames;
+    fkByColumn.set(name, existing ? { ...existing, constraintNames } : {
       table: String(fk.ref_table ?? fk.REF_TABLE),
       column: String(fk.ref_column ?? fk.REF_COLUMN ?? "id"),
       onDelete: asAction(fk.delete_rule ?? fk.DELETE_RULE),
-      onUpdate: asAction(fk.update_rule ?? fk.UPDATE_RULE)
+      onUpdate: asAction(fk.update_rule ?? fk.UPDATE_RULE),
+      constraintNames
     });
   }
   const { indexes, uniqueColumns } = groupPhysicalIndexes(table, idxRows.map((r) => ({
@@ -17968,6 +17993,7 @@ async function buildMysqlTable(qb, table) {
       hasDefault,
       defaultValue: hasDefault ? normalizeRawDefault(rawDefault) : undefined,
       enumValues,
+      maxLength: mysqlColumnMaxLength(columnType),
       references: fkByColumn.get(name)
     };
   });
@@ -18202,49 +18228,17 @@ class MySQLDriver {
     const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
     return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns});`;
   }
-  addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate) {
+  addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
     const fkName = `${tableName}_${columnName}_fk`;
     let sql = `ALTER TABLE ${this.quoteIdentifier(tableName)} ADD CONSTRAINT ${this.quoteIdentifier(fkName)} FOREIGN KEY (${this.quoteIdentifier(columnName)}) REFERENCES ${this.quoteIdentifier(refTable)}(${this.quoteIdentifier(refColumn)})`;
     if (onDelete)
       sql += ` ON DELETE ${onDelete.toUpperCase()}`;
     if (onUpdate)
       sql += ` ON UPDATE ${onUpdate.toUpperCase()}`;
-    return `${this.dropForeignKeysOn(tableName, columnName)}
-${sql};`;
-  }
-  dropForeignKeysOn(tableName, columnName) {
-    const table = this.quoteLiteral(tableName);
-    const column = this.quoteLiteral(columnName);
-    return `SET @drop_fks := (
-  SELECT CONCAT(
-    'ALTER TABLE \`', ${table}, '\` DROP FOREIGN KEY \`',
-    GROUP_CONCAT(kcu.CONSTRAINT_NAME SEPARATOR '\`, DROP FOREIGN KEY \`'),
-    '\`'
-  )
-  FROM information_schema.KEY_COLUMN_USAGE kcu
-  WHERE kcu.TABLE_SCHEMA = DATABASE()
-    AND kcu.TABLE_NAME = ${table}
-    AND kcu.COLUMN_NAME = ${column}
-    AND kcu.REFERENCED_TABLE_NAME IS NOT NULL
-    AND kcu.CONSTRAINT_NAME IN (
-      SELECT single.CONSTRAINT_NAME FROM (
-        SELECT inner_kcu.CONSTRAINT_NAME
-        FROM information_schema.KEY_COLUMN_USAGE inner_kcu
-        WHERE inner_kcu.TABLE_SCHEMA = DATABASE()
-          AND inner_kcu.TABLE_NAME = ${table}
-          AND inner_kcu.REFERENCED_TABLE_NAME IS NOT NULL
-        GROUP BY inner_kcu.CONSTRAINT_NAME
-        HAVING COUNT(*) = 1
-      ) AS single
-    )
-);
-SET @drop_fks := IFNULL(@drop_fks, 'SELECT 1');
-PREPARE drop_fks_stmt FROM @drop_fks;
-EXECUTE drop_fks_stmt;
-DEALLOCATE PREPARE drop_fks_stmt;`;
-  }
-  quoteLiteral(value) {
-    return `'${value.replace(/'/g, "''")}'`;
+    const drops = [...new Set(existingConstraintNames)].map((name) => `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP FOREIGN KEY ${this.quoteIdentifier(name)};`).join(`
+`);
+    return drops ? `${drops}
+${sql};` : `${sql};`;
   }
   addColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
@@ -18427,41 +18421,17 @@ class PostgresDriver {
     const where = index.where ? ` WHERE ${index.where}` : "";
     return `CREATE ${kind}INDEX IF NOT EXISTS ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns})${where};`;
   }
-  addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate) {
+  addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
     const fkName = `${tableName}_${columnName}_fk`;
     let sql = `ALTER TABLE ${this.quoteIdentifier(tableName)} ADD CONSTRAINT ${this.quoteIdentifier(fkName)} FOREIGN KEY (${this.quoteIdentifier(columnName)}) REFERENCES ${this.quoteIdentifier(refTable)}(${this.quoteIdentifier(refColumn)})`;
     if (onDelete)
       sql += ` ON DELETE ${onDelete.toUpperCase()}`;
     if (onUpdate)
       sql += ` ON UPDATE ${onUpdate.toUpperCase()}`;
-    return `${this.dropForeignKeysOn(tableName, columnName)}
-${sql};`;
-  }
-  dropForeignKeysOn(tableName, columnName) {
-    const table = this.quoteLiteral(tableName);
-    const column = this.quoteLiteral(columnName);
-    return `DO $$
-DECLARE existing_name text;
-BEGIN
-  FOR existing_name IN
-    SELECT con.conname
-    FROM pg_constraint con
-    JOIN pg_class rel ON rel.oid = con.conrelid
-    JOIN pg_namespace nsp ON nsp.oid = rel.relnamespace
-    WHERE con.contype = 'f'
-      AND rel.relname = ${table}
-      AND nsp.nspname = current_schema()
-      AND con.conkey = ARRAY[(
-        SELECT att.attnum FROM pg_attribute att
-        WHERE att.attrelid = rel.oid AND att.attname = ${column} AND att.attnum > 0
-      )]::smallint[]
-  LOOP
-    EXECUTE format('ALTER TABLE %I DROP CONSTRAINT %I', ${table}, existing_name);
-  END LOOP;
-END $$;`;
-  }
-  quoteLiteral(value) {
-    return `'${value.replace(/'/g, "''")}'`;
+    const drops = [...new Set(existingConstraintNames)].map((name) => `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP CONSTRAINT ${this.quoteIdentifier(name)};`).join(`
+`);
+    return drops ? `${drops}
+${sql};` : `${sql};`;
   }
   addColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
@@ -29123,6 +29093,37 @@ function canonicalStorageType(col, dialect) {
         return "TEXT";
     }
   }
+  if (dialect === "mysql" || dialect === "vitess" || dialect === "singlestore") {
+    switch (col.type) {
+      case "string":
+        return `VARCHAR(${col.maxLength ?? 255})`;
+      case "text":
+        return "TEXT";
+      case "boolean":
+        return "TINYINT(1)";
+      case "integer":
+        return "INTEGER";
+      case "bigint":
+        return "BIGINT";
+      case "float":
+        return "REAL";
+      case "double":
+        return "DOUBLE";
+      case "decimal":
+        return "DECIMAL";
+      case "date":
+        return "DATE";
+      case "datetime":
+      case "timestamptz":
+        return "DATETIME";
+      case "json":
+        return "JSON";
+      case "enum":
+        return "ENUM";
+      default:
+        return col.type;
+    }
+  }
   return col.type;
 }
 function canonicalizeDefault(col) {
@@ -29229,6 +29230,8 @@ function referencesAreDifferent(r1, r2) {
     return true;
   if (!r1 || !r2)
     return false;
+  if ((r1.constraintNames?.length ?? 0) > 1)
+    return true;
   const act = (a2) => (a2 ?? "no action").toLowerCase();
   return r1.table !== r2.table || r1.column !== r2.column || act(r1.onDelete) !== act(r2.onDelete) || act(r1.onUpdate) !== act(r2.onUpdate);
 }
@@ -29476,7 +29479,7 @@ function generateDiffOperations(previous, next, opts = {}) {
       const currCol = currCols[colName];
       if (!currCol.references)
         continue;
-      const addFkStatement = driver.addForeignKey(curr.table, currCol.name, currCol.references.table, currCol.references.column, currCol.references.onDelete, currCol.references.onUpdate);
+      const addFkStatement = driver.addForeignKey(curr.table, currCol.name, currCol.references.table, currCol.references.column, currCol.references.onDelete, currCol.references.onUpdate, prevCols[colName].references?.constraintNames);
       if (!addFkStatement)
         continue;
       tableChanges.push(addFkStatement);

package/package.json

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