[Hyperic-hq-discuss] hq r14272 - in trunk/installer: data/hq-engine src/org/hyperic

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

Author: trader
Date: 2010-02-09 17:28:47 -0800 (Tue, 09 Feb 2010)
New Revision: 14272
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14272

Modified:
   trunk/installer/data/hq-engine/hq-ds.xml
   trunk/installer/src/org/hyperic/HQMain.java
Log:
HPD-171, HHQ-3514: DB Connections don't do any validation

Modified: trunk/installer/data/hq-engine/hq-ds.xml
===================================================================
--- trunk/installer/data/hq-engine/hq-ds.xml	2010-02-10 01:11:37 UTC (rev 14271)
+++ trunk/installer/data/hq-engine/hq-ds.xml	2010-02-10 01:28:47 UTC (rev 14272)
@@ -18,6 +18,7 @@
     <!-- look at your Driver docs to see what these might be -->
     <connection-property name="char.encoding">UTF-8</connection-property>
     <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+    <check-valid-connection-sql>@@@server.connection-validation-sql@@@</check-valid-connection-sql>
 
     <!--pooling parameters-->
     <min-pool-size>@@@server.database-minpoolsize@@@</min-pool-size>

Modified: trunk/installer/src/org/hyperic/HQMain.java
===================================================================
--- trunk/installer/src/org/hyperic/HQMain.java	2010-02-10 01:11:37 UTC (rev 14271)
+++ trunk/installer/src/org/hyperic/HQMain.java	2010-02-10 01:28:47 UTC (rev 14272)
@@ -115,6 +115,15 @@
                 symbols.setProperty("server.database-url",
                                     jdbcUrl + "?protocolVersion=2");
             }
+            
+            // 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"))) {
+                validationSQL += " from dual";
+            }
+            symbols.setProperty("server.connection-validation-sql", validationSQL);
+            
         } finally {
             if (fi != null) fi.close();
         }