| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent 70f65fe commit 1f2d304
4 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | 6 | <groupId>com.github.Tencent</groupId> | |
| 7 | 7 | <artifactId>APIJSON</artifactId> | |
| 8 | - <version>7.1.0</version> | ||
| 8 | + <version>7.2.0</version> | ||
| 9 | 9 | <packaging>jar</packaging> | |
| 10 | 10 | ||
| 11 | 11 | <name>APIJSONORM</name> | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,7 +14,7 @@ public class Log { | |||
| 14 | 14 | ||
| 15 | 15 | public static boolean DEBUG = true; | |
| 16 | 16 | ||
| 17 | - public static final String VERSION = "7.1.0"; | ||
| 17 | + public static final String VERSION = "7.2.0"; | ||
| 18 | 18 | public static final String KEY_SYSTEM_INFO_DIVIDER = "\n---|-----APIJSON SYSTEM INFO-----|---\n"; | |
| 19 | 19 | ||
| 20 | 20 | public static final String OS_NAME; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -216,6 +216,7 @@ public abstract class AbstractSQLConfig<T extends Object> implements SQLConfig<T | |||
| 216 | 216 | DATABASE_LIST.add(DATABASE_MILVUS); | |
| 217 | 217 | DATABASE_LIST.add(DATABASE_INFLUXDB); | |
| 218 | 218 | DATABASE_LIST.add(DATABASE_TDENGINE); | |
| 219 | + DATABASE_LIST.add(DATABASE_IOTDB); | ||
| 219 | 220 | DATABASE_LIST.add(DATABASE_SNOWFLAKE); | |
| 220 | 221 | DATABASE_LIST.add(DATABASE_DATABRICKS); | |
| 221 | 222 | DATABASE_LIST.add(DATABASE_REDIS); | |
@@ -224,6 +225,7 @@ public abstract class AbstractSQLConfig<T extends Object> implements SQLConfig<T | |||
| 224 | 225 | DATABASE_LIST.add(DATABASE_KAFKA); | |
| 225 | 226 | DATABASE_LIST.add(DATABASE_MQ); | |
| 226 | 227 | ||
| 228 | + | ||
| 227 | 229 | RAW_MAP = new LinkedHashMap<>(); // 保证顺序,避免配置冲突等意外情况 | |
| 228 | 230 | ||
| 229 | 231 | RAW_MAP.put("+", ""); | |
@@ -820,6 +822,18 @@ public abstract class AbstractSQLConfig<T extends Object> implements SQLConfig<T | |||
| 820 | 822 | SQL_FUNCTION_MAP.put("len", ""); | |
| 821 | 823 | SQL_FUNCTION_MAP.put("datalength", ""); | |
| 822 | 824 | ||
| 825 | + // Milvus 相关 SQL 函数 | ||
| 826 | + SQL_FUNCTION_MAP.put("vMatch", ""); | ||
| 827 | + SQL_FUNCTION_MAP.put("consistencyLevel", ""); | ||
| 828 | + SQL_FUNCTION_MAP.put("partitionBy", ""); | ||
| 829 | + SQL_FUNCTION_MAP.put("gracefulTime", ""); | ||
| 830 | + SQL_FUNCTION_MAP.put("guaranteeTimestamp", ""); | ||
| 831 | + SQL_FUNCTION_MAP.put("roundDecimal", ""); | ||
| 832 | + SQL_FUNCTION_MAP.put("travelTimestamp", ""); | ||
| 833 | + SQL_FUNCTION_MAP.put("nProbe", ""); | ||
| 834 | + SQL_FUNCTION_MAP.put("ef", ""); | ||
| 835 | + SQL_FUNCTION_MAP.put("searchK", ""); | ||
| 836 | + | ||
| 823 | 837 | } | |
| 824 | 838 | ||
| 825 | 839 | private Parser<T> parser; | |
@@ -1011,7 +1025,7 @@ public AbstractSQLConfig setMethod(RequestMethod method) { | |||
| 1011 | 1025 | } | |
| 1012 | 1026 | @Override | |
| 1013 | 1027 | public boolean isPrepared() { | |
| 1014 | - return prepared; | ||
| 1028 | + return prepared && ! isMongoDB(); // MongoDB JDBC 还不支持预编译; | ||
| 1015 | 1029 | } | |
| 1016 | 1030 | @Override | |
| 1017 | 1031 | public AbstractSQLConfig setPrepared(boolean prepared) { | |
@@ -1269,6 +1283,15 @@ public static boolean isTDengine(String db) { | |||
| 1269 | 1283 | return DATABASE_TDENGINE.equals(db); | |
| 1270 | 1284 | } | |
| 1271 | 1285 | ||
| 1286 | + | ||
| 1287 | + public boolean isIoTDB() { | ||
| 1288 | + return isIoTDB(getDatabase()); | ||
| 1289 | + } | ||
| 1290 | + public static boolean isIoTDB(String db) { | ||
| 1291 | + return DATABASE_IOTDB.equals(db); | ||
| 1292 | + } | ||
| 1293 | + | ||
| 1294 | + | ||
| 1272 | 1295 | @Override | |
| 1273 | 1296 | public boolean isRedis() { | |
| 1274 | 1297 | return isRedis(getSQLDatabase()); | |
@@ -1310,8 +1333,8 @@ public static boolean isSQLite(String db) { | |||
| 1310 | 1333 | } | |
| 1311 | 1334 | ||
| 1312 | 1335 | @Override | |
| 1313 | - public String getQuote() { | ||
| 1314 | - if(isElasticsearch()) { | ||
| 1336 | + public String getQuote() { // MongoDB 同时支持 `tbl` 反引号 和 "col" 双引号 | ||
| 1337 | + if(isElasticsearch() || isIoTDB()) { | ||
| 1315 | 1338 | return ""; | |
| 1316 | 1339 | } | |
| 1317 | 1340 | return isMySQL() || isMariaDB() || isTiDB() || isClickHouse() || isTDengine() || isMilvus() ? "`" : "\""; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -37,12 +37,15 @@ public interface SQLConfig<T extends Object> { | |||
| 37 | 37 | String DATABASE_MILVUS = "MILVUS"; // https://milvus.io | |
| 38 | 38 | String DATABASE_INFLUXDB = "INFLUXDB"; // https://www.influxdata.com/products/influxdb-overview | |
| 39 | 39 | String DATABASE_TDENGINE = "TDENGINE"; // https://tdengine.com | |
| 40 | + String DATABASE_IOTDB = "IOTDB"; // https://iotdb.apache.org/zh/UserGuide/latest/API/Programming-JDBC.html | ||
| 41 | + | ||
| 40 | 42 | String DATABASE_REDIS = "REDIS"; // https://redisql.com | |
| 41 | 43 | String DATABASE_MONGODB = "MONGODB"; // https://www.mongodb.com/docs/atlas/data-federation/query/query-with-sql | |
| 42 | 44 | String DATABASE_KAFKA = "KAFKA"; // https://github.com/APIJSON/APIJSON-Demo/tree/master/APIJSON-Java-Server/APIJSONDemo-MultiDataSource-Kafka | |
| 43 | - String DATABASE_MQ = "MQ"; // | ||
| 44 | 45 | String DATABASE_SQLITE = "SQLITE"; // https://www.sqlite.org | |
| 45 | 46 | ||
| 47 | + String DATABASE_MQ = "MQ"; // | ||
| 48 | + | ||
| 46 | 49 | String SCHEMA_INFORMATION = "information_schema"; //MySQL, PostgreSQL, SQL Server 都有的系统模式 | |
| 47 | 50 | String SCHEMA_SYS = "sys"; //SQL Server 系统模式 | |
| 48 | 51 | String TABLE_SCHEMA = "table_schema"; | |
@@ -88,6 +91,7 @@ public interface SQLConfig<T extends Object> { | |||
| 88 | 91 | boolean isMilvus(); | |
| 89 | 92 | boolean isInfluxDB(); | |
| 90 | 93 | boolean isTDengine(); | |
| 94 | + boolean isIoTDB(); | ||
| 91 | 95 | boolean isRedis(); | |
| 92 | 96 | boolean isMongoDB(); | |
| 93 | 97 | boolean isKafka(); | |
| Back | FazBrowse Home | New Git URL |
0 commit comments