Optimize the logic for deducing database name

Author: Weasley

dtt-spring-boot-starter-tests/dtt-spring-boot-2-x/src/main/resources/application-mysql.yml

@@ -22,7 +22,7 @@ mybatis-plus:
 
 alphahub:
   dtt:
-    is-enable: off
+    is-enable: on
     banner-mode: ON
     show-sql: off
     mybatis-orm-support:

dtt-spring-boot-starter/src/main/java/cn/alphahub/dtt/plus/framework/InitDttClient.java

@@ -146,15 +146,14 @@ public ContextWrapper contextWrapper(@Qualifier("commentParserClient") Map<Parse
      */
     @Bean
     public DatabaseProperty databaseProperty(DataSource dataSource,
-                                             DataSourceProperties dataSourceProperties,
                                              JdbcTemplate jdbcTemplate,
-                                             DatabaseHandler databaseHandler
+                                             DatabaseHandler databaseHandler,
+                                             DataSourceProperties dataSourceProperties
     ) {
         DatabaseProperty property = new DatabaseProperty();
         property.setDatabaseType(databaseHandler.getDbType());
         String databaseName = "";
-        if (databaseHandler.getDbType() == DatabaseType.ORACLE)
-            databaseName = dataSourceProperties.getUsername();
+        if (databaseHandler.getDbType() == DatabaseType.ORACLE) databaseName = dataSourceProperties.getUsername();
         if (databaseHandler.getDbType() == DatabaseType.DB2) {
             try {
                 databaseName = jdbcTemplate.queryForObject("SELECT CURRENT SERVER FROM SYSIBM.SYSDUMMY1", String.class);
@@ -167,17 +166,24 @@ public DatabaseProperty databaseProperty(DataSource dataSource,
         }
         try {
             @SuppressWarnings({"all"}) DatabaseMetaData metaData = dataSource.getConnection().getMetaData();
-            property.setDatabaseVersion(metaData.getDatabaseProductVersion());
-            property.setIntDatabaseVersion(metaData.getDatabaseMajorVersion());
             ResultSet result = metaData.getCatalogs();
             String dataURL = metaData.getURL();
-            while (result.next()) {
-                String databaseNameTemp = result.getString(1);
-                if (org.apache.commons.lang3.StringUtils.isNotBlank(databaseNameTemp)
-                        && !databaseHandler.getDbType().name().equalsIgnoreCase(databaseNameTemp)
-                        && dataURL.contains(databaseNameTemp)) {
-                    databaseName = databaseNameTemp;
-                    break;
+            property.setDatabaseVersion(metaData.getDatabaseProductVersion());
+            property.setIntDatabaseVersion(metaData.getDatabaseMajorVersion());
+            String currentCatalogName = metaData.getConnection().getCatalog();
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(currentCatalogName)
+                    && !databaseHandler.getDbType().name().equalsIgnoreCase(currentCatalogName)
+                    && dataURL.contains(currentCatalogName)) {
+                databaseName = currentCatalogName;
+            } else {
+                while (result.next()) {
+                    String databaseNameTemp = result.getString(1);
+                    if (org.apache.commons.lang3.StringUtils.isNotBlank(databaseNameTemp)
+                            && !databaseHandler.getDbType().name().equalsIgnoreCase(databaseNameTemp)
+                            && dataURL.contains(databaseNameTemp)) {
+                        databaseName = databaseNameTemp;
+                        break;
+                    }
                 }
             }
         } catch (SQLException e) {

embedded-db/derby/db.lck

@@ -1,5 +1,5 @@
 #HSQL Database Engine 2.6.0
-#Thu Aug 25 15:39:03 CST 2022
+#Sat Oct 08 16:09:42 CST 2022
 version=2.6.0
 modified=no
-tx_timestamp=37184
+tx_timestamp=46357

embedded-db/derby/log/log.ctrl

@@ -28,7 +28,7 @@ SET FILES NIO TRUE
 SET FILES NIO SIZE 256
 SET FILES LOG TRUE
 SET FILES LOG SIZE 50
-SET FILES CHECK 37184
+SET FILES CHECK 46357
 SET DATABASE COLLATION "SQL_TEXT" PAD SPACE
 CREATE USER SA PASSWORD DIGEST 'd41d8cd98f00b204e9800998ecf8427e'
 ALTER USER SA SET LOCAL TRUE