bun-query-builder 0.2.2 → 0.2.4

package/dist/bin/cli.js

@@ -18389,12 +18389,14 @@ class PostgresDriver {
     const table = this.quoteIdentifier(tableName);
     const name = this.quoteIdentifier(column.name);
     const statements = [
+      `ALTER TABLE ${table} ALTER COLUMN ${name} DROP DEFAULT;`,
       `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;`);
+    if (defaultValue)
+      statements.push(`ALTER TABLE ${table} ALTER COLUMN ${name} SET ${defaultValue};`);
     return statements.join(`
 `);
   }
@@ -28759,10 +28761,20 @@ function buildMigrationPlan2(models, options) {
       const pivotTable = cfg.table || [parentSingular, relatedSingular].sort().join("_");
       const fkParent = cfg.foreignKey || `${parentSingular}_id`;
       const fkRelated = cfg.relatedKey || `${relatedSingular}_id`;
+      const pivotColumnNames = new Set([fkParent, fkRelated, ...Object.keys(pivotCfg.columns ?? {})]);
+      const pivotPolymorphic = new Set;
+      for (const column of pivotColumnNames) {
+        if (!column.endsWith("_type"))
+          continue;
+        const idColumn = `${column.slice(0, -"_type".length)}_id`;
+        if (pivotColumnNames.has(idColumn))
+          pivotPolymorphic.add(idColumn);
+      }
+      const referenceTo = (column, table) => pivotPolymorphic.has(column) ? undefined : { table, column: "id" };
       const cols = [
         { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
-        { name: fkParent, type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: parentTable, column: "id" } },
-        { name: fkRelated, type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: relatedTable, column: "id" } }
+        { name: fkParent, type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: referenceTo(fkParent, parentTable) },
+        { name: fkRelated, type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: referenceTo(fkRelated, relatedTable) }
       ];
       if (pivotCfg.columns) {
         for (const [name, attr] of Object.entries(pivotCfg.columns)) {
@@ -31452,7 +31464,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.2";
+var version2 = "0.2.4";
 
 // bin/cli.ts
 init_actions();

package/dist/src/index.js

@@ -18388,12 +18388,14 @@ class PostgresDriver {
     const table = this.quoteIdentifier(tableName);
     const name = this.quoteIdentifier(column.name);
     const statements = [
+      `ALTER TABLE ${table} ALTER COLUMN ${name} DROP DEFAULT;`,
       `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;`);
+    if (defaultValue)
+      statements.push(`ALTER TABLE ${table} ALTER COLUMN ${name} SET ${defaultValue};`);
     return statements.join(`
 `);
   }
@@ -28758,10 +28760,20 @@ function buildMigrationPlan2(models, options) {
       const pivotTable = cfg.table || [parentSingular, relatedSingular].sort().join("_");
       const fkParent = cfg.foreignKey || `${parentSingular}_id`;
       const fkRelated = cfg.relatedKey || `${relatedSingular}_id`;
+      const pivotColumnNames = new Set([fkParent, fkRelated, ...Object.keys(pivotCfg.columns ?? {})]);
+      const pivotPolymorphic = new Set;
+      for (const column of pivotColumnNames) {
+        if (!column.endsWith("_type"))
+          continue;
+        const idColumn = `${column.slice(0, -"_type".length)}_id`;
+        if (pivotColumnNames.has(idColumn))
+          pivotPolymorphic.add(idColumn);
+      }
+      const referenceTo = (column, table) => pivotPolymorphic.has(column) ? undefined : { table, column: "id" };
       const cols = [
         { name: "id", type: "bigint", isPrimaryKey: true, isUnique: false, isNullable: false, hasDefault: false },
-        { name: fkParent, type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: parentTable, column: "id" } },
-        { name: fkRelated, type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: { table: relatedTable, column: "id" } }
+        { name: fkParent, type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: referenceTo(fkParent, parentTable) },
+        { name: fkRelated, type: "bigint", isPrimaryKey: false, isUnique: false, isNullable: false, hasDefault: false, references: referenceTo(fkRelated, relatedTable) }
       ];
       if (pivotCfg.columns) {
         for (const [name, attr] of Object.entries(pivotCfg.columns)) {

package/package.json

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