@nicnocquee/dataqueue 1.18.0 → 1.18.2

package/cli.cjs

@@ -4,20 +4,22 @@ const { spawnSync } = require('child_process');
 const path = require('path');
 
 function printUsage() {
-  console.log('Usage: dataqueue-cli migrate [--envPath <path>]');
+  console.log(
+    'Usage: dataqueue-cli migrate [--envPath <path>] [-s <schema> | --schema <schema>]',
+  );
   console.log('');
   console.log('Options:');
   console.log(
     '  --envPath <path>   Path to a .env file to load environment variables (passed to node-pg-migrate)',
   );
+  console.log(
+    '  -s, --schema <schema>  Set the schema to use (passed to node-pg-migrate)',
+  );
   console.log('');
   console.log('Notes:');
   console.log(
     '  - The PG_DATAQUEUE_DATABASE environment variable must be set to your Postgres connection string.',
   );
-  console.log(
-    '  - If the connection string contains a search_path parameter, the CLI will automatically set the schema and add --create-schema.',
-  );
   process.exit(1);
 }
 
@@ -25,36 +27,17 @@ const [, , command, ...restArgs] = process.argv;
 
 if (command === 'migrate') {
   const migrationsDir = path.join(__dirname, 'migrations');
-  const dbUrl = process.env.PG_DATAQUEUE_DATABASE;
-
-  if (!dbUrl) {
-    console.error(
-      'Error: PG_DATAQUEUE_DATABASE environment variable must be set to your Postgres connection string.',
-    );
-    process.exit(1);
-  }
 
-  // Parse search_path from dbUrl if present
+  // Support for -s or --schema argument
   let schemaArg = [];
-  let hasCustomSchema = false;
-  try {
-    const urlObj = new URL(dbUrl);
-    if (urlObj.searchParams.has('search_path')) {
-      const searchPath = urlObj.searchParams.get('search_path');
-      if (searchPath) {
-        schemaArg = ['-s', searchPath];
-        hasCustomSchema = true;
-      }
-    }
-  } catch (e) {
-    const match = dbUrl.match(/[?&]search_path=([^&]+)/);
-    if (match && match[1]) {
-      schemaArg = ['-s', decodeURIComponent(match[1])];
-      hasCustomSchema = true;
-    }
-  }
-  if (hasCustomSchema) {
-    schemaArg.push('--create-schema');
+  const sIndex = restArgs.indexOf('-s');
+  const schemaIndex = restArgs.indexOf('--schema');
+  if (sIndex !== -1 && restArgs[sIndex + 1]) {
+    schemaArg = ['-s', restArgs[sIndex + 1], '--create-schema'];
+    restArgs.splice(sIndex, 2);
+  } else if (schemaIndex !== -1 && restArgs[schemaIndex + 1]) {
+    schemaArg = ['-s', restArgs[schemaIndex + 1], '--create-schema'];
+    restArgs.splice(schemaIndex, 2);
   }
 
   // Support for --envPath argument
@@ -77,6 +60,7 @@ if (command === 'migrate') {
       migrationsDir,
       ...schemaArg,
       ...envPathArg,
+      ...restArgs,
     ],
     { stdio: 'inherit' },
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nicnocquee/dataqueue",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "description": "PostgreSQL-based job queue for Node.js applications with support for serverless environments",
   "type": "module",
   "main": "dist/index.js",