@memberjunction/cli 3.1.1 → 3.3.0

package/dist/commands/migrate/index.js

@@ -76,32 +76,46 @@ class Migrate extends core_1.Command {
                     // Convert to absolute path if relative
                     return path.isAbsolute(cleanLoc) ? loc : `filesystem:${path.resolve(cleanLoc)}`;
                 });
-                // First try migrate to see the actual SQL error
-                const migrateArgs = [
+                // First try validate to catch checksum mismatches
+                const validateArgs = [
                     ...baseArgs,
-                    `-baselineVersion=${config.baselineVersion}`,
-                    `-baselineOnMigrate=${config.baselineOnMigrate}`,
                     `-locations=${absoluteMigrationPaths.join(',')}`,
-                    'migrate'
+                    'validate'
                 ];
-                const migrateResult = spawnSync(flywayExePath, migrateArgs, { encoding: 'utf8' });
-                const migrateOutput = migrateResult.stderr || migrateResult.stdout || '';
-                // Check if output contains error messages even if exit code is 0
-                const hasErrorsInOutput = migrateOutput.toLowerCase().includes('error') ||
-                    migrateOutput.toLowerCase().includes('incorrect syntax') ||
-                    migrateOutput.toLowerCase().includes('must be the only statement');
-                if (migrateResult.status === 0 && !hasErrorsInOutput) {
-                    this.logToStderr('✓ Migration executed successfully (Flyway CLI reports success)');
-                    this.logToStderr('   The issue was with node-flyway response parsing only\n');
-                }
-                else if (migrateResult.status === 0 && hasErrorsInOutput) {
-                    // Exit code was 0 but output contains errors - SQL script likely has error handling
-                    this.logToStderr('⚠️  Migration completed but errors were detected in output:\n');
-                    this.analyzeFlywayError(migrateOutput, config);
+                const validateResult = spawnSync(flywayExePath, validateArgs, { encoding: 'utf8' });
+                const validateOutput = validateResult.stderr || validateResult.stdout || '';
+                // Check if validation failed
+                if (validateResult.status !== 0 || validateOutput.toLowerCase().includes('validate failed')) {
+                    this.analyzeFlywayError(validateOutput, config);
                 }
                 else {
-                    // Migration failed with non-zero exit code
-                    this.analyzeFlywayError(migrateOutput, config);
+                    // Validation passed, try migrate to see the actual SQL error
+                    const migrateArgs = [
+                        ...baseArgs,
+                        `-baselineVersion=${config.baselineVersion}`,
+                        `-baselineOnMigrate=${config.baselineOnMigrate}`,
+                        `-locations=${absoluteMigrationPaths.join(',')}`,
+                        'migrate'
+                    ];
+                    const migrateResult = spawnSync(flywayExePath, migrateArgs, { encoding: 'utf8' });
+                    const migrateOutput = migrateResult.stderr || migrateResult.stdout || '';
+                    // Check if output contains error messages even if exit code is 0
+                    const hasErrorsInOutput = migrateOutput.toLowerCase().includes('error') ||
+                        migrateOutput.toLowerCase().includes('incorrect syntax') ||
+                        migrateOutput.toLowerCase().includes('must be the only statement');
+                    if (migrateResult.status === 0 && !hasErrorsInOutput) {
+                        this.logToStderr('✓ Migration executed successfully (Flyway CLI reports success)');
+                        this.logToStderr('   The issue was with node-flyway response parsing only\n');
+                    }
+                    else if (migrateResult.status === 0 && hasErrorsInOutput) {
+                        // Exit code was 0 but output contains errors - SQL script likely has error handling
+                        this.logToStderr('⚠️  Migration completed but errors were detected in output:\n');
+                        this.analyzeFlywayError(migrateOutput, config);
+                    }
+                    else {
+                        // Migration failed with non-zero exit code
+                        this.analyzeFlywayError(migrateOutput, config);
+                    }
                 }
             }
             catch (err) {
@@ -129,6 +143,9 @@ class Migrate extends core_1.Command {
         const messageLine = errorLines.find(line => line.includes('Message')) || '';
         const errorLine = errorLines.find(line => line.includes('ERROR:') && !line.includes('Skipping filesystem location')) || '';
         // Determine error type
+        const isValidationError = fullError.includes('validate failed') ||
+            fullError.includes('checksum mismatch') ||
+            fullError.includes('migrations have failed validation');
         const isSqlError = fullError.includes('incorrect syntax') ||
             fullError.includes('must be the only statement in the batch') ||
             fullError.includes('invalid object name') ||
@@ -138,7 +155,10 @@ class Migrate extends core_1.Command {
             fullError.includes('unable to obtain connection') ||
             fullError.includes('connection') && !fullError.includes('clientconnectionid');
         // Display error header
-        if (isSqlError) {
+        if (isValidationError) {
+            this.logToStderr('❌ Validation Failed - Checksum Mismatch Detected\n');
+        }
+        else if (isSqlError) {
             this.logToStderr('❌ SQL Migration Error Detected\n');
         }
         else if (isConnectionError) {
@@ -148,7 +168,16 @@ class Migrate extends core_1.Command {
             this.logToStderr('❌ Migration Failed\n');
         }
         // Display error details
-        if (errorCodeLine && messageLine) {
+        if (isValidationError) {
+            // For validation errors, show the COMPLETE raw Flyway output
+            // This includes all checksum details which are critical for debugging
+            this.logToStderr('\n📋 Full Flyway Validation Output:');
+            this.logToStderr('='.repeat(100));
+            this.logToStderr(errorOutput);
+            this.logToStderr('='.repeat(100));
+            this.logToStderr('');
+        }
+        else if (errorCodeLine && messageLine) {
             this.logToStderr(`   ${errorCodeLine.trim()}`);
             this.logToStderr(`   ${messageLine.trim()}\n`);
         }
@@ -157,33 +186,42 @@ class Migrate extends core_1.Command {
             this.logToStderr(`   Error: ${cleanError}\n`);
         }
         else if (errorOutput) {
-            // Show lines containing error-related keywords
-            const errorKeywords = ['error', 'incorrect', 'syntax', 'invalid', 'failed', 'must be', 'cannot', 'line'];
-            const relevantLines = errorOutput.split('\n')
-                .filter(line => {
-                const lower = line.toLowerCase();
-                return line.trim() &&
-                    !lower.includes('flyway community') &&
-                    !lower.includes('skipping filesystem location') &&
-                    errorKeywords.some(keyword => lower.includes(keyword));
-            })
-                .slice(0, 15);
-            if (relevantLines.length > 0) {
-                this.logToStderr('   Error details from Flyway output:');
-                relevantLines.forEach(line => this.logToStderr(`   ${line.trim()}`));
-                this.logToStderr('');
-            }
-            else {
-                // If no error keywords found, show last 20 lines of output
-                const allLines = errorOutput.split('\n').filter(l => l.trim());
-                const lastLines = allLines.slice(-20);
-                this.logToStderr('   Last 20 lines of Flyway output:');
-                lastLines.forEach(line => this.logToStderr(`   ${line.trim()}`));
-                this.logToStderr('');
+            if (false) { // Disabled - keeping structure for non-validation errors
+                // Show lines containing error-related keywords
+                const errorKeywords = ['error', 'incorrect', 'syntax', 'invalid', 'failed', 'must be', 'cannot', 'line'];
+                const relevantLines = errorOutput.split('\n')
+                    .filter(line => {
+                    const lower = line.toLowerCase();
+                    return line.trim() &&
+                        !lower.includes('flyway community') &&
+                        !lower.includes('skipping filesystem location') &&
+                        errorKeywords.some(keyword => lower.includes(keyword));
+                })
+                    .slice(0, 15);
+                if (relevantLines.length > 0) {
+                    this.logToStderr('   Error details from Flyway output:');
+                    relevantLines.forEach(line => this.logToStderr(`   ${line.trim()}`));
+                    this.logToStderr('');
+                }
+                else {
+                    // If no error keywords found, show last 20 lines of output
+                    const allLines = errorOutput.split('\n').filter(l => l.trim());
+                    const lastLines = allLines.slice(-20);
+                    this.logToStderr('   Last 20 lines of Flyway output:');
+                    lastLines.forEach(line => this.logToStderr(`   ${line.trim()}`));
+                    this.logToStderr('');
+                }
             }
         }
         // Provide guidance
-        if (isSqlError) {
+        if (isValidationError) {
+            this.logToStderr('💡 Migration checksum validation failed:');
+            this.logToStderr('   - A migration file has been modified after it was applied to the database');
+            this.logToStderr('   - Check the migration file(s) listed above for unexpected changes');
+            this.logToStderr('   - To repair: Use `flyway repair` if you intentionally modified the file');
+            this.logToStderr('   - Or revert the file to match the checksum in the database');
+        }
+        else if (isSqlError) {
             this.logToStderr('💡 This is a SQL script error:');
             this.logToStderr('   - Check the migration SQL file for syntax errors');
             this.logToStderr('   - Look for missing GO statements before CREATE TRIGGER/PROCEDURE/FUNCTION');

package/oclif.manifest.json

@@ -94,24 +94,25 @@
         "index.js"
       ]
     },
-    "codegen": {
+    "clean": {
       "aliases": [],
       "args": {},
-      "description": "Run CodeGen to generate code and update metadata for MemberJunction",
+      "description": "Resets the MemberJunction database to a pre-installation state",
       "examples": [
         "<%= config.bin %> <%= command.id %>\n"
       ],
       "flags": {
-        "skipdb": {
-          "description": "Skip database migration",
-          "name": "skipdb",
+        "verbose": {
+          "char": "v",
+          "description": "Enable additional logging",
+          "name": "verbose",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "codegen",
+      "id": "clean",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -121,29 +122,28 @@
       "relativePath": [
         "dist",
         "commands",
-        "codegen",
+        "clean",
         "index.js"
       ]
     },
-    "clean": {
+    "codegen": {
       "aliases": [],
       "args": {},
-      "description": "Resets the MemberJunction database to a pre-installation state",
+      "description": "Run CodeGen to generate code and update metadata for MemberJunction",
       "examples": [
         "<%= config.bin %> <%= command.id %>\n"
       ],
       "flags": {
-        "verbose": {
-          "char": "v",
-          "description": "Enable additional logging",
-          "name": "verbose",
+        "skipdb": {
+          "description": "Skip database migration",
+          "name": "skipdb",
           "allowNo": false,
           "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "clean",
+      "id": "codegen",
       "pluginAlias": "@memberjunction/cli",
       "pluginName": "@memberjunction/cli",
       "pluginType": "core",
@@ -153,7 +153,7 @@
       "relativePath": [
         "dist",
         "commands",
-        "clean",
+        "codegen",
         "index.js"
       ]
     },
@@ -626,46 +626,6 @@
         "index.js"
       ]
     },
-    "migrate": {
-      "aliases": [],
-      "args": {},
-      "description": "Migrate MemberJunction database to latest version",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>\n"
-      ],
-      "flags": {
-        "verbose": {
-          "char": "v",
-          "description": "Enable additional logging",
-          "name": "verbose",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "tag": {
-          "char": "t",
-          "description": "Version tag to use for running remote migrations",
-          "name": "tag",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "migrate",
-      "pluginAlias": "@memberjunction/cli",
-      "pluginName": "@memberjunction/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "migrate",
-        "index.js"
-      ]
-    },
     "querygen:export": {
       "aliases": [],
       "args": {},
@@ -1892,6 +1852,46 @@
         "validate.js"
       ]
     },
+    "migrate": {
+      "aliases": [],
+      "args": {},
+      "description": "Migrate MemberJunction database to latest version",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>\n"
+      ],
+      "flags": {
+        "verbose": {
+          "char": "v",
+          "description": "Enable additional logging",
+          "name": "verbose",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "tag": {
+          "char": "t",
+          "description": "Version tag to use for running remote migrations",
+          "name": "tag",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "migrate",
+      "pluginAlias": "@memberjunction/cli",
+      "pluginName": "@memberjunction/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "migrate",
+        "index.js"
+      ]
+    },
     "ai:actions:list": {
       "aliases": [],
       "args": {},
@@ -2500,5 +2500,5 @@
       ]
     }
   },
-  "version": "3.1.1"
+  "version": "3.3.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/cli",
-  "version": "3.1.1",
+  "version": "3.3.0",
   "description": "MemberJunction command line tools",
   "keywords": [
     "oclif"
@@ -51,15 +51,15 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^5.0.1",
-    "@memberjunction/ai-cli": "3.1.1",
-    "@memberjunction/codegen-lib": "3.1.1",
-    "@memberjunction/config": "3.1.1",
-    "@memberjunction/core": "3.1.1",
-    "@memberjunction/db-auto-doc": "3.1.1",
-    "@memberjunction/metadata-sync": "3.1.1",
-    "@memberjunction/query-gen": "3.1.1",
-    "@memberjunction/sqlserver-dataprovider": "3.1.1",
-    "@memberjunction/testing-cli": "3.1.1",
+    "@memberjunction/ai-cli": "3.3.0",
+    "@memberjunction/codegen-lib": "3.3.0",
+    "@memberjunction/config": "3.3.0",
+    "@memberjunction/core": "3.3.0",
+    "@memberjunction/db-auto-doc": "3.3.0",
+    "@memberjunction/metadata-sync": "3.3.0",
+    "@memberjunction/query-gen": "3.3.0",
+    "@memberjunction/sqlserver-dataprovider": "3.3.0",
+    "@memberjunction/testing-cli": "3.3.0",
     "@oclif/core": "^3",
     "@oclif/plugin-help": "^6",
     "@oclif/plugin-version": "^2.0.17",