bun-query-builder 0.1.51 → 0.1.53

package/dist/bin/cli.js

@@ -15917,7 +15917,7 @@ function createQueryBuilder(state) {
       return false;
     },
     unsafe(query, params) {
-      return bunSql.unsafe(query, params);
+      return _sql.unsafe(query, params);
     },
     file(path, params) {
       return bunSql.file(path, params);
@@ -28327,7 +28327,7 @@ function generateSql(plan, opts = {}) {
   const statements = [];
   const driver = getDialectDriver(plan.dialect);
   const { tables, deferredForeignKeys } = orderTablesForCreate(plan.tables, plan.dialect);
-  for (const originalTable of tables) {
+  for (const [tableIndex, originalTable] of tables.entries()) {
     const t2 = {
       ...originalTable,
       columns: originalTable.columns.map((column) => deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)) ? { ...column, references: undefined } : column)
@@ -28351,23 +28351,23 @@ function generateSql(plan, opts = {}) {
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes)
       tableStatements.push(driver.createIndex(t2.table, idx));
+    if (tableIndex === tables.length - 1) {
+      for (const deferredTable of tables) {
+        for (const column of deferredTable.columns) {
+          if (!column.references || !deferredForeignKeys.has(foreignKeyKey(deferredTable.table, column.name)))
+            continue;
+          const addForeignKey = driver.addForeignKey(deferredTable.table, column.name, column.references.table, column.references.column, column.references.onDelete, column.references.onUpdate);
+          if (addForeignKey)
+            tableStatements.push(addForeignKey);
+        }
+      }
+    }
     statements.push(...tableStatements);
     const combinedStatement = tableStatements.join(`
 
 `);
     emit(combinedStatement, `create-${t2.table}-table`);
   }
-  for (const t2 of tables) {
-    for (const c2 of t2.columns) {
-      if (c2.references && deferredForeignKeys.has(foreignKeyKey(t2.table, c2.name))) {
-        const alterTableStatement = driver.addForeignKey(t2.table, c2.name, c2.references.table, c2.references.column, c2.references.onDelete, c2.references.onUpdate);
-        if (!alterTableStatement)
-          continue;
-        statements.push(alterTableStatement);
-        emit(alterTableStatement, `alter-${t2.table}-${c2.name}`);
-      }
-    }
-  }
   const totalChanges = migrationsCreatedCount + migrationsUpdatedCount;
   if (totalChanges === 0) {
     info2("-- Nothing to migrate");
@@ -28622,59 +28622,58 @@ function generateDiffOperations(previous, next, opts = {}) {
       info2(`-- Detected dropped table: ${tableName}`);
     }
   }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      const tableStatements = [];
-      const enumTypes2 = new Set;
-      for (const c2 of t2.columns) {
-        if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
-          const enumTypeName = `${t2.table}_${c2.name}_type`;
-          c2.enumTypeName = enumTypeName;
-          if (!enumTypes2.has(enumTypeName)) {
-            const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
-            if (createEnumStatement) {
-              tableStatements.push(createEnumStatement);
-            }
-            enumTypes2.add(enumTypeName);
+  const newTablePlans = Object.keys(nextTables).filter((tableName) => !prevTables[tableName]).map((tableName) => nextTables[tableName]);
+  const { tables: orderedNewTables, deferredForeignKeys } = orderTablesForCreate(newTablePlans, dialect);
+  for (const [tableIndex, originalTable] of orderedNewTables.entries()) {
+    const t2 = {
+      ...originalTable,
+      columns: originalTable.columns.map((column) => deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)) ? { ...column, references: undefined } : column)
+    };
+    const tableStatements = [];
+    const enumTypes2 = new Set;
+    for (const c2 of t2.columns) {
+      if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
+        const enumTypeName = `${t2.table}_${c2.name}_type`;
+        c2.enumTypeName = enumTypeName;
+        if (!enumTypes2.has(enumTypeName)) {
+          const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
+          if (createEnumStatement) {
+            tableStatements.push(createEnumStatement);
           }
+          enumTypes2.add(enumTypeName);
         }
       }
-      const createTableStatement = driver.createTable(t2);
-      tableStatements.push(createTableStatement);
-      chunks.push(...tableStatements);
-      operations.push({ kind: "create_table", table: t2.table, destructive: false, sql: createTableStatement });
-      const combinedStatement = tableStatements.join(`
-
-`);
-      emit(combinedStatement, `create-${t2.table}-table`);
     }
-  }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      for (const idx of t2.indexes) {
-        const createIndexStatement = driver.createIndex(t2.table, idx);
-        chunks.push(createIndexStatement);
-        operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
-        emit(createIndexStatement, `create-${idx.name}-index-in-${t2.table}`);
-      }
-    }
-  }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      for (const c2 of t2.columns) {
-        if (c2.references) {
-          const alterTableStatement = driver.addForeignKey(t2.table, c2.name, c2.references.table, c2.references.column, c2.references.onDelete, c2.references.onUpdate);
-          if (!alterTableStatement)
+    const createTableStatement = driver.createTable(t2);
+    tableStatements.push(createTableStatement);
+    for (const idx of t2.indexes) {
+      const createIndexStatement = driver.createIndex(t2.table, idx);
+      tableStatements.push(createIndexStatement);
+      operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
+    }
+    for (const column of originalTable.columns) {
+      if (column.references && !deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)))
+        operations.push({ kind: "add_foreign_key", table: originalTable.table, column: column.name, destructive: false, sql: createTableStatement });
+    }
+    if (tableIndex === orderedNewTables.length - 1) {
+      for (const deferredTable of orderedNewTables) {
+        for (const column of deferredTable.columns) {
+          if (!column.references || !deferredForeignKeys.has(foreignKeyKey(deferredTable.table, column.name)))
             continue;
-          chunks.push(alterTableStatement);
-          operations.push({ kind: "add_foreign_key", table: t2.table, column: c2.name, destructive: false, sql: alterTableStatement });
-          emit(alterTableStatement, `alter-${t2.table}-${c2.name}`);
+          const addForeignKey = driver.addForeignKey(deferredTable.table, column.name, column.references.table, column.references.column, column.references.onDelete, column.references.onUpdate);
+          if (!addForeignKey)
+            continue;
+          tableStatements.push(addForeignKey);
+          operations.push({ kind: "add_foreign_key", table: deferredTable.table, column: column.name, destructive: false, sql: addForeignKey });
         }
       }
     }
