[Hyperic-hq-discuss] hq r14286 - trunk/installer/src/org/hyperic

[<tr...@hy...>]

Author: trader
Date: 2010-02-12 13:36:23 -0800 (Fri, 12 Feb 2010)
New Revision: 14286
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14286

Modified:
   trunk/installer/src/org/hyperic/HQMain.java
Log:
HPD-171, HHQ-3514: DB Connections don't do any validation
Oracle fix: mistakenly assumed Oracle databases all had the same server.database property "Oracle" but in fact it could be any of { Oracle8, Oracle9i, ...}
New fix: check to see if the property exists and starts with "Oracle" -- if so, change the validation sql.

Modified: trunk/installer/src/org/hyperic/HQMain.java
===================================================================
--- trunk/installer/src/org/hyperic/HQMain.java	2010-02-12 21:17:45 UTC (rev 14285)
+++ trunk/installer/src/org/hyperic/HQMain.java	2010-02-12 21:36:23 UTC (rev 14286)
@@ -119,7 +119,8 @@
             // Database connection validation: "select 1" except in the case of Oracle,
             // where it's "select 1 from dual"
             String validationSQL = "select 1";
-            if ("Oracle".equals(symbols.getProperty("server.database"))) {
+            String dbProp = symbols.getProperty("server.database");
+            if (dbProp != null && dbProp.startsWith("Oracle")) {
                 validationSQL += " from dual";
             }
             symbols.setProperty("server.connection-validation-sql", validationSQL);