This is an automated email from the ASF dual-hosted git repository.
fengzhenbing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 25d8eb3 [type: refactor] refactor admin sql path (#2003)
25d8eb3 is described below
commit 25d8eb379ab5d00e73cd7780fec9cb9a25f0a7fe
Author: xiaoyu <[email protected]>
AuthorDate: Wed Sep 1 19:38:50 2021 +0800
[type: refactor] refactor admin sql path (#2003)
* [type: refactor] refactor admin sql path
* [type: refactor] refactor admin sql path
* [type: refactor] refactor admin sql path
---
.../org/apache/shenyu/admin/config/DataBaseConfiguration.java | 9 ++++++---
shenyu-admin/src/main/resources/application-h2.yml | 2 +-
shenyu-admin/src/main/resources/application-pg.yml | 5 ++---
shenyu-admin/src/main/resources/application.yml | 2 +-
.../{META-INF/schema.h2.sql => sql-script/h2/schema.sql} | 0
.../src/main/resources/{META-INF => sql-script/mysql}/schema.sql | 0
.../resources/{META-INF => sql-script}/pg/schema.createdb.sql | 0
.../main/resources/{META-INF => sql-script}/pg/schema.dropdb.sql | 0
.../{META-INF/pg/schema.pg.sql => sql-script/pg/schema.sql} | 0
.../apache/shenyu/admin/config/DataBaseConfigurationTest.java | 5 ++---
.../shenyu-admin-dist/src/main/resources/application-h2.yml | 2 +-
.../shenyu-integrated-test-http/docker-compose.yml | 2 +-
.../shenyu-integrated-test-spring-cloud/docker-compose.yml | 2 +-
13 files changed, 15 insertions(+), 14 deletions(-)
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/DataBaseConfiguration.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/DataBaseConfiguration.java
index 3b47182..12ff74b 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/DataBaseConfiguration.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/DataBaseConfiguration.java
@@ -28,24 +28,27 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
public class DataBaseConfiguration {
-
+
/**
* Register datasourceProperties for LocalDataSourceLoader.
*
* @param dialect database dialect
* @param initScript database init script
* @param initEnable database init enable
+ * @param dbScript the db script
* @return {@linkplain DataBaseProperties}
*/
@Bean
@ConditionalOnMissingBean(value = DataBaseProperties.class)
public DataBaseProperties
dataBaseProperties(@Value("${shenyu.database.dialect:h2}") final String dialect,
-
@Value("${shenyu.database.init_script:META-INF/schema.h2.sql}") final String
initScript,
-
@Value("${shenyu.database.init_enable:true}") final Boolean initEnable) {
+
@Value("${shenyu.database.init_script:sql-script/h2/schema.sql}") final String
initScript,
+
@Value("${shenyu.database.init_enable:true}") final Boolean initEnable,
+
@Value("${shenyu.database.db_script}") final String dbScript) {
DataBaseProperties dataSourceProperties = new DataBaseProperties();
dataSourceProperties.setDialect(dialect);
dataSourceProperties.setInitScript(initScript);
dataSourceProperties.setInitEnable(initEnable);
+ dataSourceProperties.setDbScript(dbScript);
return dataSourceProperties;
}
}
diff --git a/shenyu-admin/src/main/resources/application-h2.yml
b/shenyu-admin/src/main/resources/application-h2.yml
index 23dc27d..4e4e6ac 100644
--- a/shenyu-admin/src/main/resources/application-h2.yml
+++ b/shenyu-admin/src/main/resources/application-h2.yml
@@ -16,7 +16,7 @@
shenyu:
database:
dialect: h2
- init_script: "META-INF/schema.h2.sql"
+ init_script: "sql-script/h2/schema.sql"
init_enable: true
spring:
diff --git a/shenyu-admin/src/main/resources/application-pg.yml
b/shenyu-admin/src/main/resources/application-pg.yml
index 1177c59..38b1260 100644
--- a/shenyu-admin/src/main/resources/application-pg.yml
+++ b/shenyu-admin/src/main/resources/application-pg.yml
@@ -17,9 +17,8 @@
shenyu:
database:
dialect: postgresql
- db_script:
"META-INF/pg/schema.dropdb.sql;META-INF/pg/schema.createdb.sql"
- db_enable: true
- init_script: "META-INF/pg/schema.pg.sql"
+ db_script:
"sql-script/pg/schema.dropdb.sql;sql-script/pg/schema.createdb.sql"
+ init_script: "sql-script/pg/schema.sql"
init_enable: true
spring:
diff --git a/shenyu-admin/src/main/resources/application.yml
b/shenyu-admin/src/main/resources/application.yml
index 128af10..6e2f5b3 100644
--- a/shenyu-admin/src/main/resources/application.yml
+++ b/shenyu-admin/src/main/resources/application.yml
@@ -49,7 +49,7 @@ shenyu:
nacosNameSpace: ShenyuRegisterCenter
database:
dialect: mysql
- init_script: "META-INF/schema.sql"
+ init_script: "sql-script/mysql/schema.sql"
init_enable: true
sync:
websocket:
diff --git a/shenyu-admin/src/main/resources/META-INF/schema.h2.sql
b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
similarity index 100%
rename from shenyu-admin/src/main/resources/META-INF/schema.h2.sql
rename to shenyu-admin/src/main/resources/sql-script/h2/schema.sql
diff --git a/shenyu-admin/src/main/resources/META-INF/schema.sql
b/shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
similarity index 100%
rename from shenyu-admin/src/main/resources/META-INF/schema.sql
rename to shenyu-admin/src/main/resources/sql-script/mysql/schema.sql
diff --git a/shenyu-admin/src/main/resources/META-INF/pg/schema.createdb.sql
b/shenyu-admin/src/main/resources/sql-script/pg/schema.createdb.sql
similarity index 100%
rename from shenyu-admin/src/main/resources/META-INF/pg/schema.createdb.sql
rename to shenyu-admin/src/main/resources/sql-script/pg/schema.createdb.sql
diff --git a/shenyu-admin/src/main/resources/META-INF/pg/schema.dropdb.sql
b/shenyu-admin/src/main/resources/sql-script/pg/schema.dropdb.sql
similarity index 100%
rename from shenyu-admin/src/main/resources/META-INF/pg/schema.dropdb.sql
rename to shenyu-admin/src/main/resources/sql-script/pg/schema.dropdb.sql
diff --git a/shenyu-admin/src/main/resources/META-INF/pg/schema.pg.sql
b/shenyu-admin/src/main/resources/sql-script/pg/schema.sql
similarity index 100%
rename from shenyu-admin/src/main/resources/META-INF/pg/schema.pg.sql
rename to shenyu-admin/src/main/resources/sql-script/pg/schema.sql
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/config/DataBaseConfigurationTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/config/DataBaseConfigurationTest.java
index e5ade22..58eec12 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/config/DataBaseConfigurationTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/config/DataBaseConfigurationTest.java
@@ -34,11 +34,10 @@ public final class DataBaseConfigurationTest {
DataBaseConfiguration dataBaseConfiguration = new
DataBaseConfiguration();
String dialect = "MySQL";
String initScript = "/tmp/init.sql";
- Boolean initEnable = true;
- DataBaseProperties dataBaseProperties =
dataBaseConfiguration.dataBaseProperties(dialect, initScript, initEnable);
+ DataBaseProperties dataBaseProperties =
dataBaseConfiguration.dataBaseProperties(dialect, initScript, true, "");
assertNotNull(dataBaseProperties);
assertEquals(dataBaseProperties.getDialect(), dialect);
assertEquals(dataBaseProperties.getInitScript(), initScript);
- assertEquals(dataBaseProperties.getInitEnable(), initEnable);
+ assertEquals(dataBaseProperties.getInitEnable(), true);
}
}
diff --git
a/shenyu-dist/shenyu-admin-dist/src/main/resources/application-h2.yml
b/shenyu-dist/shenyu-admin-dist/src/main/resources/application-h2.yml
index 23dc27d..be77f69 100644
--- a/shenyu-dist/shenyu-admin-dist/src/main/resources/application-h2.yml
+++ b/shenyu-dist/shenyu-admin-dist/src/main/resources/application-h2.yml
@@ -16,7 +16,7 @@
shenyu:
database:
dialect: h2
- init_script: "META-INF/schema.h2.sql"
+ init_script: "META-INF/schema.sql"
init_enable: true
spring:
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
index e9fe5fe..81c2e6a 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
+++ b/shenyu-integrated-test/shenyu-integrated-test-http/docker-compose.yml
@@ -70,7 +70,7 @@ services:
- 9095:9095
environment:
- SPRING_PROFILES_ACTIVE=h2
- -
"shenyu.database.init_script=META-INF/schema.h2.sql;file:/opt/sql/schema.sql"
+ -
"shenyu.database.init_script=sql-script/h2/schema.sql;file:/opt/sql/schema.sql"
healthcheck:
test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
timeout: 2s
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
index 012c71e..709ab8e 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
+++
b/shenyu-integrated-test/shenyu-integrated-test-spring-cloud/docker-compose.yml
@@ -29,7 +29,7 @@ services:
- 9095:9095
environment:
- SPRING_PROFILES_ACTIVE=h2
- -
shenyu.database.init_script=META-INF/schema.h2.sql;file:/opt/sql/schema.sql
+ -
"shenyu.database.init_script=sql-script/h2/schema.sql;file:/opt/sql/schema.sql"
healthcheck:
test: ["CMD-SHELL", "wget -q -O -
http://shenyu-admin:9095/actuator/health | grep UP || exit 1"]
timeout: 2s
