bun-query-builder 0.2.17 → 0.2.19

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")
@@ -17969,6 +17978,7 @@ async function buildMysqlTable(qb, table) {
       hasDefault,
       defaultValue: hasDefault ? normalizeRawDefault(rawDefault) : undefined,
       enumValues,
+      maxLength: mysqlColumnMaxLength(columnType),
       references: fkByColumn.get(name)
     };
   });
@@ -18210,7 +18220,42 @@ class MySQLDriver {
       sql += ` ON DELETE ${onDelete.toUpperCase()}`;
     if (onUpdate)
       sql += ` ON UPDATE ${onUpdate.toUpperCase()}`;
-    return `${sql};`;
+    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, "''")}'`;
   }
   addColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
@@ -18400,7 +18445,34 @@ class PostgresDriver {
       sql += ` ON DELETE ${onDelete.toUpperCase()}`;
     if (onUpdate)
       sql += ` ON UPDATE ${onUpdate.toUpperCase()}`;
-    return `${sql};`;
+    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, "''")}'`;
   }
   addColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
@@ -29062,6 +29134,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) {
@@ -31565,7 +31668,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.17";
+var version2 = "0.2.19";
 
 // bin/cli.ts
 init_actions();

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")
@@ -17968,6 +17977,7 @@ async function buildMysqlTable(qb, table) {
       hasDefault,
       defaultValue: hasDefault ? normalizeRawDefault(rawDefault) : undefined,
       enumValues,
+      maxLength: mysqlColumnMaxLength(columnType),
       references: fkByColumn.get(name)
     };
   });
@@ -18209,7 +18219,42 @@ class MySQLDriver {
       sql += ` ON DELETE ${onDelete.toUpperCase()}`;
     if (onUpdate)
       sql += ` ON UPDATE ${onUpdate.toUpperCase()}`;
-    return `${sql};`;
+    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, "''")}'`;
   }
   addColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
@@ -18399,7 +18444,34 @@ class PostgresDriver {
       sql += ` ON DELETE ${onDelete.toUpperCase()}`;
     if (onUpdate)
       sql += ` ON UPDATE ${onUpdate.toUpperCase()}`;
-    return `${sql};`;
+    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, "''")}'`;
   }
   addColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
@@ -29061,6 +29133,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) {

package/package.json

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