[Hyperic-hq-discuss] hq r14512 - trunk/tools/dbmigrate/src

[<sc...@hy...>]

Author: scottmf
Date: 2010-04-16 11:40:59 -0700 (Fri, 16 Apr 2010)
New Revision: 14512
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14512

Modified:
   trunk/tools/dbmigrate/src/DatabaseExport.java
Log:
cleanup code

Modified: trunk/tools/dbmigrate/src/DatabaseExport.java
===================================================================
--- trunk/tools/dbmigrate/src/DatabaseExport.java	2010-04-16 08:03:56 UTC (rev 14511)
+++ trunk/tools/dbmigrate/src/DatabaseExport.java	2010-04-16 18:40:59 UTC (rev 14512)
@@ -32,7 +32,6 @@
 
 public class DatabaseExport {
     private static Map<String, Long> _seqMap = new HashMap<String, Long>();
-    private static String _url;
     private static List<String> _tables;
     private static String _workingDir;
     private static boolean _debug;
@@ -273,21 +272,25 @@
     }
 
     private static Connection getConnectionExport() throws Exception {
-        _url = _sourceUrl + "?protocolVersion=2";
+        String url = (_sourceUrl.contains("?")) ?
+            _sourceUrl + "&protocolVersion=2" :
+            _sourceUrl + "?protocolVersion=2";
         Driver driver = (Driver)Class.forName("org.postgresql.Driver").newInstance();
         Properties props = new Properties();
         props.setProperty("user",_sourceUser);
         props.setProperty("password",_sourcePass);
-        return driver.connect(_url, props);
+        return driver.connect(url, props);
     }
 
     private static Connection getConnectionImport() throws Exception {
-        _url = _targetUrl + "?rewriteBatchedStatements=true&sessionVariables=FOREIGN_KEY_CHECKS=0";
+        String url = (_targetUrl.contains("?")) ?
+            _targetUrl + "&rewriteBatchedStatements=true&sessionVariables=FOREIGN_KEY_CHECKS=0" :
+            _targetUrl + "?rewriteBatchedStatements=true&sessionVariables=FOREIGN_KEY_CHECKS=0";
         Driver driver = (Driver)Class.forName("com.mysql.jdbc.Driver").newInstance();
         Properties props = new Properties();
         props.setProperty("user",_targetUser);
         props.setProperty("password",_targetPass);
-        return driver.connect(_url, props);
+        return driver.connect(url, props);
     }
 
     private static Collection<BigTable> getBigTables()