bun-query-builder 0.2.0 → 0.2.2

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

@@ -13,6 +13,15 @@ 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;
+/**
+ * The plan type for one Postgres column, given what the catalogue knows.
+ *
+ * Separated from the query so the enum case can be tested without a live
+ * database: `USER-DEFINED` is the whole of what `information_schema` says about
+ * an enum column, and getting this wrong is invisible until a diff proposes a
+ * type change for a column nobody touched.
+ */
+export declare function pgColumnType(dataType: string, udtName: string, enums: Map<string, string[]>): { type: NormalizedColumnType, enumValues?: string[], enumTypeName?: string };
 /**
  * Read the live database into a full `MigrationPlan`. Tables are read in the
  * dialect-native way (PRAGMA / information_schema / pg_catalog). The internal

package/dist/bin/cli.js

@@ -12508,6 +12508,24 @@ var init_pivot = __esm(() => {
 function isRawExpression(expr) {
   return typeof expr === "object" && expr !== null && "raw" in expr && typeof expr.raw === "string";
 }
+function isBoundSqlExpression(expr) {
+  return typeof expr === "object" && expr !== null && "sql" in expr && typeof expr.sql === "string" && (!("parameters" in expr) || Array.isArray(expr.parameters));
+}
+function renderBoundSqlExpression(expression, startIndex) {
+  const parameters = expression.parameters ?? [];
+  if (config5.dialect !== "postgres" || parameters.length === 0)
+    return { text: expression.sql, parameters };
+  let parameterIndex = 0;
+  const text = expression.sql.replace(/\?/g, (placeholder) => {
+    if (parameterIndex >= parameters.length)
+      return placeholder;
+    return getPlaceholder(startIndex + parameterIndex++);
+  });
+  if (parameterIndex !== parameters.length) {
+    throw new TypeError(`[query-builder] SQL expression declares ${parameters.length} parameters but contains only ${parameterIndex} placeholders`);
+  }
+  return { text, parameters };
+}
 function raw(strings, ...values) {
   if (typeof strings === "string")
     return { raw: strings };
@@ -12981,6 +12999,31 @@ function createQueryBuilder(state) {
       throw err;
     });
   }
+  function mutationCount(result) {
+    if (typeof result === "number")
+      return Number.isFinite(result) ? result : 0;
+    if (typeof result === "bigint")
+      return Number(result);
+    if (!result || typeof result !== "object")
+      return 0;
+    const record = result;
+    for (const key of [
+      "changes",
+      "affectedRows",
+      "count",
+      "rowCount",
+      "numAffectedRows",
+      "numUpdatedRows",
+      "numDeletedRows",
+      "numInsertedOrUpdatedRows"
+    ]) {
+      if (record[key] !== undefined && record[key] !== null)
+        return mutationCount(record[key]);
+    }
+    if (Array.isArray(result))
+      return result.reduce((total, item) => total + mutationCount(item), 0);
+    return 0;
+  }
   function makeExecutableQuery(q, text) {
     const sqlText = text ?? computeSqlText(q);
     return {
@@ -14076,7 +14119,16 @@ function createQueryBuilder(state) {
           built = null;
           return this;
         }
-        return this;
+        if (typeof expr === "function") {
+          throw new TypeError("where(callback) is not supported. This builder has no expression callback, and " + "ignoring one silently would leave the query matching every row the filter was " + "meant to exclude. Use whereNested(subquery), whereAny(...), or the orWhere* " + "helpers to build a grouped condition.");
+        }
+        if (expr === undefined || expr === null) {
+          throw new TypeError("where() was called with no condition.");
+        }
+        if (typeof expr === "string") {
+          throw new TypeError(`where(${JSON.stringify(expr)}) is missing an operator and a value. Pass ` + "where(column, operator, value), or whereRaw() for a raw fragment.");
+        }
+        throw new TypeError(`where() does not understand a condition of type ${typeof expr}.`);
       },
       whereNull(column) {
         validateIdentifier(String(column), "whereNull(column)");
@@ -15681,8 +15733,17 @@ function createQueryBuilder(state) {
           const setClauses = Array.from({ length: len });
           for (let i = 0;i < len; i++) {
             const key = keys[i];
-            setClauses[i] = `${quoteId(key)} = ${getPlaceholder(i + 1)}`;
-            params.push(values[key]);
+            const value = values[key];
+            if (isRawExpression(value)) {
+              setClauses[i] = `${quoteId(key)} = ${value.raw}`;
+            } else if (isBoundSqlExpression(value)) {
+              const expression = renderBoundSqlExpression(value, params.length + 1);
+              setClauses[i] = `${quoteId(key)} = ${expression.text}`;
+              params.push(...expression.parameters);
+            } else {
+              setClauses[i] = `${quoteId(key)} = ${getPlaceholder(params.length + 1)}`;
+              params.push(value);
+            }
           }
           sqlText = `${sqlText} SET ${setClauses.join(", ")}`;
           built = _sql.unsafe(sqlText, params);
@@ -15690,17 +15751,29 @@ function createQueryBuilder(state) {
         },
         where(expr, op, value) {
           const getWhereKeyword = () => SQL_PATTERNS.WHERE.test(sqlText) ? "AND" : "WHERE";
-          if (typeof expr === "string" && op !== undefined) {
+          if (op !== undefined && (typeof expr === "string" || isRawExpression(expr) || isBoundSqlExpression(expr))) {
+            const safeOperator = assertSafeWhereOperator(op, "updateTable.where");
+            let left;
+            if (typeof expr === "string") {
+              left = quoteId(expr);
+            } else if (isRawExpression(expr)) {
+              left = expr.raw;
+            } else {
+              const expression = renderBoundSqlExpression(expr, params.length + 1);
+              left = expression.text;
+              params.push(...expression.parameters);
+            }
             const paramIndex = params.length + 1;
-            sqlText = `${sqlText} ${getWhereKeyword()} ${quoteId(expr)} ${op} ${getPlaceholder(paramIndex)}`;
+            sqlText = `${sqlText} ${getWhereKeyword()} ${left} ${safeOperator} ${getPlaceholder(paramIndex)}`;
             params.push(value);
             built = _sql.unsafe(sqlText, params);
             return this;
           }
           if (Array.isArray(expr)) {
             const [col, op2, val] = expr;
+            const safeOperator = assertSafeWhereOperator(op2, "updateTable.where");
             const paramIndex = params.length + 1;
-            sqlText = `${sqlText} ${getWhereKeyword()} ${quoteId(String(col))} ${String(op2)} ${getPlaceholder(paramIndex)}`;
+            sqlText = `${sqlText} ${getWhereKeyword()} ${quoteId(String(col))} ${safeOperator} ${getPlaceholder(paramIndex)}`;
             params.push(val);
             built = _sql.unsafe(sqlText, params);
             return this;
@@ -15759,15 +15832,16 @@ function createQueryBuilder(state) {
           }
           return makeExecutableQuery(built, sqlText);
         },
-        execute() {
-          return runWithHooks(built, "update");
+        async execute() {
+          const result = await runWithHooks(built, "update");
+          return mutationCount(result);
         },
         async executeTakeFirst() {
-          const result = await runWithHooks(built, "update");
+          const result = mutationCount(await runWithHooks(built, "update"));
           return { numUpdatedRows: result };
         },
         async executeTakeFirstOrThrow() {
-          const result = await runWithHooks(built, "update");
+          const result = mutationCount(await runWithHooks(built, "update"));
           if (result === 0)
             throw new Error("No rows updated");
           return { numUpdatedRows: result };
@@ -15888,18 +15962,18 @@ function createQueryBuilder(state) {
           } catch (err) {
             throw err;
           }
-          const result = await runWithHooks(ensureDelBuilt(), "delete");
+          const result = mutationCount(await runWithHooks(ensureDelBuilt(), "delete"));
           try {
             await config5.hooks?.afterDelete?.({ table: String(table), where: whereCondition, result });
           } catch {}
           return result;
         },
         async executeTakeFirst() {
-          const result = await runWithHooks(ensureDelBuilt(), "delete");
+          const result = mutationCount(await runWithHooks(ensureDelBuilt(), "delete"));
           return { numDeletedRows: result };
         },
         async executeTakeFirstOrThrow() {
-          const result = await runWithHooks(ensureDelBuilt(), "delete");
+          const result = mutationCount(await runWithHooks(ensureDelBuilt(), "delete"));
           if (result === 0)
             throw new Error("No rows deleted");
           return { numDeletedRows: result };
@@ -17682,10 +17756,6 @@ function sqlTypeToNormalized(rawType, dialect, ctx) {
     return "enum";
   return "string";
 }
-function stripIndexPrefix(physicalName, table) {
-  const prefix = `${table}_`;
-  return physicalName.startsWith(prefix) ? physicalName.slice(prefix.length) : physicalName;
-}
 function asAction(raw2) {
   const v = String(raw2 ?? "").toLowerCase().trim();
   if (v === "cascade" || v === "restrict" || v === "set null")
@@ -17721,7 +17791,7 @@ async function buildSqliteTable(qb, table) {
     const isUnique = Number(idx.unique) === 1;
     if (isUnique && columns2.length === 1)
       uniqueColumns.add(columns2[0]);
-    indexes.push({ name: stripIndexPrefix(physName, table), columns: columns2, type: isUnique ? "unique" : "index" });
+    indexes.push({ name: physName, columns: columns2, type: isUnique ? "unique" : "index" });
   }
   const columns = colRows.map((r) => {
     const name = String(r.name);
@@ -17758,7 +17828,31 @@ function normalizeRawDefault(raw2) {
     return raw2;
   return String(raw2);
 }
-async function buildPgTable(qb, table) {
+async function pgEnumLabels(qb) {
+  const rows = await qb.unsafe(`SELECT t.typname AS type_name, e.enumlabel AS label
+    FROM pg_type t
+      JOIN pg_enum e ON e.enumtypid = t.oid
+      JOIN pg_namespace n ON n.oid = t.typnamespace
+    WHERE n.nspname = 'public'
+    ORDER BY t.typname, e.enumsortorder`);
+  const labels = new Map;
+  for (const row of rows) {
+    const name = String(row.type_name);
+    const existing = labels.get(name);
+    if (existing)
+      existing.push(String(row.label));
+    else
+      labels.set(name, [String(row.label)]);
+  }
+  return labels;
+}
+function pgColumnType(dataType, udtName, enums) {
+  const enumValues = enums.get(udtName);
+  const type = sqlTypeToNormalized(String(dataType || udtName || ""), "postgres", { enumValues });
+  return enumValues ? { type, enumValues, enumTypeName: udtName } : { type };
+}
+async function buildPgTable(qb, table, enumLabels) {
+  const enums = enumLabels ?? await pgEnumLabels(qb);
   const colRows = await qb.unsafe(`SELECT c.column_name, c.data_type, c.udt_name, c.is_nullable, c.column_default, c.character_maximum_length,
       (SELECT COUNT(*) FROM information_schema.table_constraints tc
           JOIN information_schema.key_column_usage k ON k.constraint_name = tc.constraint_name
@@ -17806,7 +17900,7 @@ async function buildPgTable(qb, table) {
     const hasDefault = rawDefault != null && !isSerial;
     return {
       name,
-      type: sqlTypeToNormalized(String(r.data_type ?? r.udt_name ?? ""), "postgres"),
+      ...pgColumnType(String(r.data_type ?? ""), r.udt_name == null ? "" : String(r.udt_name), enums),
       isPrimaryKey,
       isUnique: uniqueColumns.has(name),
       isNullable: isPrimaryKey ? false : String(r.is_nullable).toUpperCase() === "YES",
@@ -17892,7 +17986,7 @@ function groupPhysicalIndexes(table, rows) {
     if (entry.isUnique && entry.columns.length === 1)
       uniqueColumns.add(entry.columns[0]);
     indexes.push({
-      name: stripIndexPrefix(physName, table),
+      name: physName,
       columns: entry.columns,
       type: entry.isUnique ? "unique" : "index",
       where: entry.where
@@ -17905,13 +17999,14 @@ async function buildPlanFromDatabase(dialect, opts = {}) {
   const qb = createQueryBuilder();
   const allTables = opts.tables?.length ? opts.tables : await listTables(qb, d);
   const tables = allTables.filter((t) => t !== "migrations");
+  const enumLabels = d === "postgres" ? await pgEnumLabels(qb) : undefined;
   const out = [];
   for (const table of tables) {
     let plan;
     if (d === "sqlite")
       plan = await buildSqliteTable(qb, table);
     else if (d === "postgres")
-      plan = await buildPgTable(qb, table);
+      plan = await buildPgTable(qb, table, enumLabels);
     else
       plan = await buildMysqlTable(qb, table);
     if (plan.columns.length > 0)
@@ -17982,6 +18077,12 @@ export default model
 }
 var init_make_model = () => {};
 
+// src/drivers/index-name.ts
+function qualifiedIndexName(tableName, indexName) {
+  const prefix = `${tableName}_`;
+  return indexName.startsWith(prefix) ? indexName : `${prefix}${indexName}`;
+}
+
 // src/drivers/mysql.ts
 class MySQLDriver {
   quoteIdentifier(id) {
@@ -18068,7 +18169,7 @@ class MySQLDriver {
       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 = `${tableName}_${index.name}`;
+    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});`;
   }
@@ -18121,7 +18222,7 @@ class MySQLDriver {
     return `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP COLUMN ${this.quoteIdentifier(columnName)};`;
   }
   dropIndex(tableName, indexName) {
-    const fullIndexName = `${tableName}_${indexName}`;
+    const fullIndexName = qualifiedIndexName(tableName, indexName);
     return `DROP INDEX ${this.quoteIdentifier(fullIndexName)} ON ${this.quoteIdentifier(tableName)};`;
   }
   dropEnumType(_enumTypeName) {
@@ -18168,6 +18269,7 @@ class MySQLDriver {
     return parts.join(" ");
   }
 }
+var init_mysql = () => {};
 
 // src/drivers/postgres.ts
 class PostgresDriver {
@@ -18202,7 +18304,7 @@ class PostgresDriver {
         return "jsonb";
       case "enum":
         if (column.enumValues && column.enumValues.length > 0) {
-          return this.quoteIdentifier(column.enumTypeName ?? `${column.name}_type`);
+          return column.enumTypeName ? this.quoteIdentifier(column.enumTypeName) : "text";
         }
         return "text";
       default:
@@ -18256,7 +18358,7 @@ class PostgresDriver {
   }
   createIndex(tableName, index) {
     const kind = index.type === "unique" ? "UNIQUE " : "";
-    const idxName = `${tableName}_${index.name}`;
+    const idxName = qualifiedIndexName(tableName, index.name);
     const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
     const where = index.where ? ` WHERE ${index.where}` : "";
     return `CREATE ${kind}INDEX IF NOT EXISTS ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns})${where};`;
@@ -18284,7 +18386,17 @@ class PostgresDriver {
   }
   modifyColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
-    return `ALTER TABLE ${this.quoteIdentifier(tableName)} ALTER COLUMN ${this.quoteIdentifier(column.name)} TYPE ${typeSql} USING ${this.quoteIdentifier(column.name)}::${typeSql};`;
+    const table = this.quoteIdentifier(tableName);
+    const name = this.quoteIdentifier(column.name);
+    const statements = [
+      `ALTER TABLE ${table} ALTER COLUMN ${name} TYPE ${typeSql} USING ${name}::${typeSql};`
+    ];
+    if (!column.isPrimaryKey)
+      statements.push(`ALTER TABLE ${table} ALTER COLUMN ${name} ${column.isNullable ? "DROP NOT NULL" : "SET NOT NULL"};`);
+    const defaultValue = this.getDefaultValue(column);
+    statements.push(defaultValue ? `ALTER TABLE ${table} ALTER COLUMN ${name} SET ${defaultValue};` : `ALTER TABLE ${table} ALTER COLUMN ${name} DROP DEFAULT;`);
+    return statements.join(`
+`);
   }
   renameColumn(tableName, from, to) {
     return `ALTER TABLE ${this.quoteIdentifier(tableName)} RENAME COLUMN ${this.quoteIdentifier(from)} TO ${this.quoteIdentifier(to)};`;
@@ -18302,7 +18414,7 @@ class PostgresDriver {
     return `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP COLUMN ${this.quoteIdentifier(columnName)};`;
   }
   dropIndex(tableName, indexName) {
-    const fullIndexName = `${tableName}_${indexName}`;
+    const fullIndexName = qualifiedIndexName(tableName, indexName);
     return `DROP INDEX IF EXISTS ${this.quoteIdentifier(fullIndexName)};`;
   }
   dropEnumType(enumTypeName) {
@@ -18345,10 +18457,12 @@ class PostgresDriver {
     return parts.join(" ");
   }
 }
+var init_postgres = () => {};
 
 // src/drivers/singlestore.ts
 var SingleStoreDriver;
 var init_singlestore = __esm(() => {
+  init_mysql();
   SingleStoreDriver = class SingleStoreDriver extends MySQLDriver {
     createTable(table) {
       const columns = table.columns.map((c) => this.renderColumn(c)).join(`,
@@ -18482,7 +18596,7 @@ class SQLiteDriver {
   }
   createIndex(tableName, index) {
     const kind = index.type === "unique" ? "UNIQUE " : "";
-    const idxName = `${tableName}_${index.name}`;
+    const idxName = qualifiedIndexName(tableName, index.name);
     const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
     const where = index.where ? ` WHERE ${index.where}` : "";
     return `CREATE ${kind}INDEX IF NOT EXISTS ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns})${where};`;
@@ -18547,7 +18661,7 @@ class SQLiteDriver {
     return `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP COLUMN ${this.quoteIdentifier(columnName)};`;
   }
   dropIndex(tableName, indexName) {
-    const fullIndexName = `${tableName}_${indexName}`;
+    const fullIndexName = qualifiedIndexName(tableName, indexName);
     return `DROP INDEX IF EXISTS ${this.quoteIdentifier(fullIndexName)};`;
   }
   dropEnumType(_enumTypeName) {
@@ -18593,6 +18707,7 @@ class SQLiteDriver {
     return parts.join(" ");
   }
 }
+var init_sqlite = () => {};
 
 // src/drivers/index.ts
 function getDialectDriver(dialect) {
@@ -18610,8 +18725,14 @@ function getDialectDriver(dialect) {
   }
 }
 var init_drivers = __esm(() => {
+  init_mysql();
+  init_postgres();
   init_singlestore();
+  init_sqlite();
+  init_mysql();
+  init_postgres();
   init_singlestore();
+  init_sqlite();
 });
 
 // src/workspace.ts
@@ -28346,6 +28467,23 @@ function buildMigrationPlan2(models, options) {
         hasDefault: false
       });
     }
+    const declaredFkTargets = new Map;
+    const declaresBelongsTo = normalizeRelationList(model.belongsTo).length > 0;
+    const columnNames = new Set(Object.keys(attrs).map((name) => snakeCase(name)));
+    const polymorphicColumns = new Set;
+    for (const column of columnNames) {
+      if (!column.endsWith("_type"))
+        continue;
+      const idColumn = `${column.slice(0, -"_type".length)}_id`;
+      if (columnNames.has(idColumn))
+        polymorphicColumns.add(idColumn);
+    }
+    for (const rel of normalizeRelationList(model.belongsTo)) {
+      const column = rel.foreignKey ?? `${snakeCase(rel.model)}_id`;
+      const table2 = meta.modelToTable[rel.model];
+      if (table2)
+        declaredFkTargets.set(column, table2);
+    }
     for (const attrName of Object.keys(attrs)) {
       const attr = attrs[attrName];
       const columnName = snakeCase(attrName);
@@ -28393,7 +28531,7 @@ function buildMigrationPlan2(models, options) {
         enumValues,
         maxLength: typeof maxLen === "number" && maxLen > 0 && maxLen <= 255 ? maxLen : undefined
       };
-      if (columnName.endsWith("_id") && attr.foreignKey !== false) {
+      if (columnName.endsWith("_id") && attr.foreignKey !== false && !polymorphicColumns.has(columnName)) {
         if (typeof attr.foreignKey === "object" && attr.foreignKey !== null) {
           const fkConfig = attr.foreignKey;
           col.references = {
@@ -28405,9 +28543,10 @@ function buildMigrationPlan2(models, options) {
           if (fkConfig.nullable !== undefined)
             col.isNullable = fkConfig.nullable;
         } else {
+          const declared = declaredFkTargets.get(columnName);
           const base = columnName.replace(/_id$/, "");
           const maybeModel = base.replace(/(^|_)([a-z])/g, (_2, __, c2) => c2.toUpperCase());
-          const refTable = meta.modelToTable[maybeModel];
+          const refTable = declared ?? (declaresBelongsTo ? undefined : meta.modelToTable[maybeModel]);
           if (refTable) {
             const refPk = meta.primaryKeys[refTable] ?? "id";
             col.references = { table: refTable, column: refPk };
@@ -28430,7 +28569,7 @@ function buildMigrationPlan2(models, options) {
         isUnique: false,
         isNullable: true,
         hasDefault: false,
-        references: refTable && refPk ? { table: refTable, column: refPk, onDelete: rel.onDelete } : undefined
+        references: refTable && refPk && !polymorphicColumns.has(fkColumnName) ? { table: refTable, column: refPk, onDelete: rel.onDelete } : undefined
       });
     }
     const traits = model.traits;
@@ -28531,7 +28670,7 @@ function buildMigrationPlan2(models, options) {
     }
     if (traits.taggable) {
       ensureTable({
-        table: "taggable",
+        table: "taggables",
         columns: [
           { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
           { name: "name", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
@@ -28539,37 +28678,61 @@ function buildMigrationPlan2(models, options) {
           { name: "description", type: "text", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false },
           { name: "order", type: "integer", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: 0 },
           { name: "is_active", type: "boolean", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: true },
+          { name: "taggable_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false },
+          { name: "taggable_type", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
+          { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" },
+          { name: "updated_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false }
+        ],
+        indexes: [
+          { name: "taggables_target_index", columns: ["taggable_id", "taggable_type"], type: "index" },
+          { name: "taggables_type_slug_unique", columns: ["taggable_type", "slug"], type: "unique" }
+        ]
+      });
+      ensureTable({
+        table: "taggable_models",
+        columns: [
+          { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
+          { name: "tag_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: "taggables", column: "id" } },
           { name: "taggable_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "taggable_type", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" },
           { name: "updated_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false }
         ],
-        indexes: [{ name: "taggable_target_index", columns: ["taggable_id", "taggable_type"], type: "index" }]
+        indexes: [
+          { name: "taggable_models_owner_unique", columns: ["tag_id", "taggable_id", "taggable_type"], type: "unique" },
+          { name: "taggable_models_target_index", columns: ["taggable_id", "taggable_type"], type: "index" }
+        ]
       });
     }
     if (traits.categorizable) {
       ensureTable({
-        table: "categorizable",
+        table: "categorizables",
         columns: [
           { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
           { name: "name", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "slug", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "description", type: "text", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false },
+          { name: "is_active", type: "boolean", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: true },
+          { name: "categorizable_type", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" },
           { name: "updated_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false }
         ],
-        indexes: [{ name: "categorizable_slug_unique", columns: ["slug"], type: "unique" }]
+        indexes: [{ name: "categorizables_type_slug_unique", columns: ["categorizable_type", "slug"], type: "unique" }]
       });
       ensureTable({
         table: "categorizable_models",
         columns: [
           { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
-          { name: "category_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: "categorizable", column: "id" } },
+          { name: "category_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: "categorizables", column: "id" } },
           { name: "categorizable_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "categorizable_type", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
-          { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" }
+          { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" },
+          { name: "updated_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false }
         ],
-        indexes: [{ name: "categorizable_models_target_index", columns: ["categorizable_id", "categorizable_type"], type: "index" }]
+        indexes: [
+          { name: "categorizable_models_owner_unique", columns: ["category_id", "categorizable_id", "categorizable_type"], type: "unique" },
+          { name: "categorizable_models_target_index", columns: ["categorizable_id", "categorizable_type"], type: "index" }
+        ]
       });
     }
   }
@@ -28902,13 +29065,13 @@ function referencesAreDifferent(r1, r2) {
   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);
 }
-function indexKey(index) {
-  return `${index.type}:${index.name}:${index.columns.join(",")}`;
+function indexKey(index, table) {
+  return `${index.type}:${qualifiedIndexName(table, index.name)}:${index.columns.join(",")}`;
 }
-function mapIndexesByKey(indexes) {
+function mapIndexesByKey(indexes, table) {
   const map = {};
   for (const i2 of indexes)
-    map[indexKey(i2)] = i2;
+    map[indexKey(i2, table)] = i2;
   return map;
 }
 function generateDiffOperations(previous, next, opts = {}) {
@@ -29008,21 +29171,21 @@ function generateDiffOperations(previous, next, opts = {}) {
     const prevCols = mapColumnsByName(prev.columns);
     const currCols = mapColumnsByName(curr.columns);
     for (const colName of Object.keys(currCols)) {
-      if (!prevCols[colName]) {
-        const c2 = currCols[colName];
-        if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
-          const enumTypeName = `${curr.table}_${c2.name}_type`;
-          c2.enumTypeName = enumTypeName;
-          if (!enumTypes.has(enumTypeName)) {
-            const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
-            if (createEnumStatement) {
-              chunks.push(createEnumStatement);
-              operations.push({ kind: "create_enum", table: curr.table, column: c2.name, destructive: false, sql: createEnumStatement });
-              emit(createEnumStatement, `create-${enumTypeName}-enum`);
-            }
-            enumTypes.add(enumTypeName);
-          }
+      const c2 = currCols[colName];
+      if (c2.type !== "enum" || !c2.enumValues || c2.enumValues.length === 0)
+        continue;
+      const enumTypeName = `${curr.table}_${c2.name}_type`;
+      c2.enumTypeName = enumTypeName;
+      if (prevCols[colName])
+        continue;
+      if (!enumTypes.has(enumTypeName)) {
+        const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
+        if (createEnumStatement) {
+          chunks.push(createEnumStatement);
+          operations.push({ kind: "create_enum", table: curr.table, column: c2.name, destructive: false, sql: createEnumStatement });
+          emit(createEnumStatement, `create-${enumTypeName}-enum`);
         }
+        enumTypes.add(enumTypeName);
       }
     }
   }
@@ -29032,9 +29195,9 @@ function generateDiffOperations(previous, next, opts = {}) {
     if (!prev)
       continue;
     const prevCols = mapColumnsByName(prev.columns);
-    const prevIdx = mapIndexesByKey(prev.indexes);
+    const prevIdx = mapIndexesByKey(prev.indexes, prev.table);
     let currCols = mapColumnsByName(curr.columns);
-    let currIdx = mapIndexesByKey(curr.indexes);
+    let currIdx = mapIndexesByKey(curr.indexes, curr.table);
     let renames = [];
     let removedCols = Object.keys(prevCols).filter((n2) => !currCols[n2]);
     let addedCols = Object.keys(currCols).filter((n2) => !prevCols[n2]);
@@ -29051,7 +29214,7 @@ function generateDiffOperations(previous, next, opts = {}) {
       info2(`-- Keeping ${preserved.length} column(s) on "${curr.table}" no model declares: ${removedCols.join(", ")} \u2014 reconciled from the database, where an undeclared column is out of scope rather than removed`);
       curr = { ...curr, columns: [...curr.columns, ...preserved], indexes: [...curr.indexes, ...keptIndexes] };
       currCols = mapColumnsByName(curr.columns);
-      currIdx = mapIndexesByKey(curr.indexes);
+      currIdx = mapIndexesByKey(curr.indexes, curr.table);
       removedCols = [];
     }
     const modifiedCols = Object.keys(currCols).filter((n2) => prevCols[n2] && columnsAreDifferent(prevCols[n2], currCols[n2], dialect));
@@ -29205,6 +29368,7 @@ var migrationCounter = 0, migrationsCreatedCount = 0, migrationsUpdatedCount = 0
 var init_migrations = __esm(() => {
   init_config();
   init_drivers();
+  init_sqlite();
   init_meta();
   createdMigrationFiles = [];
 });
@@ -31288,7 +31452,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.0";
+var version2 = "0.2.2";
 
 // bin/cli.ts
 init_actions();

package/dist/client.d.ts

@@ -236,8 +236,8 @@ export declare interface InsertQueryBuilder<DB extends DatabaseSchema<any>, TTab
   executeTakeFirstOrThrow: () => Promise<DB[TTable]['columns']>
 }
 export declare interface UpdateQueryBuilder<DB extends DatabaseSchema<any>, TTable extends keyof DB & string> {
-  set: (values: Partial<DB[TTable]['columns']>) => UpdateQueryBuilder<DB, TTable>
-  where: (expr: WhereExpression<DB[TTable]['columns']> | string, op?: WhereOperator, value?: any) => UpdateQueryBuilder<DB, TTable>
+  set: (values: Partial<{ [K in keyof DB[TTable]['columns']]: DB[TTable]['columns'][K] | SqlFragment }>) => UpdateQueryBuilder<DB, TTable>
+  where: (expr: WhereExpression<DB[TTable]['columns']> | string | SqlFragment, op?: WhereOperator, value?: any) => UpdateQueryBuilder<DB, TTable>
   returning: <K extends keyof DB[TTable]['columns'] & string>(...cols: K[]) => SelectQueryBuilder<DB, TTable, Pick<DB[TTable]['columns'], K>>
   toSQL: () => string
   execute: () => Promise<number>

package/dist/drivers/index-name.d.ts

@@ -0,0 +1 @@
+export declare function qualifiedIndexName(tableName: string, indexName: string): string;

package/dist/src/index.js

@@ -12507,6 +12507,24 @@ var init_pivot = __esm(() => {
 function isRawExpression(expr) {
   return typeof expr === "object" && expr !== null && "raw" in expr && typeof expr.raw === "string";
 }
+function isBoundSqlExpression(expr) {
+  return typeof expr === "object" && expr !== null && "sql" in expr && typeof expr.sql === "string" && (!("parameters" in expr) || Array.isArray(expr.parameters));
+}
+function renderBoundSqlExpression(expression, startIndex) {
+  const parameters = expression.parameters ?? [];
+  if (config5.dialect !== "postgres" || parameters.length === 0)
+    return { text: expression.sql, parameters };
+  let parameterIndex = 0;
+  const text = expression.sql.replace(/\?/g, (placeholder) => {
+    if (parameterIndex >= parameters.length)
+      return placeholder;
+    return getPlaceholder(startIndex + parameterIndex++);
+  });
+  if (parameterIndex !== parameters.length) {
+    throw new TypeError(`[query-builder] SQL expression declares ${parameters.length} parameters but contains only ${parameterIndex} placeholders`);
+  }
+  return { text, parameters };
+}
 function raw(strings, ...values) {
   if (typeof strings === "string")
     return { raw: strings };
@@ -12980,6 +12998,31 @@ function createQueryBuilder(state) {
       throw err;
     });
   }
+  function mutationCount(result) {
+    if (typeof result === "number")
+      return Number.isFinite(result) ? result : 0;
+    if (typeof result === "bigint")
+      return Number(result);
+    if (!result || typeof result !== "object")
+      return 0;
+    const record = result;
+    for (const key of [
+      "changes",
+      "affectedRows",
+      "count",
+      "rowCount",
+      "numAffectedRows",
+      "numUpdatedRows",
+      "numDeletedRows",
+      "numInsertedOrUpdatedRows"
+    ]) {
+      if (record[key] !== undefined && record[key] !== null)
+        return mutationCount(record[key]);
+    }
+    if (Array.isArray(result))
+      return result.reduce((total, item) => total + mutationCount(item), 0);
+    return 0;
+  }
   function makeExecutableQuery(q, text) {
     const sqlText = text ?? computeSqlText(q);
     return {
@@ -14075,7 +14118,16 @@ function createQueryBuilder(state) {
           built = null;
           return this;
         }
-        return this;
+        if (typeof expr === "function") {
+          throw new TypeError("where(callback) is not supported. This builder has no expression callback, and " + "ignoring one silently would leave the query matching every row the filter was " + "meant to exclude. Use whereNested(subquery), whereAny(...), or the orWhere* " + "helpers to build a grouped condition.");
+        }
+        if (expr === undefined || expr === null) {
+          throw new TypeError("where() was called with no condition.");
+        }
+        if (typeof expr === "string") {
+          throw new TypeError(`where(${JSON.stringify(expr)}) is missing an operator and a value. Pass ` + "where(column, operator, value), or whereRaw() for a raw fragment.");
+        }
+        throw new TypeError(`where() does not understand a condition of type ${typeof expr}.`);
       },
       whereNull(column) {
         validateIdentifier(String(column), "whereNull(column)");
@@ -15680,8 +15732,17 @@ function createQueryBuilder(state) {
           const setClauses = Array.from({ length: len });
           for (let i = 0;i < len; i++) {
             const key = keys[i];
-            setClauses[i] = `${quoteId(key)} = ${getPlaceholder(i + 1)}`;
-            params.push(values[key]);
+            const value = values[key];
+            if (isRawExpression(value)) {
+              setClauses[i] = `${quoteId(key)} = ${value.raw}`;
+            } else if (isBoundSqlExpression(value)) {
+              const expression = renderBoundSqlExpression(value, params.length + 1);
+              setClauses[i] = `${quoteId(key)} = ${expression.text}`;
+              params.push(...expression.parameters);
+            } else {
+              setClauses[i] = `${quoteId(key)} = ${getPlaceholder(params.length + 1)}`;
+              params.push(value);
+            }
           }
           sqlText = `${sqlText} SET ${setClauses.join(", ")}`;
           built = _sql.unsafe(sqlText, params);
@@ -15689,17 +15750,29 @@ function createQueryBuilder(state) {
         },
         where(expr, op, value) {
           const getWhereKeyword = () => SQL_PATTERNS.WHERE.test(sqlText) ? "AND" : "WHERE";
-          if (typeof expr === "string" && op !== undefined) {
+          if (op !== undefined && (typeof expr === "string" || isRawExpression(expr) || isBoundSqlExpression(expr))) {
+            const safeOperator = assertSafeWhereOperator(op, "updateTable.where");
+            let left;
+            if (typeof expr === "string") {
+              left = quoteId(expr);
+            } else if (isRawExpression(expr)) {
+              left = expr.raw;
+            } else {
+              const expression = renderBoundSqlExpression(expr, params.length + 1);
+              left = expression.text;
+              params.push(...expression.parameters);
+            }
             const paramIndex = params.length + 1;
-            sqlText = `${sqlText} ${getWhereKeyword()} ${quoteId(expr)} ${op} ${getPlaceholder(paramIndex)}`;
+            sqlText = `${sqlText} ${getWhereKeyword()} ${left} ${safeOperator} ${getPlaceholder(paramIndex)}`;
             params.push(value);
             built = _sql.unsafe(sqlText, params);
             return this;
           }
           if (Array.isArray(expr)) {
             const [col, op2, val] = expr;
+            const safeOperator = assertSafeWhereOperator(op2, "updateTable.where");
             const paramIndex = params.length + 1;
-            sqlText = `${sqlText} ${getWhereKeyword()} ${quoteId(String(col))} ${String(op2)} ${getPlaceholder(paramIndex)}`;
+            sqlText = `${sqlText} ${getWhereKeyword()} ${quoteId(String(col))} ${safeOperator} ${getPlaceholder(paramIndex)}`;
             params.push(val);
             built = _sql.unsafe(sqlText, params);
             return this;
@@ -15758,15 +15831,16 @@ function createQueryBuilder(state) {
           }
           return makeExecutableQuery(built, sqlText);
         },
-        execute() {
-          return runWithHooks(built, "update");
+        async execute() {
+          const result = await runWithHooks(built, "update");
+          return mutationCount(result);
         },
         async executeTakeFirst() {
-          const result = await runWithHooks(built, "update");
+          const result = mutationCount(await runWithHooks(built, "update"));
           return { numUpdatedRows: result };
         },
         async executeTakeFirstOrThrow() {
-          const result = await runWithHooks(built, "update");
+          const result = mutationCount(await runWithHooks(built, "update"));
           if (result === 0)
             throw new Error("No rows updated");
           return { numUpdatedRows: result };
@@ -15887,18 +15961,18 @@ function createQueryBuilder(state) {
           } catch (err) {
             throw err;
           }
-          const result = await runWithHooks(ensureDelBuilt(), "delete");
+          const result = mutationCount(await runWithHooks(ensureDelBuilt(), "delete"));
           try {
             await config5.hooks?.afterDelete?.({ table: String(table), where: whereCondition, result });
           } catch {}
           return result;
         },
         async executeTakeFirst() {
-          const result = await runWithHooks(ensureDelBuilt(), "delete");
+          const result = mutationCount(await runWithHooks(ensureDelBuilt(), "delete"));
           return { numDeletedRows: result };
         },
         async executeTakeFirstOrThrow() {
-          const result = await runWithHooks(ensureDelBuilt(), "delete");
+          const result = mutationCount(await runWithHooks(ensureDelBuilt(), "delete"));
           if (result === 0)
             throw new Error("No rows deleted");
           return { numDeletedRows: result };
@@ -17681,10 +17755,6 @@ function sqlTypeToNormalized(rawType, dialect, ctx) {
     return "enum";
   return "string";
 }
-function stripIndexPrefix(physicalName, table) {
-  const prefix = `${table}_`;
-  return physicalName.startsWith(prefix) ? physicalName.slice(prefix.length) : physicalName;
-}
 function asAction(raw2) {
   const v = String(raw2 ?? "").toLowerCase().trim();
   if (v === "cascade" || v === "restrict" || v === "set null")
@@ -17720,7 +17790,7 @@ async function buildSqliteTable(qb, table) {
     const isUnique = Number(idx.unique) === 1;
     if (isUnique && columns2.length === 1)
       uniqueColumns.add(columns2[0]);
-    indexes.push({ name: stripIndexPrefix(physName, table), columns: columns2, type: isUnique ? "unique" : "index" });
+    indexes.push({ name: physName, columns: columns2, type: isUnique ? "unique" : "index" });
   }
   const columns = colRows.map((r) => {
     const name = String(r.name);
@@ -17757,7 +17827,31 @@ function normalizeRawDefault(raw2) {
     return raw2;
   return String(raw2);
 }
-async function buildPgTable(qb, table) {
+async function pgEnumLabels(qb) {
+  const rows = await qb.unsafe(`SELECT t.typname AS type_name, e.enumlabel AS label
+    FROM pg_type t
+      JOIN pg_enum e ON e.enumtypid = t.oid
+      JOIN pg_namespace n ON n.oid = t.typnamespace
+    WHERE n.nspname = 'public'
+    ORDER BY t.typname, e.enumsortorder`);
+  const labels = new Map;
+  for (const row of rows) {
+    const name = String(row.type_name);
+    const existing = labels.get(name);
+    if (existing)
+      existing.push(String(row.label));
+    else
+      labels.set(name, [String(row.label)]);
+  }
+  return labels;
+}
+function pgColumnType(dataType, udtName, enums) {
+  const enumValues = enums.get(udtName);
+  const type = sqlTypeToNormalized(String(dataType || udtName || ""), "postgres", { enumValues });
+  return enumValues ? { type, enumValues, enumTypeName: udtName } : { type };
+}
+async function buildPgTable(qb, table, enumLabels) {
+  const enums = enumLabels ?? await pgEnumLabels(qb);
   const colRows = await qb.unsafe(`SELECT c.column_name, c.data_type, c.udt_name, c.is_nullable, c.column_default, c.character_maximum_length,
       (SELECT COUNT(*) FROM information_schema.table_constraints tc
           JOIN information_schema.key_column_usage k ON k.constraint_name = tc.constraint_name
@@ -17805,7 +17899,7 @@ async function buildPgTable(qb, table) {
     const hasDefault = rawDefault != null && !isSerial;
     return {
       name,
-      type: sqlTypeToNormalized(String(r.data_type ?? r.udt_name ?? ""), "postgres"),
+      ...pgColumnType(String(r.data_type ?? ""), r.udt_name == null ? "" : String(r.udt_name), enums),
       isPrimaryKey,
       isUnique: uniqueColumns.has(name),
       isNullable: isPrimaryKey ? false : String(r.is_nullable).toUpperCase() === "YES",
@@ -17891,7 +17985,7 @@ function groupPhysicalIndexes(table, rows) {
     if (entry.isUnique && entry.columns.length === 1)
       uniqueColumns.add(entry.columns[0]);
     indexes.push({
-      name: stripIndexPrefix(physName, table),
+      name: physName,
       columns: entry.columns,
       type: entry.isUnique ? "unique" : "index",
       where: entry.where
@@ -17904,13 +17998,14 @@ async function buildPlanFromDatabase(dialect, opts = {}) {
   const qb = createQueryBuilder();
   const allTables = opts.tables?.length ? opts.tables : await listTables(qb, d);
   const tables = allTables.filter((t) => t !== "migrations");
+  const enumLabels = d === "postgres" ? await pgEnumLabels(qb) : undefined;
   const out = [];
   for (const table of tables) {
     let plan;
     if (d === "sqlite")
       plan = await buildSqliteTable(qb, table);
     else if (d === "postgres")
-      plan = await buildPgTable(qb, table);
+      plan = await buildPgTable(qb, table, enumLabels);
     else
       plan = await buildMysqlTable(qb, table);
     if (plan.columns.length > 0)
@@ -17981,6 +18076,12 @@ export default model
 }
 var init_make_model = () => {};
 
+// src/drivers/index-name.ts
+function qualifiedIndexName(tableName, indexName) {
+  const prefix = `${tableName}_`;
+  return indexName.startsWith(prefix) ? indexName : `${prefix}${indexName}`;
+}
+
 // src/drivers/mysql.ts
 class MySQLDriver {
   quoteIdentifier(id) {
@@ -18067,7 +18168,7 @@ class MySQLDriver {
       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 = `${tableName}_${index.name}`;
+    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});`;
   }
@@ -18120,7 +18221,7 @@ class MySQLDriver {
     return `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP COLUMN ${this.quoteIdentifier(columnName)};`;
   }
   dropIndex(tableName, indexName) {
-    const fullIndexName = `${tableName}_${indexName}`;
+    const fullIndexName = qualifiedIndexName(tableName, indexName);
     return `DROP INDEX ${this.quoteIdentifier(fullIndexName)} ON ${this.quoteIdentifier(tableName)};`;
   }
   dropEnumType(_enumTypeName) {
@@ -18167,6 +18268,7 @@ class MySQLDriver {
     return parts.join(" ");
   }
 }
+var init_mysql = () => {};
 
 // src/drivers/postgres.ts
 class PostgresDriver {
@@ -18201,7 +18303,7 @@ class PostgresDriver {
         return "jsonb";
       case "enum":
         if (column.enumValues && column.enumValues.length > 0) {
-          return this.quoteIdentifier(column.enumTypeName ?? `${column.name}_type`);
+          return column.enumTypeName ? this.quoteIdentifier(column.enumTypeName) : "text";
         }
         return "text";
       default:
@@ -18255,7 +18357,7 @@ class PostgresDriver {
   }
   createIndex(tableName, index) {
     const kind = index.type === "unique" ? "UNIQUE " : "";
-    const idxName = `${tableName}_${index.name}`;
+    const idxName = qualifiedIndexName(tableName, index.name);
     const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
     const where = index.where ? ` WHERE ${index.where}` : "";
     return `CREATE ${kind}INDEX IF NOT EXISTS ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns})${where};`;
@@ -18283,7 +18385,17 @@ class PostgresDriver {
   }
   modifyColumn(tableName, column) {
     const typeSql = this.getColumnType(column);
-    return `ALTER TABLE ${this.quoteIdentifier(tableName)} ALTER COLUMN ${this.quoteIdentifier(column.name)} TYPE ${typeSql} USING ${this.quoteIdentifier(column.name)}::${typeSql};`;
+    const table = this.quoteIdentifier(tableName);
+    const name = this.quoteIdentifier(column.name);
+    const statements = [
+      `ALTER TABLE ${table} ALTER COLUMN ${name} TYPE ${typeSql} USING ${name}::${typeSql};`
+    ];
+    if (!column.isPrimaryKey)
+      statements.push(`ALTER TABLE ${table} ALTER COLUMN ${name} ${column.isNullable ? "DROP NOT NULL" : "SET NOT NULL"};`);
+    const defaultValue = this.getDefaultValue(column);
+    statements.push(defaultValue ? `ALTER TABLE ${table} ALTER COLUMN ${name} SET ${defaultValue};` : `ALTER TABLE ${table} ALTER COLUMN ${name} DROP DEFAULT;`);
+    return statements.join(`
+`);
   }
   renameColumn(tableName, from, to) {
     return `ALTER TABLE ${this.quoteIdentifier(tableName)} RENAME COLUMN ${this.quoteIdentifier(from)} TO ${this.quoteIdentifier(to)};`;
@@ -18301,7 +18413,7 @@ class PostgresDriver {
     return `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP COLUMN ${this.quoteIdentifier(columnName)};`;
   }
   dropIndex(tableName, indexName) {
-    const fullIndexName = `${tableName}_${indexName}`;
+    const fullIndexName = qualifiedIndexName(tableName, indexName);
     return `DROP INDEX IF EXISTS ${this.quoteIdentifier(fullIndexName)};`;
   }
   dropEnumType(enumTypeName) {
@@ -18344,10 +18456,12 @@ class PostgresDriver {
     return parts.join(" ");
   }
 }
+var init_postgres = () => {};
 
 // src/drivers/singlestore.ts
 var SingleStoreDriver;
 var init_singlestore = __esm(() => {
+  init_mysql();
   SingleStoreDriver = class SingleStoreDriver extends MySQLDriver {
     createTable(table) {
       const columns = table.columns.map((c) => this.renderColumn(c)).join(`,
@@ -18481,7 +18595,7 @@ class SQLiteDriver {
   }
   createIndex(tableName, index) {
     const kind = index.type === "unique" ? "UNIQUE " : "";
-    const idxName = `${tableName}_${index.name}`;
+    const idxName = qualifiedIndexName(tableName, index.name);
     const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
     const where = index.where ? ` WHERE ${index.where}` : "";
     return `CREATE ${kind}INDEX IF NOT EXISTS ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns})${where};`;
@@ -18546,7 +18660,7 @@ class SQLiteDriver {
     return `ALTER TABLE ${this.quoteIdentifier(tableName)} DROP COLUMN ${this.quoteIdentifier(columnName)};`;
   }
   dropIndex(tableName, indexName) {
-    const fullIndexName = `${tableName}_${indexName}`;
+    const fullIndexName = qualifiedIndexName(tableName, indexName);
     return `DROP INDEX IF EXISTS ${this.quoteIdentifier(fullIndexName)};`;
   }
   dropEnumType(_enumTypeName) {
@@ -18592,6 +18706,7 @@ class SQLiteDriver {
     return parts.join(" ");
   }
 }
+var init_sqlite = () => {};
 
 // src/drivers/index.ts
 function getDialectDriver(dialect) {
@@ -18609,8 +18724,14 @@ function getDialectDriver(dialect) {
   }
 }
 var init_drivers = __esm(() => {
+  init_mysql();
+  init_postgres();
   init_singlestore();
+  init_sqlite();
+  init_mysql();
+  init_postgres();
   init_singlestore();
+  init_sqlite();
 });
 
 // src/workspace.ts
@@ -28345,6 +28466,23 @@ function buildMigrationPlan2(models, options) {
         hasDefault: false
       });
     }
+    const declaredFkTargets = new Map;
+    const declaresBelongsTo = normalizeRelationList(model.belongsTo).length > 0;
+    const columnNames = new Set(Object.keys(attrs).map((name) => snakeCase(name)));
+    const polymorphicColumns = new Set;
+    for (const column of columnNames) {
+      if (!column.endsWith("_type"))
+        continue;
+      const idColumn = `${column.slice(0, -"_type".length)}_id`;
+      if (columnNames.has(idColumn))
+        polymorphicColumns.add(idColumn);
+    }
+    for (const rel of normalizeRelationList(model.belongsTo)) {
+      const column = rel.foreignKey ?? `${snakeCase(rel.model)}_id`;
+      const table2 = meta.modelToTable[rel.model];
+      if (table2)
+        declaredFkTargets.set(column, table2);
+    }
     for (const attrName of Object.keys(attrs)) {
       const attr = attrs[attrName];
       const columnName = snakeCase(attrName);
@@ -28392,7 +28530,7 @@ function buildMigrationPlan2(models, options) {
         enumValues,
         maxLength: typeof maxLen === "number" && maxLen > 0 && maxLen <= 255 ? maxLen : undefined
       };
-      if (columnName.endsWith("_id") && attr.foreignKey !== false) {
+      if (columnName.endsWith("_id") && attr.foreignKey !== false && !polymorphicColumns.has(columnName)) {
         if (typeof attr.foreignKey === "object" && attr.foreignKey !== null) {
           const fkConfig = attr.foreignKey;
           col.references = {
@@ -28404,9 +28542,10 @@ function buildMigrationPlan2(models, options) {
           if (fkConfig.nullable !== undefined)
             col.isNullable = fkConfig.nullable;
         } else {
+          const declared = declaredFkTargets.get(columnName);
           const base = columnName.replace(/_id$/, "");
           const maybeModel = base.replace(/(^|_)([a-z])/g, (_2, __, c2) => c2.toUpperCase());
-          const refTable = meta.modelToTable[maybeModel];
+          const refTable = declared ?? (declaresBelongsTo ? undefined : meta.modelToTable[maybeModel]);
           if (refTable) {
             const refPk = meta.primaryKeys[refTable] ?? "id";
             col.references = { table: refTable, column: refPk };
@@ -28429,7 +28568,7 @@ function buildMigrationPlan2(models, options) {
         isUnique: false,
         isNullable: true,
         hasDefault: false,
-        references: refTable && refPk ? { table: refTable, column: refPk, onDelete: rel.onDelete } : undefined
+        references: refTable && refPk && !polymorphicColumns.has(fkColumnName) ? { table: refTable, column: refPk, onDelete: rel.onDelete } : undefined
       });
     }
     const traits = model.traits;
@@ -28530,7 +28669,7 @@ function buildMigrationPlan2(models, options) {
     }
     if (traits.taggable) {
       ensureTable({
-        table: "taggable",
+        table: "taggables",
         columns: [
           { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
           { name: "name", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
@@ -28538,37 +28677,61 @@ function buildMigrationPlan2(models, options) {
           { name: "description", type: "text", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false },
           { name: "order", type: "integer", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: 0 },
           { name: "is_active", type: "boolean", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: true },
+          { name: "taggable_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false },
+          { name: "taggable_type", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
+          { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" },
+          { name: "updated_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false }
+        ],
+        indexes: [
+          { name: "taggables_target_index", columns: ["taggable_id", "taggable_type"], type: "index" },
+          { name: "taggables_type_slug_unique", columns: ["taggable_type", "slug"], type: "unique" }
+        ]
+      });
+      ensureTable({
+        table: "taggable_models",
+        columns: [
+          { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
+          { name: "tag_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: "taggables", column: "id" } },
           { name: "taggable_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "taggable_type", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" },
           { name: "updated_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false }
         ],
-        indexes: [{ name: "taggable_target_index", columns: ["taggable_id", "taggable_type"], type: "index" }]
+        indexes: [
+          { name: "taggable_models_owner_unique", columns: ["tag_id", "taggable_id", "taggable_type"], type: "unique" },
+          { name: "taggable_models_target_index", columns: ["taggable_id", "taggable_type"], type: "index" }
+        ]
       });
     }
     if (traits.categorizable) {
       ensureTable({
-        table: "categorizable",
+        table: "categorizables",
         columns: [
           { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
           { name: "name", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "slug", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "description", type: "text", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false },
+          { name: "is_active", type: "boolean", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: true },
+          { name: "categorizable_type", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" },
           { name: "updated_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false }
         ],
-        indexes: [{ name: "categorizable_slug_unique", columns: ["slug"], type: "unique" }]
+        indexes: [{ name: "categorizables_type_slug_unique", columns: ["categorizable_type", "slug"], type: "unique" }]
       });
       ensureTable({
         table: "categorizable_models",
         columns: [
           { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
-          { name: "category_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: "categorizable", column: "id" } },
+          { name: "category_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: "categorizables", column: "id" } },
           { name: "categorizable_id", type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
           { name: "categorizable_type", type: "string", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false },
-          { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" }
+          { name: "created_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: true, defaultValue: "CURRENT_TIMESTAMP" },
+          { name: "updated_at", type: "datetime", isPrimaryKey: false, isUnique: false, isNullable: true, hasDefault: false }
         ],
-        indexes: [{ name: "categorizable_models_target_index", columns: ["categorizable_id", "categorizable_type"], type: "index" }]
+        indexes: [
+          { name: "categorizable_models_owner_unique", columns: ["category_id", "categorizable_id", "categorizable_type"], type: "unique" },
+          { name: "categorizable_models_target_index", columns: ["categorizable_id", "categorizable_type"], type: "index" }
+        ]
       });
     }
   }
@@ -28901,13 +29064,13 @@ function referencesAreDifferent(r1, r2) {
   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);
 }
-function indexKey(index) {
-  return `${index.type}:${index.name}:${index.columns.join(",")}`;
+function indexKey(index, table) {
+  return `${index.type}:${qualifiedIndexName(table, index.name)}:${index.columns.join(",")}`;
 }
-function mapIndexesByKey(indexes) {
+function mapIndexesByKey(indexes, table) {
   const map = {};
   for (const i2 of indexes)
-    map[indexKey(i2)] = i2;
+    map[indexKey(i2, table)] = i2;
   return map;
 }
 function generateDiffOperations(previous, next, opts = {}) {
@@ -29007,21 +29170,21 @@ function generateDiffOperations(previous, next, opts = {}) {
     const prevCols = mapColumnsByName(prev.columns);
     const currCols = mapColumnsByName(curr.columns);
     for (const colName of Object.keys(currCols)) {
-      if (!prevCols[colName]) {
-        const c2 = currCols[colName];
-        if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
-          const enumTypeName = `${curr.table}_${c2.name}_type`;
-          c2.enumTypeName = enumTypeName;
-          if (!enumTypes.has(enumTypeName)) {
-            const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
-            if (createEnumStatement) {
-              chunks.push(createEnumStatement);
-              operations.push({ kind: "create_enum", table: curr.table, column: c2.name, destructive: false, sql: createEnumStatement });
-              emit(createEnumStatement, `create-${enumTypeName}-enum`);
-            }
-            enumTypes.add(enumTypeName);
-          }
+      const c2 = currCols[colName];
+      if (c2.type !== "enum" || !c2.enumValues || c2.enumValues.length === 0)
+        continue;
+      const enumTypeName = `${curr.table}_${c2.name}_type`;
+      c2.enumTypeName = enumTypeName;
+      if (prevCols[colName])
+        continue;
+      if (!enumTypes.has(enumTypeName)) {
+        const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
+        if (createEnumStatement) {
+          chunks.push(createEnumStatement);
+          operations.push({ kind: "create_enum", table: curr.table, column: c2.name, destructive: false, sql: createEnumStatement });
+          emit(createEnumStatement, `create-${enumTypeName}-enum`);
         }
+        enumTypes.add(enumTypeName);
       }
     }
   }
@@ -29031,9 +29194,9 @@ function generateDiffOperations(previous, next, opts = {}) {
     if (!prev)
       continue;
     const prevCols = mapColumnsByName(prev.columns);
-    const prevIdx = mapIndexesByKey(prev.indexes);
+    const prevIdx = mapIndexesByKey(prev.indexes, prev.table);
     let currCols = mapColumnsByName(curr.columns);
-    let currIdx = mapIndexesByKey(curr.indexes);
+    let currIdx = mapIndexesByKey(curr.indexes, curr.table);
     let renames = [];
     let removedCols = Object.keys(prevCols).filter((n2) => !currCols[n2]);
     let addedCols = Object.keys(currCols).filter((n2) => !prevCols[n2]);
@@ -29050,7 +29213,7 @@ function generateDiffOperations(previous, next, opts = {}) {
       info2(`-- Keeping ${preserved.length} column(s) on "${curr.table}" no model declares: ${removedCols.join(", ")} \u2014 reconciled from the database, where an undeclared column is out of scope rather than removed`);
       curr = { ...curr, columns: [...curr.columns, ...preserved], indexes: [...curr.indexes, ...keptIndexes] };
       currCols = mapColumnsByName(curr.columns);
-      currIdx = mapIndexesByKey(curr.indexes);
+      currIdx = mapIndexesByKey(curr.indexes, curr.table);
       removedCols = [];
     }
     const modifiedCols = Object.keys(currCols).filter((n2) => prevCols[n2] && columnsAreDifferent(prevCols[n2], currCols[n2], dialect));
@@ -29204,6 +29367,7 @@ var migrationCounter = 0, migrationsCreatedCount = 0, migrationsUpdatedCount = 0
 var init_migrations = __esm(() => {
   init_config();
   init_drivers();
+  init_sqlite();
   init_meta();
   createdMigrationFiles = [];
 });

package/package.json

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