Merge pull request #1620 from running-elephant/dev

Sync Dev into Master
running-elephant · Jul 12, 2022 · 796c7ca · 796c7ca
2 parents a8228e4 + eee0cfa
commit 796c7ca
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 17 deletions.
diff --git a/bin/h2/datart.demo.mv.db b/bin/h2/datart.demo.mv.db
diff --git a/config/profiles/application-config.yml b/config/profiles/application-config.yml
@@ -80,6 +80,8 @@ server:
     keyAlias: tomcat
 
 datart:
+  migration:
+    enable: true # 是否开启数据库自动升级
   server:
     address: ${datart.address:http://127.0.0.1:8080}
 

diff --git a/...ta-provider-base/src/main/java/datart/data/provider/calcite/dialect/CustomSqlDialect.java b/...ta-provider-base/src/main/java/datart/data/provider/calcite/dialect/CustomSqlDialect.java
@@ -56,7 +56,8 @@ private static Context createContext(JdbcDriverInfo driverInfo) {
     public void unparseOffsetFetch(SqlWriter writer, SqlNode offset, SqlNode fetch) {
         if (driverInfo.getSupportSqlLimit() != null && driverInfo.getSupportSqlLimit()) {
             unparseFetchUsingLimit(writer, offset, fetch);
+        } else {
+            super.unparseOffsetFetch(writer, offset, fetch);
         }
-        super.unparseOffsetFetch(writer, offset, fetch);
     }
 }
diff --git a/...viders/jdbc-data-provider/src/test/java/datart/data/provider/sql/SqlScriptRenderTest.java b/...viders/jdbc-data-provider/src/test/java/datart/data/provider/sql/SqlScriptRenderTest.java
@@ -36,13 +36,15 @@
 import org.apache.calcite.sql.fun.SqlStdOperatorTable;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.apache.calcite.sql.parser.SqlParserPos;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.List;
 
 @SpringBootTest(classes = DataProviderTestApplication.class)
 @Slf4j
+@Disabled
 public class SqlScriptRenderTest {
 
     private static final String T = "DATART_VTABLE";

diff --git a/server/src/main/java/datart/server/config/CustomPropertiesValidate.java b/server/src/main/java/datart/server/config/CustomPropertiesValidate.java
@@ -14,6 +14,7 @@
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.data.util.ReflectionUtils;
 
@@ -101,21 +102,42 @@ private String getConfigName(Class clazz, String fieldName) {
     }
 
     private void switchProfile(ConfigurableEnvironment environment) {
-        String url = getDefaultDBUrl(environment);
-        if (url == null || (url.contains("null") && environment.getProperty(CONFIG_DATABASE_URL) == null)) {
-            environment.setActiveProfiles("demo");
-            System.err.println("【********* Invalid database configuration. Datart is running in demo mode *********】");
+        try {
+            String url = getDefaultDBUrl(environment);
+            if (url == null || (url.contains("null") && environment.getProperty(CONFIG_DATABASE_URL) == null)) {
+                environment.setActiveProfiles("demo");
+                // remove default config propertySource
+                String defaultConfig = null;
+                for (PropertySource<?> propertySource : environment.getPropertySources()) {
+                    if (propertySource.getName().contains("application-config")) {
+                        defaultConfig = propertySource.getName();
+                    }
+                }
+                if (defaultConfig != null) {
+                    environment.getPropertySources().remove(defaultConfig);
+                }
+                // add demo propertySource
+                List<PropertySource<?>> propertySources = new YamlPropertySourceLoader().load("demo", new ClassPathResource("application-demo.yml"));
+                if (propertySources != null && propertySources.size() > 0) {
+                    for (PropertySource<?> propertySource : propertySources) {
+                        environment.getPropertySources().addFirst(propertySource);
+                    }
+                }
+                System.err.println("【********* Invalid database configuration. Datart is running in demo mode *********】");
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
-    private String processDBUrl(ConfigurableEnvironment environment){
+    private String processDBUrl(ConfigurableEnvironment environment) {
         String jdbcUrl = environment.getProperty(DATABASE_URL);
         if (!StringUtils.startsWith(jdbcUrl, "jdbc:mysql")) {
             return "";
         }
         Boolean isModify = false;
         String[] split = StringUtils.split(jdbcUrl, "?");
-        if (split.length>1) {
+        if (split.length > 1) {
             Map<String, Object> urlParams = UrlUtils.getParamsMap(split[1]);
             if (!"true".equals(urlParams.getOrDefault("allowMultiQueries", "false"))) {
                 isModify = true;
@@ -128,7 +150,7 @@ private String processDBUrl(ConfigurableEnvironment environment){
             jdbcUrl = split[0] + "?" + UrlUtils.covertMapToUrlParams(urlParams);
         } else {
             isModify = true;
-            jdbcUrl = jdbcUrl+"?allowMultiQueries=true&characterEncoding=utf-8";
+            jdbcUrl = jdbcUrl + "?allowMultiQueries=true&characterEncoding=utf-8";
         }
         if (isModify) {
             return jdbcUrl;
@@ -148,7 +170,7 @@ private String getDefaultDBUrl(ConfigurableEnvironment environment) {
                 System.err.println("Default config application-config not found ");
                 return null;
             }
-            return (String) propertySources.get(0).getProperty(DATABASE_URL);
+            return environment.getProperty(DATABASE_URL);
         } catch (Exception e) {
             e.printStackTrace();
             System.err.println("Default config application-config not found ");

diff --git a/server/src/main/java/datart/server/config/DatabaseMigrationAware.java b/server/src/main/java/datart/server/config/DatabaseMigrationAware.java
@@ -21,7 +21,6 @@
 import datart.core.migration.DatabaseMigration;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.Ordered;
@@ -31,12 +30,10 @@
 @Component
 public class DatabaseMigrationAware implements ApplicationContextAware, Ordered {
 
-    @Value("${datart.migration.enable:true}")
-    private boolean migrationEnable;
-
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        if (!migrationEnable) {
+        String migrationEnable = applicationContext.getEnvironment().getProperty("datart.migration.enable");
+        if (migrationEnable == null || "false".equals(migrationEnable)) {
             return;
         }
         DatabaseMigration databaseMigration = applicationContext.getBean(DatabaseMigration.class);
@@ -51,4 +48,5 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
     public int getOrder() {
         return 0;
     }
+
 }
diff --git a/server/src/main/resources/application-demo.yml b/server/src/main/resources/application-demo.yml
@@ -15,6 +15,7 @@ server:
     mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
 
 datart:
+
   migration:
     enable: false
 

diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
@@ -68,12 +68,12 @@ shiro:
     enabled: false
 
 datart:
+  migration:
+    enable: false
+
   server:
     path-prefix: /api/v1
 
-  migration:
-    enable: true
-
 server:
   port: 8080
   address: 0.0.0.0