From 8c2b2070c6ba986ec18ae0055904c97fdbbf45e4 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Mon, 12 Oct 2015 05:53:07 -0400 Subject: [PATCH] added URL to database upgrade page --- .../data/nvdcve/ConnectionFactory.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java index d92e65749..798deb750 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java @@ -29,6 +29,7 @@ import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.logging.Level; import org.owasp.dependencycheck.utils.DBUtils; import org.owasp.dependencycheck.utils.DependencyVersion; import org.owasp.dependencycheck.utils.DependencyVersionUtil; @@ -60,6 +61,10 @@ public final class ConnectionFactory { * Resource location for SQL file used to create the database schema. */ public static final String DB_STRUCTURE_UPDATE_RESOURCE = "data/upgrade_%s.sql"; + /** + * The URL that discusses upgrading non-H2 databases. + */ + public static final String UPGRADE_HELP_URL = "http://jeremylong.github.io/DependencyCheck/data/upgrade.html"; /** * The database driver used to connect to the database. */ @@ -290,7 +295,12 @@ public final class ConnectionFactory { * @throws DatabaseException thrown if there is an exception upgrading the database schema */ private static void updateSchema(Connection conn, String schema) throws DatabaseException { - final String databaseProductName = conn.getMetaData().getDatabaseProductName(); + final String databaseProductName; + try { + databaseProductName = conn.getMetaData().getDatabaseProductName(); + } catch (SQLException ex) { + throw new DatabaseException("Unable to get the database product name"); + } if ("h2".equalsIgnoreCase(databaseProductName)) { LOGGER.debug("Updating database structure"); InputStream is;