[Geotools-commits] svn - r38491 - in trunk/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 07:40:54 -0800 (Mon, 16 Jan 2012)
New Revision: 38491

Modified:
   trunk/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java
   trunk/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: trunk/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java	2012-01-16 15:40:31 UTC (rev 38490)
+++ trunk/modules/plugin/jdbc/jdbc-sqlserver/src/main/java/org/geotools/data/sqlserver/SQLServerDataStoreFactory.java	2012-01-16 15:40:54 UTC (rev 38491)
@@ -60,8 +60,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")
@@ -92,4 +91,5 @@
         return url;
     }
 
+    
 }

Modified: trunk/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerTestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerTestSetup.java	2012-01-16 15:40:31 UTC (rev 38490)
+++ trunk/modules/plugin/jdbc/jdbc-sqlserver/src/test/java/org/geotools/data/sqlserver/SQLServerTestSetup.java	2012-01-16 15:40:54 UTC (rev 38491)
@@ -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;
@@ -86,5 +87,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");
+    }   
 
 }