注释完善

Author: core-lib

src/main/java/io/sqlman/spring/JdbcManagerConfiguration.java

@@ -3,6 +3,7 @@
 import io.sqlman.SqlDialectSupport;
 import io.sqlman.SqlScriptResolver;
 import io.sqlman.SqlSourceProvider;
+import io.sqlman.SqlVersionManager;
 import io.sqlman.manager.JdbcIsolation;
 import io.sqlman.manager.JdbcVersionManager;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -42,21 +43,19 @@ public class JdbcManagerConfiguration {
     private SqlDialectSupport dialectSupport;
 
     @Bean
-    @ConditionalOnMissingBean
+    @ConditionalOnMissingBean(SqlVersionManager.class)
     @ConditionalOnProperty(prefix = "sqlman", name = "enabled", havingValue = "true", matchIfMissing = true)
-    public JdbcVersionManager sqlmanBasicVersionManager(ApplicationContext applicationContext) throws Exception {
-        Map<String, DataSource> dataSources = applicationContext.getBeansOfType(DataSource.class);
-        if (dataSources.isEmpty()) {
+    public JdbcVersionManager sqlmanBasicVersionManager(ApplicationContext applicationContext) {
+        Map<String, DataSource> map = applicationContext.getBeansOfType(DataSource.class);
+        if (map.isEmpty()) {
             throw new IllegalStateException("no dataSource found in application context");
         }
-        DataSource dataSource = dataSources.size() == 1 ? dataSources.values().iterator().next() : dataSources.get(properties.getDataSource());
+        DataSource dataSource = map.size() == 1 ? map.values().iterator().next() : map.get(properties.getDataSource());
         if (dataSource == null) {
             throw new IllegalStateException("no dataSource found in application context named: " + properties.getDataSource());
         }
         JdbcIsolation jdbcIsolation = properties.getJdbcIsolation();
-        JdbcVersionManager jdbcVersionManager = new JdbcVersionManager(dataSource, jdbcIsolation, scriptProvider, scriptResolver, dialectSupport);
-        jdbcVersionManager.upgrade();
-        return jdbcVersionManager;
+        return new JdbcVersionManager(dataSource, jdbcIsolation, scriptProvider, scriptResolver, dialectSupport);
     }
 
 }

src/main/resources/META-INF/spring.factories

@@ -6,4 +6,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   io.sqlman.spring.dialect.MySQLDialectConfiguration,\
   io.sqlman.spring.dialect.SQLiteDialectConfiguration,\
   io.sqlman.spring.dialect.OracleDialectConfiguration,\
-  io.sqlman.spring.dialect.SQLServerDialectConfiguration
+  io.sqlman.spring.dialect.SQLServerDialectConfiguration

src/test/java/io/sqlman/spring/SqlmanTestApplication.java

@@ -1,7 +1,18 @@
 package io.sqlman.spring;
 
+import io.sqlman.*;
+import io.sqlman.manager.JdbcVersionManager;
+import io.sqlman.provider.ClasspathSourceProvider;
+import io.sqlman.resolver.DruidScriptResolver;
+import io.sqlman.strategy.StandardNamingStrategy;
+import io.sqlman.support.MySQLDialectSupport;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
 
 /**
  * Sqlman测试应用
@@ -16,4 +27,32 @@ public static void main(String... args) {
         SpringApplication.run(SqlmanTestApplication.class);
     }
 
+    @Bean
+    public SqlNamingStrategy sqlNamingStrategy() {
+        return new StandardNamingStrategy();
+    }
+
+    @Bean
+    public SqlSourceProvider sqlSourceProvider() {
+        return new ClasspathSourceProvider();
+    }
+
+    @Bean
+    public SqlScriptResolver sqlScriptResolver() {
+        return new DruidScriptResolver();
+    }
+
+    @Bean
+    public SqlDialectSupport sqlDialectSupport() {
+        return new MySQLDialectSupport();
+    }
+
+    @Bean
+    public SqlVersionManager sqlVersionManager(ApplicationContext applicationContext) throws SQLException {
+        DataSource dataSource = applicationContext.getBean(DataSource.class);
+        JdbcVersionManager jdbcVersionManager = new JdbcVersionManager(dataSource);
+        jdbcVersionManager.upgrade();
+        return jdbcVersionManager;
+    }
+
 }

src/test/resources/application.yml

@@ -17,6 +17,7 @@ sqlman:
     location: sqlman/**/*.sql
     provider: classpath
     resolver: druid
+    dialect: MySQL
   dialect:
     table: SQLMAN_VERSION
-    type: Oracle
+    type: MySQL