From: Andreas Müller <a.mueller@bgbm.org>
Date: Mon, 5 Dec 2016 12:59:51 +0000 (+0100)
Subject: fix SortIndexUpdater bug for missing @id replacement
X-Git-Tag: 4.4.0^2~1
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/503d9f4c84ab9bbbea6144b9b3076a04b60e5e95

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 42811b0195..8b752973b7 100644
--- 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
 	 */
 	private Map<Integer, Set<Integer>> makeIndexMap(String tableName, ICdmDataSource datasource) throws SQLException {
-		String resulsetQuery = "SELECT @id as id, @parentColumn " +
+		String resultsetQuery = "SELECT @id as id, @parentColumn " +
 				" FROM @tableName " +
 				" WHERE @parentColumn IS NOT NULL " +
-				" ORDER BY @parentColumn,    @sorted";
-		resulsetQuery = resulsetQuery.replace("@tableName", tableName);
-		resulsetQuery = resulsetQuery.replace("@parentColumn", parentColumn);
-		resulsetQuery = resulsetQuery.replace("@sorted", currentSortColumn);
+				" ORDER BY @parentColumn, @sorted";
+		resultsetQuery = resultsetQuery.replace("@id", idColumn);
+		resultsetQuery = resultsetQuery.replace("@tableName", tableName);
+		resultsetQuery = resultsetQuery.replace("@parentColumn", parentColumn);
+		resultsetQuery = resultsetQuery.replace("@sorted", currentSortColumn);
 
-		ResultSet rs = datasource.executeQuery(resulsetQuery);
+		ResultSet rs = datasource.executeQuery(resultsetQuery);
 		Integer index = baseValue;
 		int oldParentId = -1;