Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Mar 15, 2022 · f05913a · f05913a
2 parents 2cf62fc + ea7eb7b
commit f05913a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...t/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqaleRepositoryBeanConfig.java b/...t/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqaleRepositoryBeanConfig.java
@@ -82,7 +82,7 @@ public SqaleRepositoryService repositoryService(
      * No need to clean up the cache tables, only the main and audit tables are cleared.
      */
     public void clearDatabase(SqaleRepoContext sqlRepoContext) {
-        LOGGER.info("Postprocessing session factory - removing everything from database if necessary.");
+        LOGGER.info("Clearing the testing database!");
         try (JdbcSession jdbcSession = sqlRepoContext.newJdbcSession().startTransaction()) {
             // Truncate cascades to sub-rows of the "object aggregate" - if FK points to m_object table hierarchy.
             jdbcSession.executeStatement("TRUNCATE m_object CASCADE;");

diff --git a/...l-impl/src/main/java/com/evolveum/midpoint/repo/sql/schemacheck/SchemaActionComputer.java b/...l-impl/src/main/java/com/evolveum/midpoint/repo/sql/schemacheck/SchemaActionComputer.java
@@ -40,7 +40,7 @@ class SchemaActionComputer {
      * For database schema versioning please see
      * <a href="https://docs.evolveum.com/midpoint/reference/repository/database-schema-versioning/">wiki page about DB versioning</a>.
      */
-    public static final String REQUIRED_DATABASE_SCHEMA_VERSION = "4.4";
+    public static final String REQUIRED_DATABASE_SCHEMA_VERSION = "4.5";
 
     private static final Trace LOGGER = TraceManager.getTrace(SchemaActionComputer.class);
 
@@ -57,7 +57,8 @@ class SchemaActionComputer {
                     new ImmutablePair<>("3.9", "4.0"),
                     new ImmutablePair<>("4.0", "4.2"),
                     new ImmutablePair<>("4.2", "4.3"),
-                    new ImmutablePair<>("4.3", "4.4")));
+                    new ImmutablePair<>("4.3", "4.4"),
+                    new ImmutablePair<>("4.4", "4.5")));
 
     enum State {
         COMPATIBLE, NO_TABLES, AUTOMATICALLY_UPGRADEABLE, MANUALLY_UPGRADEABLE, INCOMPATIBLE