Commit cc73fc8a9157e66f63dd6db05edb79b2b29dc397

Authored by dhb52
1 parent 3c5309b1

fix: 调整 DbTypeEnum 字段顺序

yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/enums/DbTypeEnum.java
... ... @@ -18,46 +18,46 @@ public enum DbTypeEnum {
18 18 /**
19 19 * MySQL
20 20 */
21   - MY_SQL("MySQL", "FIND_IN_SET('#{value}', #{column}) <> 0", DbType.MYSQL),
  21 + MY_SQL( DbType.MYSQL, "MySQL", "FIND_IN_SET('#{value}', #{column}) <> 0"),
22 22  
23 23 /**
24 24 * Oracle
25 25 */
26   - ORACLE("Oracle", "FIND_IN_SET('#{value}', #{column}) <> 0", DbType.ORACLE),
  26 + ORACLE(DbType.ORACLE, "Oracle", "FIND_IN_SET('#{value}', #{column}) <> 0"),
27 27  
28 28 /**
29 29 * PostgreSQL
30 30 */
31   - POSTGRE_SQL("PostgreSQL", "POSITION('#{value}' IN #{column}) <> 0", DbType.POSTGRE_SQL),
  31 + POSTGRE_SQL(DbType.POSTGRE_SQL,"PostgreSQL", "POSITION('#{value}' IN #{column}) <> 0"),
32 32  
33 33 /**
34 34 * SQL Server
35 35 */
36   - SQL_SERVER("Microsoft SQL Server", "CHARINDEX(',' + #{value} + ',', ',' + #{column} + ',') <> 0", DbType.SQL_SERVER),
  36 + SQL_SERVER(DbType.SQL_SERVER, "Microsoft SQL Server", "CHARINDEX(',' + #{value} + ',', ',' + #{column} + ',') <> 0"),
37 37  
38 38 /**
39 39 * 达梦
40 40 */
41   - DM("DM DBMS", "FIND_IN_SET('#{value}', #{column}) <> 0", DbType.DM),
  41 + DM(DbType.DM, "DM DBMS", "FIND_IN_SET('#{value}', #{column}) <> 0"),
42 42  
43 43 /**
44 44 * 人大金仓
45 45 */
46   - KINGBASE_ES("KingbaseES", "POSITION('#{value}' IN #{column}) <> 0", DbType.KINGBASE_ES),
  46 + KINGBASE_ES(DbType.KINGBASE_ES, "KingbaseES", "POSITION('#{value}' IN #{column}) <> 0"),
47 47  
48 48 // 华为openGauss 使用ProductName 与 PostgreSQL相同
49 49 ;
50 50  
51 51 public static final Map<String, DbTypeEnum> MAP_BY_NAME = Arrays.stream(values())
52   - .collect(Collectors.toMap(DbTypeEnum::getName, Function.identity()));
  52 + .collect(Collectors.toMap(DbTypeEnum::getProductName, Function.identity()));
53 53  
54 54 public static final Map<DbType, DbTypeEnum> MAP_BY_MP = Arrays.stream(values())
55 55 .collect(Collectors.toMap(DbTypeEnum::getMpDbType, Function.identity()));
56 56  
57 57  
58   - private final String name;
59   - private final String findInSetTemplate;
60 58 private final DbType mpDbType;
  59 + private final String productName;
  60 + private final String findInSetTemplate;
61 61  
62 62 public static DbType find(String databaseProductName) {
63 63 if (StrUtil.isBlank(databaseProductName)) {
... ...