[Geotools-commits] svn - r38725 - in trunk/modules/plugin/jdbc: jdbc-h2/src/test/java/org/geotools/data/h2 jdbc-postgis/src/test/java/org/geotools/data/postgis

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

Author: aaime
Date: 2012-05-14 23:25:34 -0700 (Mon, 14 May 2012)
New Revision: 38725

Modified:
   trunk/modules/plugin/jdbc/jdbc-h2/src/test/java/org/geotools/data/h2/H2EmptyGeometryTestSetup.java
   trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGISEmptyGeometryTestSetup.java
Log:
Removing order dependency from jdbc build

Modified: trunk/modules/plugin/jdbc/jdbc-h2/src/test/java/org/geotools/data/h2/H2EmptyGeometryTestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-h2/src/test/java/org/geotools/data/h2/H2EmptyGeometryTestSetup.java	2012-05-15 06:24:30 UTC (rev 38724)
+++ trunk/modules/plugin/jdbc/jdbc-h2/src/test/java/org/geotools/data/h2/H2EmptyGeometryTestSetup.java	2012-05-15 06:25:34 UTC (rev 38725)
@@ -55,6 +55,12 @@
 
 	@Override
 	protected void dropEmptyGeometryTable() throws Exception {
+         run("CALL DropGeometryColumn('geotools', 'empty', 'geom_point')");
+         run("CALL DropGeometryColumn('geotools', 'empty', 'geom_linestring')");
+         run("CALL DropGeometryColumn('geotools', 'empty', 'geom_polygon')");
+         run("CALL DropGeometryColumn('geotools', 'empty', 'geom_multipoint')");
+         run("CALL DropGeometryColumn('geotools', 'empty', 'geom_multilinestring')");
+         run("CALL DropGeometryColumn('geotools', 'empty', 'geom_multipolygon')");
 		 run( "DROP TABLE \"geotools\".\"empty\"");
 		
 	}

Modified: trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGISEmptyGeometryTestSetup.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGISEmptyGeometryTestSetup.java	2012-05-15 06:24:30 UTC (rev 38724)
+++ trunk/modules/plugin/jdbc/jdbc-postgis/src/test/java/org/geotools/data/postgis/PostGISEmptyGeometryTestSetup.java	2012-05-15 06:25:34 UTC (rev 38725)
@@ -55,6 +55,7 @@
 
 	@Override
 	protected void dropEmptyGeometryTable() throws Exception {
+	     runSafe("DELETE GEOMETRY_COLUMNS WHERE F_TABLE_NAME = 'empty'");
 		 run( "DROP TABLE \"empty\"");
 		
 	}