spfn 0.2.0-beta.34 → 0.2.0-beta.36

package/dist/index.js

@@ -755,7 +755,7 @@ var init_deployment_config = __esm({
 
 // src/utils/version.ts
 function getCliVersion() {
-  return "0.2.0-beta.34";
+  return "0.2.0-beta.36";
 }
 function getTagFromVersion(version) {
   const match = version.match(/-([a-z]+)\./i);
@@ -2322,6 +2322,7 @@ import prompts3 from "prompts";
 import "@spfn/core/config";
 import { loadEnv as loadEnv3 } from "@spfn/core/server";
 import { sql } from "drizzle-orm";
+import { getTableConfig } from "drizzle-orm/pg-core";
 
 // src/commands/db/utils/sql-classifier.ts
 var DESTRUCTIVE_PATTERNS = [
@@ -2430,20 +2431,34 @@ async function dbPush(options = {}) {
   console.log(chalk13.dim(`Found ${schemaFiles.length} schema file(s)
 `));
   const imports = await loadSchemaImports(schemaFiles);
+  const detectedSchemas = new Set(config.schemaFilter ?? ["public"]);
+  for (const value of Object.values(imports)) {
+    try {
+      const cfg = getTableConfig(value);
+      if (cfg.schema) {
+        detectedSchemas.add(cfg.schema);
+      }
+    } catch {
+    }
+  }
+  const schemaFilter = Array.from(detectedSchemas);
   const { db, close } = await createPushConnection();
   try {
     const { pushSchema } = await import("drizzle-kit/api");
-    const { statementsToExecute, apply } = await pushSchema(
+    const { statementsToExecute } = await pushSchema(
       imports,
       db,
-      config.schemaFilter ?? ["public"]
+      schemaFilter
+    );
+    const statements = statementsToExecute.map(
+      (s) => s.replace(/^CREATE SCHEMA(?!\s+IF\s+NOT\s+EXISTS)/i, "CREATE SCHEMA IF NOT EXISTS")
     );
-    if (statementsToExecute.length === 0) {
+    if (statements.length === 0) {
       console.log(chalk13.green("\u2705 No changes detected \u2014 database is up to date\n"));
       await applyFunctionMigrations();
       return;
     }
-    const result = classifyStatements(statementsToExecute);
+    const result = classifyStatements(statements);
     if (options.dryRun) {
       displayDryRunSummary(result);
       return;
@@ -2451,11 +2466,15 @@ async function dbPush(options = {}) {
     displayClassifiedStatements(result);
     if (options.force) {
       console.log(chalk13.dim("\n--force: applying all changes..."));
-      await apply();
-      displayApplySummary(statementsToExecute.length, 0);
+      for (const stmt of statements) {
+        await db.execute(sql.raw(stmt));
+      }
+      displayApplySummary(statements.length, 0);
     } else if (result.destructive.length === 0) {
-      await apply();
-      displayApplySummary(statementsToExecute.length, 0);
+      for (const stmt of statements) {
+        await db.execute(sql.raw(stmt));
+      }
+      displayApplySummary(statements.length, 0);
     } else {
       const safeCount = result.safe.length + result.warning.length;
       if (safeCount > 0) {
@@ -2481,7 +2500,7 @@ async function dbPush(options = {}) {
         for (const stmt of result.destructive) {
           await db.execute(sql.raw(stmt.sql));
         }
-        displayApplySummary(statementsToExecute.length, 0);
+        displayApplySummary(statements.length, 0);
       } else {
         displayApplySummary(safeCount, result.destructive.length);
         console.log(chalk13.dim("Tip: Use --force to apply all changes without prompting.\n"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spfn",
-  "version": "0.2.0-beta.34",
+  "version": "0.2.0-beta.36",
   "description": "Superfunction CLI - Add SPFN to your Next.js project",
   "type": "module",
   "bin": {
@@ -68,7 +68,7 @@
     "postgres": "^3.4.0",
     "prompts": "^2.4.2",
     "tsup": "^8.5.0",
-    "@spfn/core": "0.2.0-beta.35"
+    "@spfn/core": "0.2.0-beta.37"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",