diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java index 93487e947..db8673ab6 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java @@ -31,7 +31,12 @@ public enum DataBaseType { /** * SQL Server */ - SQL_SERVER("Microsoft SQL Server"); + SQL_SERVER("Microsoft SQL Server"), + + /** + * MariaDB + */ + MARIA_DB("MariaDB"); private final String type; diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java index bb20f4b3a..f01a281db 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java @@ -41,7 +41,7 @@ public class DataBaseHelper { } public static boolean isMySql() { - return DataBaseType.MY_SQL == getDataBaseType(); + return DataBaseType.MY_SQL == getDataBaseType() || DataBaseType.MARIA_DB == getDataBaseType(); } public static boolean isOracle() {