[401763] Make CDO Server more robust against data dictionary changes

https://bugs.eclipse.org/bugs/show_bug.cgi?id=401763

1 files changed, 13 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java
index 585e9a2dae..c788743f76 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/verifier/DBStoreVerifier.java
@@ -82,7 +82,7 @@ public abstract class DBStoreVerifier
 
     try
     {
-      return accessor.getConnection().createStatement();
+      return accessor.getDBTransaction().getConnection().createStatement();
     }
     catch (SQLException ex)
     {
@@ -307,8 +307,9 @@ public abstract class DBStoreVerifier
       String tableName = mapping.getDBTables().iterator().next().getName();
       TRACER.format("verifyUniqueIdVersion: {0} ...", tableName);
 
-      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + "," + IMappingConstants.ATTRIBUTES_VERSION + ", count(1) FROM "
-          + tableName + " GROUP BY " + IMappingConstants.ATTRIBUTES_ID + "," + IMappingConstants.ATTRIBUTES_VERSION;
+      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + "," + IMappingConstants.ATTRIBUTES_VERSION
+          + ", count(1) FROM " + tableName + " GROUP BY " + IMappingConstants.ATTRIBUTES_ID + ","
+          + IMappingConstants.ATTRIBUTES_VERSION;
 
       TRACER.format("  Executing SQL: {0} ", sql);
 
@@ -342,7 +343,8 @@ public abstract class DBStoreVerifier
       }
 
       String tableName = mapping.getDBTables().iterator().next().getName();
-      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", " + IMappingConstants.ATTRIBUTES_VERSION + " FROM " + tableName;
+      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", " + IMappingConstants.ATTRIBUTES_VERSION + " FROM "
+          + tableName;
 
       ArrayList<Pair<Long, Integer>> idVersions = new ArrayList<Pair<Long, Integer>>();
 
@@ -374,9 +376,9 @@ public abstract class DBStoreVerifier
 
       TRACER.format("verifyUniqueIdVersion: {0} for ID{1}v{2} ...", tableName, id, version);
 
-      String sql = "SELECT " + IMappingConstants.LIST_IDX + " FROM " + tableName + " WHERE " + IMappingConstants.LIST_REVISION_ID
-          + "=" + id + " AND " + IMappingConstants.LIST_REVISION_VERSION + "=" + version + " ORDER BY "
-          + IMappingConstants.LIST_IDX;
+      String sql = "SELECT " + IMappingConstants.LIST_IDX + " FROM " + tableName + " WHERE "
+          + IMappingConstants.LIST_REVISION_ID + "=" + id + " AND " + IMappingConstants.LIST_REVISION_VERSION + "="
+          + version + " ORDER BY " + IMappingConstants.LIST_IDX;
 
       TRACER.format("  Executing SQL: {0} ", sql);
 
@@ -490,7 +492,8 @@ public abstract class DBStoreVerifier
       }
 
       String tableName = mapping.getDBTables().iterator().next().getName();
-      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", " + IMappingConstants.ATTRIBUTES_VERSION + " FROM " + tableName;
+      String sql = "SELECT " + IMappingConstants.ATTRIBUTES_ID + ", " + IMappingConstants.ATTRIBUTES_VERSION + " FROM "
+          + tableName;
 
       ArrayList<Pair<Long, Integer>> idVersions = new ArrayList<Pair<Long, Integer>>();
 
@@ -519,8 +522,8 @@ public abstract class DBStoreVerifier
     private void verifyCorrectIndices(IListMapping refMapping, long id) throws Exception
     {
       String tableName = refMapping.getDBTables().iterator().next().getName();
-      String sql = "SELECT " + IMappingConstants.LIST_IDX + " FROM " + tableName + " WHERE " + IMappingConstants.LIST_REVISION_ID
-          + "=" + id + " ORDER BY " + IMappingConstants.LIST_IDX;
+      String sql = "SELECT " + IMappingConstants.LIST_IDX + " FROM " + tableName + " WHERE "
+          + IMappingConstants.LIST_REVISION_ID + "=" + id + " ORDER BY " + IMappingConstants.LIST_IDX;
 
       ResultSet resultSet = getStatement().executeQuery(sql);
       int indexShouldBe = 0;