bun-query-builder 0.2.16 → 0.2.18

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",
@@ -18207,7 +18210,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);
@@ -18397,7 +18435,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);
@@ -31562,7 +31627,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.16";
+var version2 = "0.2.18";
 
 // 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",
@@ -18206,7 +18209,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);
@@ -18396,7 +18434,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);

package/package.json

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