(shardingsphere) branch master updated: Refactor E2E. (#32315)

[zhaojinchao]

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 45da7f4c7ff Refactor E2E. (#32315)
45da7f4c7ff is described below

commit 45da7f4c7ffa065ee609ccc58e9f9441638bd5bb
Author: Cong Hu <iamhuc...@gmail.com>
AuthorDate: Mon Jul 29 12:57:02 2024 +0800

    Refactor E2E. (#32315)
---
 .../apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java | 6 ++++++
 .../shardingsphere/test/e2e/env/DataSetEnvironmentManager.java      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
index 55b06805340..f4fb1080e3d 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/cases/dataset/DataSetLoader.java
@@ -63,6 +63,12 @@ public final class DataSetLoader {
         if (new File(result).exists()) {
             return result;
         }
+        if (databaseType.getTrunkDatabaseType().isPresent()) {
+            result = String.join(File.separator, parentPath, 
DATA_SET_FOLDER_NAME, scenario, 
databaseType.getTrunkDatabaseType().get().getType().toLowerCase(), dataSetFile);
+            if (new File(result).exists()) {
+                return result;
+            }
+        }
         result = String.join(File.separator, parentPath, DATA_SET_FOLDER_NAME, 
scenario, mode.toLowerCase(), dataSetFile);
         if (new File(result).exists()) {
             return result;
diff --git 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
index a5fe21c2e94..5ff4fad9de6 100644
--- 
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
+++ 
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/DataSetEnvironmentManager.java
@@ -237,7 +237,7 @@ public final class DataSetEnvironmentManager {
         
         private String getQuotedTableName(final String tableName, final 
DatabaseType databaseType) {
             DialectDatabaseMetaData dialectDatabaseMetaData = new 
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData();
-            return dialectDatabaseMetaData.getQuoteCharacter().wrap(tableName);
+            return 
dialectDatabaseMetaData.getQuoteCharacter().wrap(dialectDatabaseMetaData.formatTableNamePattern(tableName));
         }
     }
 }