Cleanup.

h2/src/test/org/h2/test/db/TestShow.java

@@ -14,7 +14,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 
 /**
- * Test of compatibility for the SHOW statement 
+ * Test of compatibility for the SHOW statement.
  */
 public class TestShow extends TestBase {
 

h2/src/test/org/h2/test/db/TestSpatial.java

@@ -41,21 +41,25 @@ public class TestSpatial extends TestBase {
         Connection conn = getConnection("spatial");
         Statement stat = conn.createStatement();
 
-        stat.execute("create memory table test(id int primary key, poly geometry)");
+        stat.execute("create memory table test(id int primary key, polygon geometry)");
         stat.execute("insert into test values(1, 'POLYGON ((1 1, 1 2, 2 2, 1 1))')");
         ResultSet rs = stat.executeQuery("select * from test");
         assertTrue(rs.next());
         assertEquals(1, rs.getInt(1));
         assertEquals("POLYGON ((1 1, 1 2, 2 2, 1 1))", rs.getString(2));
         GeometryFactory f = new GeometryFactory();
-        Polygon poly = f.createPolygon(new Coordinate[] { new Coordinate(1,1), new Coordinate(1,2), new Coordinate(2,2), new Coordinate(1, 1) });
-        assertTrue(poly.equals(rs.getObject(2)));
-       
-        rs = stat.executeQuery("select * from test where poly = 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
+        Polygon polygon = f.createPolygon(new Coordinate[] {
+                new Coordinate(1, 1),
+                new Coordinate(1, 2),
+                new Coordinate(2, 2),
+                new Coordinate(1, 1) });
+        assertTrue(polygon.equals(rs.getObject(2)));
+
+        rs = stat.executeQuery("select * from test where polygon = 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
         assertTrue(rs.next());
         assertEquals(1, rs.getInt(1));
-        stat.executeQuery("select * from test where poly > 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
-        stat.executeQuery("select * from test where poly < 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
+        stat.executeQuery("select * from test where polygon > 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
+        stat.executeQuery("select * from test where polygon < 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
 
         stat.execute("drop table test");
         conn.close();
@@ -68,27 +72,27 @@ public class TestSpatial extends TestBase {
         Connection conn = getConnection("spatialIndex");
         Statement stat = conn.createStatement();
 
-        stat.execute("create memory table test(id int primary key, poly geometry)");
-        stat.execute("create spatial index idx_test_poly on test(poly)");
+        stat.execute("create memory table test(id int primary key, polygon geometry)");
+        stat.execute("create spatial index idx_test_polygon on test(polygon)");
         stat.execute("insert into test values(1, 'POLYGON ((1 1, 1 2, 2 2, 1 1))')");
 
-        ResultSet rs = stat.executeQuery("explain select * from test where poly = 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
+        ResultSet rs = stat.executeQuery("explain select * from test where polygon = 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
         rs.next();
-        assertContains(rs.getString(1), "/* PUBLIC.IDX_TEST_POLY: POLY =");
+        assertContains(rs.getString(1), "/* PUBLIC.IDX_TEST_POLYGON: POLYGON =");
 
-        // these queries actually have no meaning in the context of a spatial index, but 
-        // check them anyhow
-        stat.executeQuery("select * from test where poly = 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
-        stat.executeQuery("select * from test where poly > 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
-        stat.executeQuery("select * from test where poly < 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
+        // these queries actually have no meaning in the context of a spatial index,
+        // just check that the query works
+        stat.executeQuery("select * from test where polygon = 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
+        stat.executeQuery("select * from test where polygon > 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
+        stat.executeQuery("select * from test where polygon < 'POLYGON ((1 1, 1 2, 2 2, 1 1))'");
 
-        rs = stat.executeQuery("select * from test where intersects(poly, 'POLYGON ((1 1, 1 2, 2 2, 1 1))')");
+        rs = stat.executeQuery("select * from test where intersects(polygon, 'POLYGON ((1 1, 1 2, 2 2, 1 1))')");
         assertTrue(rs.next());
 
-        rs = stat.executeQuery("select * from test where intersects(poly, 'POINT (1 1)')");
+        rs = stat.executeQuery("select * from test where intersects(polygon, 'POINT (1 1)')");
         assertTrue(rs.next());
 
-        rs = stat.executeQuery("select * from test where intersects(poly, 'POINT (0 0)')");
+        rs = stat.executeQuery("select * from test where intersects(polygon, 'POINT (0 0)')");
         assertFalse(rs.next());
 
         stat.execute("drop table test");