Commit 355e47c3718e0e00c53e9449376ed2d1b6ec726e
1 parent
5f9d4b36
【代码评审】Framework:find in set 代码
Showing
2 changed files
with
2 additions
and
5 deletions
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/enums/NameToTypeEnum.java
| @@ -9,6 +9,7 @@ import java.util.Arrays; | @@ -9,6 +9,7 @@ import java.util.Arrays; | ||
| 9 | import java.util.Map; | 9 | import java.util.Map; |
| 10 | import java.util.stream.Collectors; | 10 | import java.util.stream.Collectors; |
| 11 | 11 | ||
| 12 | +// TODO @dhb52:是不是把 FindInSetEnum、NameToTypeEnum 融合,搞成 DbTypeEnum?然后里面 type、productName,findInSet | ||
| 12 | /** | 13 | /** |
| 13 | * 数据库产品名 => mp DbType 的映射关系 | 14 | * 数据库产品名 => mp DbType 的映射关系 |
| 14 | * | 15 | * |
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/JdbcUtils.java
| @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.DbType; | @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.DbType; | ||
| 7 | 7 | ||
| 8 | import javax.sql.DataSource; | 8 | import javax.sql.DataSource; |
| 9 | import java.sql.Connection; | 9 | import java.sql.Connection; |
| 10 | -import java.sql.DatabaseMetaData; | ||
| 11 | import java.sql.DriverManager; | 10 | import java.sql.DriverManager; |
| 12 | import java.sql.SQLException; | 11 | import java.sql.SQLException; |
| 13 | 12 | ||
| @@ -53,10 +52,7 @@ public class JdbcUtils { | @@ -53,10 +52,7 @@ public class JdbcUtils { | ||
| 53 | DynamicRoutingDataSource dynamicRoutingDataSource = SpringUtils.getBean(DynamicRoutingDataSource.class); | 52 | DynamicRoutingDataSource dynamicRoutingDataSource = SpringUtils.getBean(DynamicRoutingDataSource.class); |
| 54 | DataSource dataSource = dynamicRoutingDataSource.determineDataSource(); | 53 | DataSource dataSource = dynamicRoutingDataSource.determineDataSource(); |
| 55 | try (Connection conn = dataSource.getConnection()) { | 54 | try (Connection conn = dataSource.getConnection()) { |
| 56 | - DatabaseMetaData metaData = conn.getMetaData(); | ||
| 57 | - String databaseProductName = metaData.getDatabaseProductName(); | ||
| 58 | - DbType dbType = NameToTypeEnum.find(databaseProductName); | ||
| 59 | - return dbType; | 55 | + return NameToTypeEnum.find(conn.getMetaData().getDatabaseProductName()); |
| 60 | } catch (SQLException e) { | 56 | } catch (SQLException e) { |
| 61 | throw new IllegalArgumentException(e.getMessage()); | 57 | throw new IllegalArgumentException(e.getMessage()); |
| 62 | } | 58 | } |