+    chunks.push(...tableStatements);
+    operations.push({ kind: "create_table", table: t2.table, destructive: false, sql: createTableStatement });
+    const combinedStatement = tableStatements.join(`
+
+`);
+    emit(combinedStatement, `create-${t2.table}-table`);
   }
   const enumTypes = new Set;
   for (const tableName of Object.keys(nextTables)) {
@@ -30952,7 +30951,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.1.51";
+var version2 = "0.1.53";
 
 // bin/cli.ts
 init_actions();

package/dist/src/index.js

@@ -15916,7 +15916,7 @@ function createQueryBuilder(state) {
       return false;
     },
     unsafe(query, params) {
-      return bunSql.unsafe(query, params);
+      return _sql.unsafe(query, params);
     },
     file(path, params) {
       return bunSql.file(path, params);
@@ -28326,7 +28326,7 @@ function generateSql(plan, opts = {}) {
   const statements = [];
   const driver = getDialectDriver(plan.dialect);
   const { tables, deferredForeignKeys } = orderTablesForCreate(plan.tables, plan.dialect);
-  for (const originalTable of tables) {
+  for (const [tableIndex, originalTable] of tables.entries()) {
     const t2 = {
       ...originalTable,
       columns: originalTable.columns.map((column) => deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)) ? { ...column, references: undefined } : column)
@@ -28350,23 +28350,23 @@ function generateSql(plan, opts = {}) {
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes)
       tableStatements.push(driver.createIndex(t2.table, idx));
+    if (tableIndex === tables.length - 1) {
+      for (const deferredTable of tables) {
+        for (const column of deferredTable.columns) {
+          if (!column.references || !deferredForeignKeys.has(foreignKeyKey(deferredTable.table, column.name)))
+            continue;
+          const addForeignKey = driver.addForeignKey(deferredTable.table, column.name, column.references.table, column.references.column, column.references.onDelete, column.references.onUpdate);
+          if (addForeignKey)
+            tableStatements.push(addForeignKey);
+        }
+      }
+    }
     statements.push(...tableStatements);
     const combinedStatement = tableStatements.join(`
 
 `);
     emit(combinedStatement, `create-${t2.table}-table`);
   }
-  for (const t2 of tables) {
-    for (const c2 of t2.columns) {
-      if (c2.references && deferredForeignKeys.has(foreignKeyKey(t2.table, c2.name))) {
-        const alterTableStatement = driver.addForeignKey(t2.table, c2.name, c2.references.table, c2.references.column, c2.references.onDelete, c2.references.onUpdate);
-        if (!alterTableStatement)
-          continue;
-        statements.push(alterTableStatement);
-        emit(alterTableStatement, `alter-${t2.table}-${c2.name}`);
-      }
-    }
-  }
   const totalChanges = migrationsCreatedCount + migrationsUpdatedCount;
   if (totalChanges === 0) {
     info2("-- Nothing to migrate");
@@ -28621,59 +28621,58 @@ function generateDiffOperations(previous, next, opts = {}) {
       info2(`-- Detected dropped table: ${tableName}`);
     }
   }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      const tableStatements = [];
-      const enumTypes2 = new Set;
-      for (const c2 of t2.columns) {
-        if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
-          const enumTypeName = `${t2.table}_${c2.name}_type`;
-          c2.enumTypeName = enumTypeName;
-          if (!enumTypes2.has(enumTypeName)) {
-            const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
-            if (createEnumStatement) {
-              tableStatements.push(createEnumStatement);
-            }
-            enumTypes2.add(enumTypeName);
+  const newTablePlans = Object.keys(nextTables).filter((tableName) => !prevTables[tableName]).map((tableName) => nextTables[tableName]);
+  const { tables: orderedNewTables, deferredForeignKeys } = orderTablesForCreate(newTablePlans, dialect);
+  for (const [tableIndex, originalTable] of orderedNewTables.entries()) {
+    const t2 = {
+      ...originalTable,
+      columns: originalTable.columns.map((column) => deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)) ? { ...column, references: undefined } : column)
+    };
+    const tableStatements = [];
+    const enumTypes2 = new Set;
+    for (const c2 of t2.columns) {
+      if (c2.type === "enum" && c2.enumValues && c2.enumValues.length > 0) {
+        const enumTypeName = `${t2.table}_${c2.name}_type`;
+        c2.enumTypeName = enumTypeName;
+        if (!enumTypes2.has(enumTypeName)) {
+          const createEnumStatement = driver.createEnumType(enumTypeName, c2.enumValues);
+          if (createEnumStatement) {
+            tableStatements.push(createEnumStatement);
           }
+          enumTypes2.add(enumTypeName);
         }
       }
-      const createTableStatement = driver.createTable(t2);
-      tableStatements.push(createTableStatement);
-      chunks.push(...tableStatements);
-      operations.push({ kind: "create_table", table: t2.table, destructive: false, sql: createTableStatement });
-      const combinedStatement = tableStatements.join(`
-
-`);
-      emit(combinedStatement, `create-${t2.table}-table`);
     }
-  }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      for (const idx of t2.indexes) {
-        const createIndexStatement = driver.createIndex(t2.table, idx);
-        chunks.push(createIndexStatement);
-        operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
-        emit(createIndexStatement, `create-${idx.name}-index-in-${t2.table}`);
-      }
-    }
-  }
-  for (const tableName of Object.keys(nextTables)) {
-    if (!prevTables[tableName]) {
-      const t2 = nextTables[tableName];
-      for (const c2 of t2.columns) {
-        if (c2.references) {
-          const alterTableStatement = driver.addForeignKey(t2.table, c2.name, c2.references.table, c2.references.column, c2.references.onDelete, c2.references.onUpdate);
-          if (!alterTableStatement)
+    const createTableStatement = driver.createTable(t2);
+    tableStatements.push(createTableStatement);
+    for (const idx of t2.indexes) {
+      const createIndexStatement = driver.createIndex(t2.table, idx);
+      tableStatements.push(createIndexStatement);
+      operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
+    }
+    for (const column of originalTable.columns) {
+      if (column.references && !deferredForeignKeys.has(foreignKeyKey(originalTable.table, column.name)))
+        operations.push({ kind: "add_foreign_key", table: originalTable.table, column: column.name, destructive: false, sql: createTableStatement });
+    }
+    if (tableIndex === orderedNewTables.length - 1) {
+      for (const deferredTable of orderedNewTables) {
+        for (const column of deferredTable.columns) {
+          if (!column.references || !deferredForeignKeys.has(foreignKeyKey(deferredTable.table, column.name)))
             continue;
-          chunks.push(alterTableStatement);
-          operations.push({ kind: "add_foreign_key", table: t2.table, column: c2.name, destructive: false, sql: alterTableStatement });
-          emit(alterTableStatement, `alter-${t2.table}-${c2.name}`);
+          const addForeignKey = driver.addForeignKey(deferredTable.table, column.name, column.references.table, column.references.column, column.references.onDelete, column.references.onUpdate);
+          if (!addForeignKey)
+            continue;
+          tableStatements.push(addForeignKey);
+          operations.push({ kind: "add_foreign_key", table: deferredTable.table, column: column.name, destructive: false, sql: addForeignKey });
         }
       }
     }
+    chunks.push(...tableStatements);
+    operations.push({ kind: "create_table", table: t2.table, destructive: false, sql: createTableStatement });
+    const combinedStatement = tableStatements.join(`
+
+`);
+    emit(combinedStatement, `create-${t2.table}-table`);
   }
   const enumTypes = new Set;
   for (const tableName of Object.keys(nextTables)) {

package/package.json

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