Merge pull request #12 from sharding-sphere/dev

update from origin
apache · Jun 19, 2018 · ea0394e · ea0394e
2 parents 90ef7e7 + abfdaa4
commit ea0394e
Show file tree

Hide file tree

Showing 496 changed files with 16,175 additions and 6,612 deletions.
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
         <netty.version>4.1.16.Final</netty.version>
         <springframework.version>[4.3.6.RELEASE,5.0.0.M1)</springframework.version>
         <spring-boot.version>[1.5.0.RELEASE,2.0.0.M1)</spring-boot.version>
-        <mysql-connector-java.version>5.1.30</mysql-connector-java.version>
+        <mysql-connector-java.version>8.0.11</mysql-connector-java.version>
         <h2.version>1.4.196</h2.version>
         <postgresql.version>9.1-901-1.jdbc4</postgresql.version>
         <mssql.version>6.1.7.jre7-preview</mssql.version>

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/yaml/proxy/YamlProxyConfiguration.java b/sharding-core/src/main/java/io/shardingsphere/core/yaml/proxy/YamlProxyConfiguration.java
@@ -53,13 +53,15 @@ public final class YamlProxyConfiguration {
     private Map<String, DataSourceParameter> dataSources = new HashMap<>();
 
     private YamlMasterSlaveRuleConfiguration masterSlaveRule = new YamlMasterSlaveRuleConfiguration();
-
+    
     private YamlShardingRuleConfiguration shardingRule = new YamlShardingRuleConfiguration();
 
     private ProxyAuthority proxyAuthority = new ProxyAuthority();
 
+    private boolean withoutJdbc;
+
     private String transactionMode;
-
+    
     /**
      * Unmarshal yaml sharding configuration from yaml file.
      * 

diff --git a/sharding-core/src/test/resources/parser/alter.xml b/sharding-core/src/test/resources/parser/alter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <parser-result-sets>
-    <parser-result sql-case-id="assertAlterTable">
+    <parser-result sql-case-id="alter_table">
         <tables>
             <table name="t_log" />
         </tables>
@@ -9,7 +9,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertAlterTableIfExistAndOnly">
+    <parser-result sql-case-id="alter_table_if_exists_only">
         <tables>
             <table name="t_log" />
         </tables>

diff --git a/sharding-core/src/test/resources/parser/create.xml b/sharding-core/src/test/resources/parser/create.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <parser-result-sets>
-    <parser-result sql-case-id="assertCreateTable">
+    <parser-result sql-case-id="create_table">
         <tables>
             <table name="t_log" />
         </tables>
@@ -9,7 +9,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertCreateTableIfNotExist">
+    <parser-result sql-case-id="create_table_if_not_exists">
         <tables>
             <table name="t_log" />
         </tables>
@@ -18,7 +18,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertCreateTemporaryTable">
+    <parser-result sql-case-id="create_temporary_table_if_not_exists">
         <tables>
             <table name="t_temp_log" />
         </tables>
@@ -27,7 +27,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertCreateGlobalTemporaryTable">
+    <parser-result sql-case-id="create_global_temporary_table">
         <tables>
             <table name="t_temp_log" />
         </tables>
@@ -36,7 +36,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertCreateLocalTempTable">
+    <parser-result sql-case-id="create_local_temp_table">
         <tables>
             <table name="t_temp_log" />
         </tables>
@@ -45,7 +45,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertCreateUnloggedTable">
+    <parser-result sql-case-id="create_unlogged_table">
         <tables>
             <table name="t_log" />
         </tables>
@@ -54,7 +54,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertCreateIndex">
+    <parser-result sql-case-id="create_index">
         <tables>
             <table name="t_log" />
         </tables>
@@ -64,7 +64,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertCreateUniqueIndex">
+    <parser-result sql-case-id="create_unique_index">
         <tables>
             <table name="t_log" />
         </tables>

diff --git a/sharding-core/src/test/resources/parser/delete.xml b/sharding-core/src/test/resources/parser/delete.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <parser-result-sets>
-    <parser-result sql-case-id="assertDeleteWithShardingValue" parameters="1000, 1001, 'init'">
+    <parser-result sql-case-id="delete_with_sharding_value" parameters="1000, 1001, 'init'">
         <tables>
             <table name="t_order"/>
         </tables>
@@ -19,7 +19,7 @@
         </or-condition>
     </parser-result>
 
-    <parser-result sql-case-id="assertDeleteWithoutShardingValue" parameters="'init'">
+    <parser-result sql-case-id="delete_without_sharding_value" parameters="'init'">
         <tables>
             <table name="t_order" />
         </tables>

diff --git a/sharding-core/src/test/resources/parser/drop.xml b/sharding-core/src/test/resources/parser/drop.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <parser-result-sets>
-    <parser-result sql-case-id="assertDropTable">
+    <parser-result sql-case-id="drop_table">
         <tables>
             <table name="t_log" />
         </tables>
@@ -9,7 +9,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertDropTableIfExists">
+    <parser-result sql-case-id="drop_table_if_exists">
         <tables>
             <table name="t_log" />
         </tables>
@@ -18,7 +18,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertDropTemporaryTable">
+    <parser-result sql-case-id="drop_temporary_table_if_exists">
         <tables>
             <table name="t_temp_log" />
         </tables>
@@ -27,7 +27,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertDropTableRestrict">
+    <parser-result sql-case-id="drop_table_restrict">
         <tables>
             <table name="t_log" />
         </tables>
@@ -36,7 +36,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertDropTableCascade">
+    <parser-result sql-case-id="drop_table_cascade">
         <tables>
             <table name="t_log" />
         </tables>
@@ -45,7 +45,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertDropTableCascadeConstraintsAndPurge">
+    <parser-result sql-case-id="drop_table_cascade_constraints_and_purge">
         <tables>
             <table name="t_log" />
         </tables>
@@ -54,7 +54,7 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertDropIndex">
+    <parser-result sql-case-id="drop_index">
         <tables>
             <table name="t_log" />
         </tables>
@@ -64,13 +64,13 @@
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertDropIndexWithoutOn">
+    <parser-result sql-case-id="drop_index_without_on">
         <tokens>
             <index-token begin-position="11" original-literals="t_log_index" table-name="" />
         </tokens>
     </parser-result>
 
-    <parser-result sql-case-id="assertDropIndexIfExists">
+    <parser-result sql-case-id="drop_index_if_exists">
         <tokens>
             <index-token begin-position="21" original-literals="t_order_index" table-name="" />
         </tokens>