diff --git a/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java b/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java index ed35dcb..de2d65a 100644 --- a/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java +++ b/src/main/java/tech/ailef/dbadmin/external/DbAdminAutoConfiguration.java @@ -35,13 +35,17 @@ import tech.ailef.dbadmin.internal.InternalDbAdminConfiguration; @Import(InternalDbAdminConfiguration.class) public class DbAdminAutoConfiguration { @Autowired - Environment env; + private DbAdminProperties props; @Bean public DataSource internalDataSource() { DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create(); dataSourceBuilder.driverClassName("org.h2.Driver"); - dataSourceBuilder.url("jdbc:h2:file:./dbadmin_internal"); + if (props.isTestMode()) + dataSourceBuilder.url("jdbc:h2:mem:test"); + else + dataSourceBuilder.url("jdbc:h2:file:./dbadmin_internal"); + dataSourceBuilder.username("sa"); dataSourceBuilder.password("password"); return dataSourceBuilder.build(); diff --git a/src/main/java/tech/ailef/dbadmin/external/DbAdminProperties.java b/src/main/java/tech/ailef/dbadmin/external/DbAdminProperties.java index eeef629..c2e3544 100644 --- a/src/main/java/tech/ailef/dbadmin/external/DbAdminProperties.java +++ b/src/main/java/tech/ailef/dbadmin/external/DbAdminProperties.java @@ -26,6 +26,8 @@ public class DbAdminProperties { */ private String modelsPackage; + private boolean testMode = false; + public boolean isEnabled() { return enabled; } @@ -50,11 +52,20 @@ public class DbAdminProperties { this.modelsPackage = modelsPackage; } + public boolean isTestMode() { + return testMode; + } + + public void setTestMode(boolean testMode) { + this.testMode = testMode; + } + public Map toMap() { Map conf = new HashMap<>(); conf.put("enabled", enabled + ""); conf.put("baseUrl", baseUrl); conf.put("modelsPackage", modelsPackage); + conf.put("testMode", testMode + ""); return conf; } diff --git a/src/main/resources/templates/logs.html b/src/main/resources/templates/logs.html index 9ca5bb0..dedc8fb 100644 --- a/src/main/resources/templates/logs.html +++ b/src/main/resources/templates/logs.html @@ -37,13 +37,14 @@ Item ID +