diff --git a/APIJSONORM/pom.xml b/APIJSONORM/pom.xml index 6da06a14..bafc9c85 100644 --- a/APIJSONORM/pom.xml +++ b/APIJSONORM/pom.xml @@ -5,7 +5,7 @@ com.github.Tencent APIJSON - 5.1.6 + 5.2.0 jar APIJSONORM diff --git a/APIJSONORM/src/main/java/apijson/Log.java b/APIJSONORM/src/main/java/apijson/Log.java index f3328c76..01f3e25e 100755 --- a/APIJSONORM/src/main/java/apijson/Log.java +++ b/APIJSONORM/src/main/java/apijson/Log.java @@ -13,8 +13,8 @@ import java.text.SimpleDateFormat; public class Log { public static boolean DEBUG = true; - - public static final String VERSION = "5.1.0"; + + public static final String VERSION = "5.2.0"; public static final String KEY_SYSTEM_INFO_DIVIDER = "---|-----APIJSON SYSTEM INFO-----|---"; //默认的时间格式 diff --git a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java index 0dfe0e34..47674908 100755 --- a/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java +++ b/APIJSONORM/src/main/java/apijson/orm/AbstractSQLConfig.java @@ -997,7 +997,16 @@ public abstract class AbstractSQLConfig implements SQLConfig { return DATABASE_HIVE.equals(db); } - @Override + @Override + public boolean isTDengine() { + return isTDengine(getSQLDatabase()); + } + public static boolean isTDengine(String db) { + return DATABASE_TDENGINE.equals(db); + } + + + @Override public String getQuote() { return isMySQL() || isClickHouse() || isTDengine() ? "`" : "\""; } diff --git a/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java b/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java index 2e5c322a..1dbcdf3a 100755 --- a/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java +++ b/APIJSONORM/src/main/java/apijson/orm/SQLConfig.java @@ -42,13 +42,8 @@ public interface SQLConfig { boolean isDb2(); boolean isClickHouse(); boolean isHive(); - default boolean isTDengine() { - return isTDengine(getDatabase()); - } + boolean isTDengine(); - static boolean isTDengine(String db) { - return DATABASE_TDENGINE.equals(db); - } //暂时只兼容以上几种 // boolean isSQL();