[Geotools-commits] svn - r38496 - in branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src: main/java/org/geotools/data/sqlserver test/java/org/geotools/data/sqlserver

[<svn...@os...>]

Author: aaime
Date: 2012-01-16 10:26:12 -0800 (Mon, 16 Jan 2012)
New Revision: 38496

Modified:
   branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java
   branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerTestSetup.java
Log:
[GEOT-4016] Add validation query to sql server store

Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java	2012-01-16 18:25:49 UTC (rev 38495)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java	2012-01-16 18:26:12 UTC (rev 38496)
@@ -59,8 +59,7 @@
 
     @Override
     protected String getValidationQuery() {
-        // no known way to validate a connection, if you know any, please advise
-        return null;
+        return "select 1";
     }
     
     @SuppressWarnings("unchecked")
@@ -91,4 +90,5 @@
         return url;
     }
 
+    
 }

Modified: branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerTestSetup.java
===================================================================
--- branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerTestSetup.java	2012-01-16 18:25:49 UTC (rev 38495)
+++ branches/2.7.x/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerTestSetup.java	2012-01-16 18:26:12 UTC (rev 38496)
@@ -18,6 +18,7 @@
 
 import java.util.Properties;
 
+import org.apache.commons.dbcp.BasicDataSource;
 import org.geotools.jdbc.JDBCDataStore;
 import org.geotools.jdbc.JDBCDataStoreFactory;
 import org.geotools.jdbc.JDBCTestSetup;
@@ -81,5 +82,11 @@
             + "geometry::STGeomFromText('POINT(2 2)',4326), 2, 2.2,'two');";
         run(sql);
     }
+    
+    @Override
+    protected void initializeDataSource(BasicDataSource ds, Properties db) {
+        super.initializeDataSource(ds, db);
+        ds.setValidationQuery("select 1");
+    }   
 
 }