mpx-db 1.1.2 → 1.2.0

package/package.json

@@ -1,40 +1,45 @@
 {
   "name": "mpx-db",
-  "version": "1.1.2",
-  "description": "Database management CLI - Connect, query, migrate, and manage databases from the terminal",
+  "version": "1.2.0",
+  "description": "Database management CLI. Connect, query, migrate, and manage databases. AI-native with JSON output and MCP server.",
   "main": "src/index.js",
   "bin": {
     "mpx-db": "bin/mpx-db.js"
   },
   "type": "module",
   "scripts": {
-    "test": "node --test test/**/*.test.js",
+    "test": "node --test test/*.test.js",
     "test:watch": "node --test --watch test/**/*.test.js",
     "dev": "node bin/mpx-db.js"
   },
+  "funding": "https://mesaplex.com/pricing",
   "keywords": [
-    "database",
     "cli",
+    "devtools",
+    "mesaplex",
+    "ai-native",
+    "mcp",
+    "model-context-protocol",
+    "automation",
+    "json-output",
+    "database",
     "migration",
     "postgresql",
     "mysql",
     "sqlite",
     "schema",
-    "sql",
-    "mcp",
-    "ai-native",
-    "model-context-protocol",
-    "automation",
-    "json-output"
+    "sql"
   ],
   "author": "Mesaplex <support@mesaplex.com>",
-  "license": "MIT",
+  "license": "SEE LICENSE IN LICENSE",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mesaplexdev/mpx-db.git"
   },
   "homepage": "https://github.com/mesaplexdev/mpx-db#readme",
-  "bugs": "https://github.com/mesaplexdev/mpx-db/issues",
+  "bugs": {
+    "url": "https://github.com/mesaplexdev/mpx-db/issues"
+  },
   "engines": {
     "node": ">=18.0.0"
   },
@@ -44,8 +49,7 @@
     "chalk": "^5.3.0",
     "cli-table3": "^0.6.5",
     "commander": "^12.1.0",
-    "inquirer": "^10.0.0",
-    "yaml": "^2.6.1"
+    "pdfkit": "^0.17.2"
   },
   "peerDependencies": {
     "mysql2": "^3.11.5",
@@ -64,6 +68,6 @@
     "bin/",
     "README.md",
     "LICENSE",
-    "package.json"
+    "CHANGELOG.md"
   ]
 }

package/src/cli.js

@@ -31,15 +31,24 @@ program
   .version(pkg.version)
   .option('--json', 'Output as JSON (machine-readable)')
   .option('-q, --quiet', 'Suppress non-essential output')
+  .option('--no-color', 'Disable colored output')
   .option('--schema', 'Output JSON schema describing all commands and flags')
-  .hook('preAction', (thisCommand) => {
+  .option('--pdf <file>', 'Export results as a PDF report');
+
+// Error handling — must be set BEFORE .command() so subcommands inherit exitOverride
+program.exitOverride();
+program.configureOutput({
+  writeErr: () => {} // Suppress Commander's own error output; we handle it in the catch below
+});
+
+program.hook('preAction', (thisCommand) => {
     // Merge parent options with command options
     const parentOpts = thisCommand.parent?.opts() || {};
     const opts = thisCommand.opts();
     globalOptions = { ...parentOpts, ...opts };
     
-    // Disable chalk if JSON mode
-    if (globalOptions.json) {
+    // Disable chalk if JSON mode or --no-color
+    if (globalOptions.json || globalOptions.color === false) {
       chalk.level = 0;
     }
   });
@@ -74,7 +83,8 @@ program
   .description('Execute a SQL query')
   .argument('<target>', 'Connection name or URL')
   .argument('<sql>', 'SQL query to execute')
-  .action((target, sql) => handleQuery(target, sql, globalOptions));
+  .option('--pdf <file>', 'Export query results as PDF report')
+  .action((target, sql, options) => handleQuery(target, sql, { ...globalOptions, ...options }));
 
 // Info command
 program
@@ -107,7 +117,8 @@ schema
   .command('dump')
   .description('Dump database schema as SQL')
   .argument('<target>', 'Connection name or URL')
-  .action((target) => dumpSchema(target, globalOptions));
+  .option('--pdf <file>', 'Export schema as PDF report')
+  .action((target, options) => dumpSchema(target, { ...globalOptions, ...options }));
 
 // Migration commands
 const migrate = program
@@ -218,7 +229,7 @@ program
       if (jsonMode) {
         console.log(JSON.stringify({ error: err.message, code: 'ERR_UPDATE' }, null, 2));
       } else {
-        console.error(chalk.red.bold('\n❌ Update check failed:'), err.message);
+        console.error(chalk.red('Error:'), err.message);
         console.error('');
       }
       process.exit(1);
@@ -245,9 +256,6 @@ if (process.argv.includes('--schema')) {
   process.exit(0);
 }
 
-// Error handling
-program.exitOverride();
-
 try {
   await program.parseAsync(process.argv);
 } catch (err) {
@@ -256,7 +264,8 @@ try {
     process.exit(0);
   }
   if (err.code !== 'commander.help' && err.code !== 'commander.helpDisplayed') {
-    console.error(chalk.red(`Error: ${err.message}`));
-    process.exit(1);
+    const msg = err.message.startsWith('error:') ? `Error: ${err.message.slice(7)}` : `Error: ${err.message}`;
+    console.error(chalk.red(msg));
+    process.exit(2);
   }
 }

package/src/commands/connections.js

@@ -120,6 +120,7 @@ export async function removeConnection(name, options = {}) {
       name,
       message: deleted ? 'Connection deleted' : 'Connection not found'
     }, null, 2));
+    if (!deleted) process.exit(1);
     return;
   }
   
