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 d1f3fdfb2963d1c73641bf2b796bc6e4d6257fa1..24032ba23bb5b4e93399e3111e06a543103f623e 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 a1153b816d450783e3b8d4634eb217d8ae1a9796..4fe9adf40997ac6dc5cc1baf6da33cd71205cf99 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 d84720f54986300e1e8efa09ee2ec5075d2d67ea..3da015e50dabc04a3130c369e14e88469001f57d 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 5056466300edac3af491ff0afeb6c5afd058b4b3..85636d7289f46d3fc5c924473f807575774ec67d 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 0000000000000000000000000000000000000000..3a7de8e9146c691ee489f5578a5d0109f99e8c85 --- /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 61ecdfa5277b7e25999ecb7cf748e4b322edba55..525743addf12b9a95b00bed635ef958ed49ef4e9 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 0000000000000000000000000000000000000000..3a7de8e9146c691ee489f5578a5d0109f99e8c85 --- /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 7ba20af08e226dda310bc62d46cb9a5c15a46726..bb50fc017ee0f88a3d5226a9b87710e98fef7b7f 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 0000000000000000000000000000000000000000..3a7de8e9146c691ee489f5578a5d0109f99e8c85 --- /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