improved error message per #3804, #2797

jeremylong · Sep 11, 2020 · 1e44963 · 1e44963
1 parent 1d0d331
commit 1e44963
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java b/core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java
@@ -367,6 +367,9 @@ private void updateSchema(Connection conn, DependencyVersion appExpectedVersion,
                     DBUtils.closeStatement(statement);
                 }
             } catch (IllegalArgumentException | IOException ex) {
+                if ("data/upgrade_4.2.sql".equals(updateFile)) {
+                    throw new DatabaseException("unable to upgrade the database schema - please run the dependency-check purge command to remove the existing database");
+                }
                 final String msg = String.format("Upgrade SQL file does not exist: %s", updateFile);
                 throw new DatabaseException(msg, ex);
             }