@@ -128,5 +129,6 @@ export async function removeConnection(name, options = {}) {
     console.log(chalk.green(`✓ Deleted connection "${name}"`));
   } else {
     console.log(chalk.yellow(`Connection "${name}" not found`));
+    process.exit(1);
   }
 }

package/src/commands/data.js

@@ -14,10 +14,12 @@ export async function exportData(target, tableName, options = {}) {
     db = await createConnection(connectionString);
     
     // Query all data
-    const rows = await db.query(`SELECT * FROM ${tableName}`);
+    const rows = await db.query(`SELECT * FROM ${db.quoteIdentifier(tableName)}`);
     
     if (rows.length === 0) {
-      if (!options.quiet) {
+      if (options.json) {
+        console.log(JSON.stringify({ success: true, rows: [], rowCount: 0 }, null, 2));
+      } else if (!options.quiet) {
         console.log(chalk.yellow('No data to export'));
       }
       return;

package/src/commands/migrate.js

@@ -7,6 +7,44 @@ import { resolveConnection } from './query.js';
 
 const MIGRATIONS_DIR = './migrations';
 
+/**
+ * Split SQL into statements on semicolons, respecting quoted strings.
+ */
+function splitStatements(sql) {
+  const statements = [];
+  let current = '';
+  let inSingle = false;
+  let inDouble = false;
+  
+  for (let i = 0; i < sql.length; i++) {
+    const ch = sql[i];
+    const prev = i > 0 ? sql[i - 1] : '';
+    
+    if (ch === "'" && !inDouble && prev !== '\\') {
+      inSingle = !inSingle;
+    } else if (ch === '"' && !inSingle && prev !== '\\') {
+      inDouble = !inDouble;
+    }
+    
+    if (ch === ';' && !inSingle && !inDouble) {
+      const trimmed = current.trim();
+      if (trimmed.length > 0) {
+        statements.push(trimmed);
+      }
+      current = '';
+    } else {
+      current += ch;
+    }
+  }
+  
+  const trimmed = current.trim();
+  if (trimmed.length > 0) {
+    statements.push(trimmed);
+  }
+  
+  return statements;
+}
+
 /**
  * Initialize migrations directory
  */
@@ -287,17 +325,14 @@ export async function runMigrations(target, options = {}) {
         console.log(chalk.gray(`→ ${name}`));
       }
       
-      // Execute migration (split by semicolon for multiple statements)
+      // Execute migration (split by semicolon, respecting quoted strings)
       // Remove comment lines first, then split
       const cleanedSQL = migration.up
         .split('\n')
         .filter(line => !line.trim().startsWith('--'))
         .join('\n');
       
-      const statements = cleanedSQL
-        .split(';')
-        .map(s => s.trim())
-        .filter(s => s.length > 0);
+      const statements = splitStatements(cleanedSQL);
       
       for (const statement of statements) {
         await db.execute(statement);
@@ -385,17 +420,14 @@ export async function rollbackMigration(target, options = {}) {
       console.log(chalk.cyan(`Rolling back: ${last.name}`));
     }
     
-    // Execute rollback (split by semicolon for multiple statements)
+    // Execute rollback (split by semicolon, respecting quoted strings)
     // Remove comment lines first, then split
     const cleanedSQL = migration.down
       .split('\n')
       .filter(line => !line.trim().startsWith('--'))
       .join('\n');
     
-    const statements = cleanedSQL
-      .split(';')
-      .map(s => s.trim())
-      .filter(s => s.length > 0);
+    const statements = splitStatements(cleanedSQL);
     
     for (const statement of statements) {
       await db.execute(statement);

package/src/commands/query.js

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import Table from 'cli-table3';
 import { getConnection } from '../utils/config.js';
 import { createConnection } from '../db/connection.js';
+import { generateQueryPDF } from '../reporters/pdf.js';
 
 /**
  * Execute a query or statement
@@ -27,8 +28,15 @@ export async function handleQuery(target, sql, options = {}) {
       const rows = await db.query(sql);
       const duration = Date.now() - startTime;
       
+      // PDF output
+      if (options.pdf) {
+        await generateQueryPDF(rows, { sql, duration }, options.pdf);
+        if (!options.quiet) {
+          console.log(chalk.green(`✓ Query report saved to ${options.pdf} (${rows.length} rows)`));
+        }
+      }
       // JSON output
-      if (options.json) {
+      else if (options.json) {
         console.log(JSON.stringify({
           success: true,
           type: 'query',
@@ -36,15 +44,12 @@ export async function handleQuery(target, sql, options = {}) {
           rowCount: rows.length,
           duration
         }, null, 2));
-      } else {
+      } else if (!options.quiet) {
         // Display results
         if (rows.length === 0) {
           console.log(chalk.yellow('No rows returned'));
         } else {
           displayTable(rows);
-        }
-        
-        if (!options.quiet) {
           console.log(chalk.gray(`\n${rows.length} row(s) in ${duration}ms`));
         }
       }

package/src/commands/schema.js

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import Table from 'cli-table3';
 import { createConnection } from '../db/connection.js';
 import { resolveConnection } from './query.js';
+import { generateSchemaPDF } from '../reporters/pdf.js';
 
 /**
  * Show database info
@@ -135,9 +136,9 @@ export async function describeTable(target, tableName, options = {}) {
       if (options.json) {
         console.log(JSON.stringify({ error: `Table "${tableName}" not found` }, null, 2));
       } else {
-        console.log(chalk.yellow(`Table "${tableName}" not found or has no columns`));
+        console.error(chalk.yellow(`Table "${tableName}" not found or has no columns`));
       }
-      return;
+      process.exit(1);
     }
     
     // JSON output
@@ -216,19 +217,38 @@ export async function dumpSchema(target, options = {}) {
       sqlOutput += `-- Table: ${table.name}\n`;
       sqlOutput += `-- Rows: ${table.rows}\n`;
       
-      // This is a simplified dump - real implementations would generate proper DDL
+      const pkCols = schema.filter(c => c.primaryKey).map(c => c.name);
       const cols = schema.map(c => {
         let def = `  ${c.name} ${c.type}`;
-        if (!c.nullable) def += ' NOT NULL';
+        if (c.primaryKey && pkCols.length === 1) def += ' PRIMARY KEY';
+        if (!c.nullable && !c.primaryKey) def += ' NOT NULL';
         if (c.default) def += ` DEFAULT ${c.default}`;
         return def;
       });
       
-      sqlOutput += `CREATE TABLE ${table.name} (\n`;
+      sqlOutput += `CREATE TABLE "${table.name}" (\n`;
       sqlOutput += cols.join(',\n');
+      if (pkCols.length > 1) {
+        sqlOutput += `,\n  PRIMARY KEY (${pkCols.join(', ')})`;
+      }
       sqlOutput += '\n);\n\n';
     }
     
+    // PDF output
+    if (options.pdf) {
+      const tableSchemas = [];
+      for (const table of tables) {
+        if (table.type !== 'table') continue;
+        const cols = await db.getTableSchema(table.name);
+        tableSchemas.push({ name: table.name, columns: cols });
+      }
+      await generateSchemaPDF(info, tables, tableSchemas, options.pdf);
+      if (!options.quiet) {
+        console.log(chalk.green(`✓ Schema report saved to ${options.pdf}`));
+      }
+      return;
+    }
+
     // JSON output
     if (options.json) {
       console.log(JSON.stringify({ sql: sqlOutput }, null, 2));

package/src/db/base-adapter.js

@@ -8,6 +8,22 @@ export class BaseAdapter {
     this.connection = null;
   }
 
+  /**
+   * Validate and quote a table/identifier name to prevent SQL injection.
+   * Rejects names with dangerous characters. Override quoteChar in subclasses.
+   */
+  quoteIdentifier(name) {
+    if (!name || typeof name !== 'string') {
+      throw new Error('Invalid identifier: must be a non-empty string');
+    }
+    // Allow alphanumeric, underscores, dots (schema.table), hyphens
+    if (!/^[a-zA-Z_][a-zA-Z0-9_.\\-]*$/.test(name)) {
+      throw new Error(`Invalid identifier: "${name}" contains disallowed characters`);
+    }
+    const q = this._identifierQuote || '"';
+    return `${q}${name.replace(new RegExp(`\\${q}`, 'g'), q + q)}${q}`;
+  }
+
   /**
    * Connect to database
    */
@@ -63,7 +79,7 @@ export class BaseAdapter {
    * Get table row count
    */
   async getRowCount(tableName) {
-    const result = await this.query(`SELECT COUNT(*) as count FROM ${tableName}`);
+    const result = await this.query(`SELECT COUNT(*) as count FROM ${this.quoteIdentifier(tableName)}`);
     return result[0].count;
   }
 

package/src/db/mysql-adapter.js

@@ -4,6 +4,11 @@ import { BaseAdapter } from './base-adapter.js';
  * MySQL adapter using mysql2
  */
 export class MySQLAdapter extends BaseAdapter {
+  constructor(connectionString) {
+    super(connectionString);
+    this._identifierQuote = '`';
+  }
+
   async connect() {
     try {
       const mysql = await import('mysql2/promise');
@@ -62,7 +67,7 @@ export class MySQLAdapter extends BaseAdapter {
     const tables = [];
     for (const row of rows) {
       const countResult = await this.query(
-        `SELECT COUNT(*) as count FROM \`${row.name}\``
+        `SELECT COUNT(*) as count FROM ${this.quoteIdentifier(row.name)}`
       );
       tables.push({
         name: row.name,

package/src/db/postgres-adapter.js

@@ -64,7 +64,7 @@ export class PostgresAdapter extends BaseAdapter {
     const tables = [];
     for (const row of rows) {
       const countResult = await this.query(
-        `SELECT COUNT(*) as count FROM ${row.name}`
+        `SELECT COUNT(*) as count FROM ${this.quoteIdentifier(row.name)}`
       );
       tables.push({
         name: row.name,
@@ -127,6 +127,17 @@ export class PostgresAdapter extends BaseAdapter {
     };
   }
 
+  async recordMigration(name) {
+    await this.execute(
+      'INSERT INTO mpx_migrations (name, applied_at) VALUES ($1, $2)',
+      [name, new Date().toISOString()]
+    );
+  }
+
+  async removeMigration(name) {
+    await this.execute('DELETE FROM mpx_migrations WHERE name = $1', [name]);
+  }
+
   async ensureMigrationsTable() {
     await this.execute(`
       CREATE TABLE IF NOT EXISTS mpx_migrations (

package/src/db/sqlite-adapter.js

@@ -10,9 +10,9 @@ export class SQLiteAdapter extends BaseAdapter {
     super(connectionString);
     
     // Extract file path from sqlite:// or sqlite3://
-    this.dbPath = connectionString
-      .replace(/^sqlite3?:\/\//, '')
-      .replace(/^\//, ''); // Remove leading slash if absolute path
+    // sqlite:///tmp/foo.db → /tmp/foo.db (absolute)
+    // sqlite://mydb.db → mydb.db (relative)
+    this.dbPath = connectionString.replace(/^sqlite3?:\/\//, '');
   }
 
   async connect() {
@@ -76,7 +76,7 @@ export class SQLiteAdapter extends BaseAdapter {
     
     const tables = [];
     for (const row of rows) {
-      const countResult = await this.query(`SELECT COUNT(*) as count FROM ${row.name}`);
+      const countResult = await this.query(`SELECT COUNT(*) as count FROM ${this.quoteIdentifier(row.name)}`);
       tables.push({
         name: row.name,
         type: row.type,
@@ -88,7 +88,7 @@ export class SQLiteAdapter extends BaseAdapter {
   }
 
   async getTableSchema(tableName) {
-    const rows = await this.query(`PRAGMA table_info(${tableName})`);
+    const rows = await this.query(`PRAGMA table_info(${this.quoteIdentifier(tableName)})`);
     
     return rows.map(row => ({
       name: row.name,

package/src/mcp.js

@@ -261,7 +261,7 @@ export async function startMCPServer() {
           const db = await createConnection(connectionString);
           
           try {
-            const rows = await db.query(`SELECT * FROM ${args.table}`);
+            const rows = await db.query(`SELECT * FROM ${db.quoteIdentifier(args.table)}`);
             await db.disconnect();
             
             return {