From f0f693050e145cecc5b784850113f7b03cb131d3 Mon Sep 17 00:00:00 2001 From: Tamrac <93933896+Tamrac-web@users.noreply.github.com> Date: Tue, 18 Jun 2024 07:49:17 +0000 Subject: [PATCH] =?UTF-8?q?fix:=E4=BD=BF=E7=94=A8MariaDB=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E8=A1=A8=E7=9A=84=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/common/mybatis/enums/DataBaseType.java | 7 ++++++- .../org/dromara/common/mybatis/helper/DataBaseHelper.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) 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() {