|
@@ -11,6 +11,7 @@ import org.webbuilder.sql.support.MysqlDataBaseMetaData;
|
|
import org.webbuilder.sql.support.OracleDataBaseMetaData;
|
|
import org.webbuilder.sql.support.OracleDataBaseMetaData;
|
|
import org.webbuilder.sql.support.common.CommonDataBase;
|
|
import org.webbuilder.sql.support.common.CommonDataBase;
|
|
import org.webbuilder.sql.support.executor.SqlExecutor;
|
|
import org.webbuilder.sql.support.executor.SqlExecutor;
|
|
|
|
+import org.webbuilder.sql.validator.ValidatorFactory;
|
|
|
|
|
|
import javax.annotation.PostConstruct;
|
|
import javax.annotation.PostConstruct;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
@@ -26,9 +27,13 @@ import java.util.Map;
|
|
public class DataBaseAutoConfiguration {
|
|
public class DataBaseAutoConfiguration {
|
|
@Resource
|
|
@Resource
|
|
private SqlExecutor sqlExecutor;
|
|
private SqlExecutor sqlExecutor;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private DataSourceProperties properties;
|
|
private DataSourceProperties properties;
|
|
|
|
|
|
|
|
+ @Autowired(required = false)
|
|
|
|
+ private ValidatorFactory validatorFactory;
|
|
|
|
+
|
|
@PostConstruct
|
|
@PostConstruct
|
|
public void init() {
|
|
public void init() {
|
|
|
|
|
|
@@ -48,6 +53,8 @@ public class DataBaseAutoConfiguration {
|
|
|
|
|
|
if (dataBaseMetaData == null)
|
|
if (dataBaseMetaData == null)
|
|
dataBaseMetaData = new OracleDataBaseMetaData();
|
|
dataBaseMetaData = new OracleDataBaseMetaData();
|
|
|
|
+ if (validatorFactory != null)
|
|
|
|
+ dataBaseMetaData.setValidatorFactory(validatorFactory);
|
|
DataBase dataBase = new CommonDataBase(dataBaseMetaData, sqlExecutor);
|
|
DataBase dataBase = new CommonDataBase(dataBaseMetaData, sqlExecutor);
|
|
return dataBase;
|
|
return dataBase;
|
|
}
|
|
}
|