Skip to content

Commit

Permalink
Fix automatic Activiti DB creation for H2
Browse files Browse the repository at this point in the history
H2 scripts does not cover Activiti tables because they are in
a separate database. So we must treat this case separately when
dealing with missingSchemaAction=CREATE.
  • Loading branch information
mederly committed Aug 8, 2018
1 parent 4ffbb32 commit fefffc6
Showing 1 changed file with 6 additions and 1 deletion.
Expand Up @@ -36,6 +36,9 @@
import javax.annotation.PostConstruct;
import java.util.*;

import static com.evolveum.midpoint.repo.sql.SqlRepositoryConfiguration.Database.H2;
import static com.evolveum.midpoint.repo.sql.SqlRepositoryConfiguration.MissingSchemaAction.CREATE;

/**
*
* @author Pavol Mederly
Expand Down Expand Up @@ -150,7 +153,9 @@ void initialize() {
LOGGER.info("Activiti database is at " + jdbcUrl + " (a JDBC URL)");
}

boolean defaultSchemaUpdate = sqlConfig == null || "update".equals(sqlConfig.getHibernateHbm2ddl());
boolean defaultSchemaUpdate = sqlConfig == null ||
"update".equals(sqlConfig.getHibernateHbm2ddl()) ||
sqlConfig.getDatabase() == H2 && sqlConfig.getMissingSchemaAction() == CREATE; // this is an approximation
activitiSchemaUpdate = c.getBoolean(KEY_ACTIVITI_SCHEMA_UPDATE, defaultSchemaUpdate);
LOGGER.info("Activiti automatic schema update: {}", activitiSchemaUpdate);

Expand Down

0 comments on commit fefffc6

Please sign in to comment.