fix SortIndexUpdater bug for missing @id replacement

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SortIndexUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SortIndexUpdater.java
index 42811b01950f8b8d896528aa5ca27de6b114cc2f..8b752973b72dbc2e8d21493a50a3999d339b2e33 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SortIndexUpdater.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SortIndexUpdater.java
@@ -95,15 +95,16 @@ public class SortIndexUpdater extends SchemaUpdaterStepBase<SortIndexUpdater> {
         * @throws SQLException\r
         */\r
        private Map<Integer, Set<Integer>> makeIndexMap(String tableName, ICdmDataSource datasource) throws SQLException {\r
-               String resulsetQuery = "SELECT @id as id, @parentColumn " +\r
+               String resultsetQuery = "SELECT @id as id, @parentColumn " +\r
                                " FROM @tableName " +\r
                                " WHERE @parentColumn IS NOT NULL " +\r
-                               " ORDER BY @parentColumn,    @sorted";\r
-               resulsetQuery = resulsetQuery.replace("@tableName", tableName);\r
-               resulsetQuery = resulsetQuery.replace("@parentColumn", parentColumn);\r
-               resulsetQuery = resulsetQuery.replace("@sorted", currentSortColumn);\r
+                               " ORDER BY @parentColumn, @sorted";\r
+               resultsetQuery = resultsetQuery.replace("@id", idColumn);\r
+               resultsetQuery = resultsetQuery.replace("@tableName", tableName);\r
+               resultsetQuery = resultsetQuery.replace("@parentColumn", parentColumn);\r
+               resultsetQuery = resultsetQuery.replace("@sorted", currentSortColumn);\r
 \r
-               ResultSet rs = datasource.executeQuery(resulsetQuery);\r
+               ResultSet rs = datasource.executeQuery(resultsetQuery);\r
                Integer index = baseValue;\r
                int oldParentId = -1;\r
 \r