From 298b2a991596737d4c2368b6fba544aef7271723 Mon Sep 17 00:00:00 2001
From: aboeckle <alexander.boeckle@frentix.com>
Date: Thu, 12 Mar 2020 09:59:57 +0100
Subject: [PATCH] OO-4454: Renamed upgrader for 15pre6
---
...LATUpgrade_15_pre_5.java => OLATUpgrade_15_pre_6.java} | 8 ++++----
.../org/olat/upgrade/_spring/databaseUpgradeContext.xml | 4 ++++
src/main/java/org/olat/upgrade/_spring/upgradeContext.xml | 2 +-
.../database/mysql/alter_15_pre_4_to_15_pre_5.sql | 3 ---
.../database/mysql/alter_15_pre_5_to_15_pre_6.sql | 2 ++
.../database/oracle/alter_15_pre_4_to_15_pre_5.sql | 3 ---
.../database/oracle/alter_15_pre_5_to_15_pre_6.sql | 2 ++
.../database/postgresql/alter_15_pre_4_to_15_pre_5.sql | 5 +----
.../database/postgresql/alter_15_pre_5_to_15_pre_6.sql | 2 ++
9 files changed, 16 insertions(+), 15 deletions(-)
rename src/main/java/org/olat/upgrade/{OLATUpgrade_15_pre_5.java => OLATUpgrade_15_pre_6.java} (97%)
create mode 100644 src/main/resources/database/mysql/alter_15_pre_5_to_15_pre_6.sql
create mode 100644 src/main/resources/database/oracle/alter_15_pre_5_to_15_pre_6.sql
create mode 100644 src/main/resources/database/postgresql/alter_15_pre_5_to_15_pre_6.sql
diff --git a/src/main/java/org/olat/upgrade/OLATUpgrade_15_pre_5.java b/src/main/java/org/olat/upgrade/OLATUpgrade_15_pre_6.java
similarity index 97%
rename from src/main/java/org/olat/upgrade/OLATUpgrade_15_pre_5.java
rename to src/main/java/org/olat/upgrade/OLATUpgrade_15_pre_6.java
index d1f3fdfb296..24032ba23bb 100644
--- a/src/main/java/org/olat/upgrade/OLATUpgrade_15_pre_5.java
+++ b/src/main/java/org/olat/upgrade/OLATUpgrade_15_pre_6.java
@@ -41,11 +41,11 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author aboeckle, alexander.boeckle@frentix.com, http://www.frentix.com
*
*/
-public class OLATUpgrade_15_pre_5 extends OLATUpgrade {
+public class OLATUpgrade_15_pre_6 extends OLATUpgrade {
- private static final Logger log = Tracing.createLoggerFor(OLATUpgrade_15_pre_5.class);
+ private static final Logger log = Tracing.createLoggerFor(OLATUpgrade_15_pre_6.class);
- private static final String VERSION = "OLAT_15.pre.5";
+ private static final String VERSION = "OLAT_15.pre.6";
private static final String CATALOG_ORDER_INDEX = "CATALOG ORDER INDEX";
private AtomicInteger migrationCounter = new AtomicInteger(0);
@@ -53,7 +53,7 @@ public class OLATUpgrade_15_pre_5 extends OLATUpgrade {
@Autowired
private DB dbInstance;
- public OLATUpgrade_15_pre_5() {
+ public OLATUpgrade_15_pre_6() {
super();
}
diff --git a/src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml b/src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
index a1153b816d4..4fe9adf4099 100644
--- a/src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
+++ b/src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
@@ -228,6 +228,10 @@
<constructor-arg index="0" value="OLAT_15.pre.5" />
<property name="alterDbStatements" value="alter_15_pre_4_to_15_pre_5.sql" />
</bean>
+ <bean id="database_upgrade_15_pre_6" class="org.olat.upgrade.DatabaseUpgrade">
+ <constructor-arg index="0" value="OLAT_15.pre.5" />
+ <property name="alterDbStatements" value="alter_15_pre_5_to_15_pre_6.sql" />
+ </bean>
</list>
</property>
</bean>
diff --git a/src/main/java/org/olat/upgrade/_spring/upgradeContext.xml b/src/main/java/org/olat/upgrade/_spring/upgradeContext.xml
index d84720f5498..3da015e50da 100644
--- a/src/main/java/org/olat/upgrade/_spring/upgradeContext.xml
+++ b/src/main/java/org/olat/upgrade/_spring/upgradeContext.xml
@@ -54,7 +54,7 @@
<bean id="upgrade_14_0_5" class="org.olat.upgrade.OLATUpgrade_14_0_5"/>
<bean id="upgrade_14_1_0" class="org.olat.upgrade.OLATUpgrade_14_1_0"/>
<bean id="upgrade_14_2_0" class="org.olat.upgrade.OLATUpgrade_14_2_0"/>
- <bean id="upgrade_15_pre_5" class="org.olat.upgrade.OLATUpgrade_15_pre_5"/><!-- because really quicker as pre.0 -->
+ <bean id="upgrade_15_pre_6" class="org.olat.upgrade.OLATUpgrade_15_pre_6"/><!-- because really quicker as pre.0 -->
<bean id="upgrade_15_pre_0" class="org.olat.upgrade.OLATUpgrade_15_pre_0"/>
</list>
</property>
diff --git a/src/main/resources/database/mysql/alter_15_pre_4_to_15_pre_5.sql b/src/main/resources/database/mysql/alter_15_pre_4_to_15_pre_5.sql
index 5056466300e..85636d7289f 100644
--- a/src/main/resources/database/mysql/alter_15_pre_4_to_15_pre_5.sql
+++ b/src/main/resources/database/mysql/alter_15_pre_4_to_15_pre_5.sql
@@ -1,6 +1,3 @@
-- grading
alter table o_grad_time_record add column g_metadata_time bigint default 0 not null;
-
--- CATALOG
-UPDATE o_catentry SET short_title = name;
\ No newline at end of file
diff --git a/src/main/resources/database/mysql/alter_15_pre_5_to_15_pre_6.sql b/src/main/resources/database/mysql/alter_15_pre_5_to_15_pre_6.sql
new file mode 100644
index 00000000000..3a7de8e9146
--- /dev/null
+++ b/src/main/resources/database/mysql/alter_15_pre_5_to_15_pre_6.sql
@@ -0,0 +1,2 @@
+-- CATALOG
+UPDATE o_catentry SET short_title = name;
\ No newline at end of file
diff --git a/src/main/resources/database/oracle/alter_15_pre_4_to_15_pre_5.sql b/src/main/resources/database/oracle/alter_15_pre_4_to_15_pre_5.sql
index 61ecdfa5277..525743addf1 100644
--- a/src/main/resources/database/oracle/alter_15_pre_4_to_15_pre_5.sql
+++ b/src/main/resources/database/oracle/alter_15_pre_4_to_15_pre_5.sql
@@ -1,5 +1,2 @@
-- grading
alter table o_grad_time_record add g_metadata_time number(20) default 0 not null;
-
--- CATALOG
-UPDATE o_catentry SET short_title = name;
\ No newline at end of file
diff --git a/src/main/resources/database/oracle/alter_15_pre_5_to_15_pre_6.sql b/src/main/resources/database/oracle/alter_15_pre_5_to_15_pre_6.sql
new file mode 100644
index 00000000000..3a7de8e9146
--- /dev/null
+++ b/src/main/resources/database/oracle/alter_15_pre_5_to_15_pre_6.sql
@@ -0,0 +1,2 @@
+-- CATALOG
+UPDATE o_catentry SET short_title = name;
\ No newline at end of file
diff --git a/src/main/resources/database/postgresql/alter_15_pre_4_to_15_pre_5.sql b/src/main/resources/database/postgresql/alter_15_pre_4_to_15_pre_5.sql
index 7ba20af08e2..bb50fc017ee 100644
--- a/src/main/resources/database/postgresql/alter_15_pre_4_to_15_pre_5.sql
+++ b/src/main/resources/database/postgresql/alter_15_pre_4_to_15_pre_5.sql
@@ -1,5 +1,2 @@
-- grading
-alter table o_grad_time_record add column g_metadata_time int8 default 0 not null;
-
--- CATALOG
-UPDATE o_catentry SET short_title = name;
\ No newline at end of file
+alter table o_grad_time_record add column g_metadata_time int8 default 0 not null;
\ No newline at end of file
diff --git a/src/main/resources/database/postgresql/alter_15_pre_5_to_15_pre_6.sql b/src/main/resources/database/postgresql/alter_15_pre_5_to_15_pre_6.sql
new file mode 100644
index 00000000000..3a7de8e9146
--- /dev/null
+++ b/src/main/resources/database/postgresql/alter_15_pre_5_to_15_pre_6.sql
@@ -0,0 +1,2 @@
+-- CATALOG
+UPDATE o_catentry SET short_title = name;
\ No newline at end of file
--
GitLab