nexusql 0.6.2 → 0.8.0

package/dist/index.d.ts

@@ -186,6 +186,7 @@ interface MigraResult {
  */
 declare function runMigra(fromUrl: string, toUrl: string, options?: {
     unsafe?: boolean;
+    schemas?: string[];
 }): MigraResult;
 /**
  * Filter out schema_migrations table from migration SQL.
@@ -193,10 +194,13 @@ declare function runMigra(fromUrl: string, toUrl: string, options?: {
 declare function filterSchemaMigrations(sql: string): string;
 
 interface NexusqlConfig {
-    schema: string;
+    dbmlFile: string;
+    /** @deprecated Use dbmlFile instead */
+    schema?: string;
     migrations: string;
     extensions: string[];
     databaseUrl?: string;
+    targetDbSchemas?: string[];
 }
 /**
  * Load configuration from nexusql.config.js or defaults.

package/dist/index.js

@@ -1793,6 +1793,12 @@ var Database = class _Database {
    * Drop a database if it exists.
    */
   async dropDatabase(name) {
+    await this.exec(`
+      SELECT pg_terminate_backend(pg_stat_activity.pid)
+      FROM pg_stat_activity
+      WHERE pg_stat_activity.datname = '${name}'
+        AND pid <> pg_backend_pid();
+    `);
     await this.exec(`DROP DATABASE IF EXISTS "${name}";`);
   }
   /**
@@ -2109,6 +2115,11 @@ function runMigra(fromUrl, toUrl, options = {}) {
   if (options.unsafe) {
     args.push("--unsafe");
   }
+  if (options.schemas?.length) {
+    for (const schema of options.schemas) {
+      args.push("--schema", schema);
+    }
+  }
   try {
     const output = execFileSync("migra", args, {
       encoding: "utf-8",
@@ -2136,9 +2147,10 @@ import { join as join2 } from "path";
 import { pathToFileURL } from "url";
 import { config as loadDotenv } from "dotenv";
 var DEFAULT_CONFIG = {
-  schema: "./schema.dbml",
+  dbmlFile: "./schema.dbml",
   migrations: "./db/migrations",
-  extensions: ["uuid-ossp"]
+  extensions: ["uuid-ossp"],
+  targetDbSchemas: ["public"]
 };
 async function loadConfig(cwd = process.cwd()) {
   loadDotenv();
@@ -2152,30 +2164,42 @@ async function loadConfig(cwd = process.cwd()) {
     } catch {
     }
   }
-  return {
+  const finalConfig = {
     ...DEFAULT_CONFIG,
     ...userConfig,
     databaseUrl: process.env.DATABASE_URL || userConfig.databaseUrl
   };
+  if (userConfig.schema && !userConfig.dbmlFile) {
+    console.warn(
+      "Warning: 'schema' config option is deprecated. Use 'dbmlFile' instead."
+    );
+    finalConfig.dbmlFile = userConfig.schema;
+  }
+  return finalConfig;
 }
 function getDatabaseUrl(config) {
   const url = config.databaseUrl || process.env.DATABASE_URL;
   if (!url) {
-    throw new Error("DATABASE_URL not set. Set it in .env or nexusql.config.js");
+    throw new Error(
+      "DATABASE_URL not set. Set it in .env or nexusql.config.js"
+    );
   }
   return url;
 }
 function generateConfigTemplate() {
   return `/** @type {import('nexusql').NexusqlConfig} */
-export default {
+module.exports = {
   // Path to your DBML schema file
-  schema: './schema.dbml',
+  dbmlFile: './schema.dbml',
 
   // Directory for migration files
   migrations: './db/migrations',
 
   // PostgreSQL extensions to install in temp database
   extensions: ['uuid-ossp'],
+
+  // Restrict to specific PostgreSQL schemas (optional, default: ['public'])
+  // targetDbSchemas: ['public'],
 };
 `;
 }
@@ -3563,7 +3587,7 @@ async function gen(options = {}) {
   const db = new Database(databaseUrl);
   const spinner = ora();
   spinner.start("Reading DBML schema...");
-  const schemaPath = resolve(config.schema);
+  const schemaPath = resolve(config.dbmlFile);
   let dbmlContent;
   try {
     dbmlContent = readFileSync2(schemaPath, "utf-8");
@@ -3599,10 +3623,17 @@ async function gen(options = {}) {
 Tables in temp database: ${tables.join(", ")}`));
     }
     spinner.start("Generating migration diff...");
+    const targetDbSchemas = config.targetDbSchemas;
+    if (targetDbSchemas?.length) {
+      console.log(
+        source_default.dim(`
+Restricting to schemas: ${targetDbSchemas.join(", ")}`)
+      );
+    }
     const migraResult = runMigra(
       db.getConnectionUrl(),
       tempDb.getConnectionUrl(),
-      { unsafe: true }
+      { unsafe: true, schemas: targetDbSchemas }
     );
     migrationSql = filterSchemaMigrations(migraResult.sql);
     if (migraResult.hasChanges) {
@@ -3611,7 +3642,8 @@ Tables in temp database: ${tables.join(", ")}`));
       spinner.info("No schema changes detected");
     }
     spinner.start("Checking comment changes...");
-    const commentSql = await getCommentChanges(db, tempDb);
+    spinner.start("Checking comment changes...");
+    const commentSql = await getCommentChanges(db, tempDb, targetDbSchemas);
     if (commentSql) {
       migrationSql = migrationSql ? `${migrationSql}
 
@@ -3625,8 +3657,8 @@ ${commentSql}`;
     try {
       await db.dropDatabase(tempDbName);
       spinner.succeed("Cleaned up temp database");
-    } catch {
-      spinner.warn("Failed to cleanup temp database");
+    } catch (error) {
+      spinner.warn(`Failed to cleanup temp database: ${error}`);
     }
   }
   const finalSql = migrationSql || "-- No changes detected";
@@ -3640,7 +3672,8 @@ Migration SQL written to: ${options.output}`));
   }
   return finalSql;
 }
-async function getCommentChanges(currentDb, targetDb) {
+async function getCommentChanges(currentDb, targetDb, schemas) {
+  const schemaFilter = schemas && schemas.length > 0 ? `AND c.table_schema IN (${schemas.map((s) => `'${s}'`).join(", ")})` : "";
   const commentQuery = `
     SELECT
       format('COMMENT ON COLUMN %I.%I IS %L;',
@@ -3655,8 +3688,8 @@ async function getCommentChanges(currentDb, targetDb) {
     JOIN pg_catalog.pg_class pc ON pc.relname = c.table_name
     JOIN pg_catalog.pg_namespace pn ON pn.oid = pc.relnamespace AND pn.nspname = c.table_schema
     LEFT JOIN pg_catalog.pg_description pgd ON pgd.objoid = pc.oid AND pgd.objsubid = c.ordinal_position
-    WHERE c.table_schema = 'public'
-      AND c.table_name != 'schema_migrations'
+    WHERE c.table_name != 'schema_migrations'
+      ${schemaFilter}
     ORDER BY c.table_name, c.ordinal_position;
   `;
   const [currentComments, targetComments] = await Promise.all([