modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/OperationScheduleIdSetterUpgradeTask.java
| 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 1312a57e987e5e9e94e5a59f9e431be4fe7f9dea
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Apr 29 14:50:34 2011 -0400
[BZ 700868 - RHQ3 ---> RHQ4 Upgrade error with Oracle]
remove terminating semi-colons in queries. oracle does not like this.
diff --git
a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/OperationScheduleIdSetterUpgradeTask.java
b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/OperationScheduleIdSetterUpgradeTask.java
index 58692c9..1d4c445 100644
---
a/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/OperationScheduleIdSetterUpgradeTask.java
+++
b/modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/OperationScheduleIdSetterUpgradeTask.java
@@ -38,23 +38,23 @@ public class OperationScheduleIdSetterUpgradeTask implements
DatabaseUpgradeTask
@Override
public void execute(DatabaseType databaseType, Connection connection) throws
SQLException {
- String selectSQL = "SELECT job_name FROM rhq_operation_schedule;";
+ String selectSQL = "SELECT job_name FROM rhq_operation_schedule";
System.out.println("Executing: " + selectSQL);
List<Object[]> results = databaseType.executeSelectSql(connection,
selectSQL);
Map<Long, String> sortedJobNames = new TreeMap<Long, String>();
for (Object[] result : results) {
- String jobName = (String)result[0]; // e.g.:
rhq-resource-10001--121207376-1292542028679
+ String jobName = (String) result[0]; // e.g.:
rhq-resource-10001--121207376-1292542028679
// last portion is the job's creation time, e.g.: 1292542028679
Long ctime = Long.valueOf(jobName.substring(jobName.lastIndexOf('-')
+ 1));
sortedJobNames.put(ctime, jobName);
}
int id = 10001;
for (String jobName : sortedJobNames.values()) {
- String updateSQL = "UPDATE rhq_operation_schedule SET id = " +
(id++) + " WHERE job_name = '" + jobName +
- "';";
+ String updateSQL = "UPDATE rhq_operation_schedule SET id = " +
(id++) + " WHERE job_name = '" + jobName
+ + "'";
System.out.println("Executing: " + updateSQL);
databaseType.executeSql(connection, updateSQL);
}
}
-
+
}
Show replies by date