Commit Graph
6054 Commits
Author SHA1 Message Date
温绍锦 ea284b43cb Merge pull request #3574 from desertsurge/desertsurge-patch-2
refactor: 数据源页面多语言翻译了两次,去掉此页面多余的翻译
2019-11-24 18:32:57 +08:00
desertsurge c114036044 Update datasource.html
refactor: 数据源页面多语言翻译了两次,去掉此页面多余的翻译
2019-11-20 15:06:48 +08:00
温绍锦 9d8db34214 Update README.md 2019-11-17 10:56:56 +08:00
高铁 bd8e80bdd8 improved oracle sql parser 1.1.21 2019-11-03 21:12:49 +08:00
高铁 1cdd3f28eb improved hive sql parser 2019-11-02 22:46:16 +08:00
高铁 481a0c8380 fix : get connection does not execute sql and return, add config 'checkExecuteTime', use 'lastExecTimeMillis' instead of 'lastActiveTimeMillis' 2019-11-02 20:21:37 +08:00
高铁 cb72382549 add method : DruidDataSource.discardConnection(ConnectionHolder) 2019-10-29 15:34:32 +08:00
高铁 1a4aea6c6e improved hive sql parser 2019-10-29 01:15:14 +08:00
高铁 1e8cc71c50 fix : get connection does not execute sql and return, add config 'checkExecuteTime', use 'lastExecTimeMillis' instead of 'lastActiveTimeMillis' 2019-10-27 17:19:30 +08:00
高铁 07b14e88de compiler version JDK 1.6 2019-10-27 10:52:59 +08:00
温绍锦 3ad2168e77 Merge pull request #3466 from yidasanqian/master
Fix typo
2019-10-26 21:30:29 +08:00
温绍锦 21899197b2 Merge pull request #3384 from Nonlone/master
feat:增加统计页面展示废弃连接数
2019-10-24 20:30:20 +08:00
高铁 e5e83312de support JDK 1.7 features 2019-10-20 12:21:48 +08:00
高铁 b3fd7d563b support JDK 1.7 features 2019-10-20 12:20:10 +08:00
高铁 b2f914bd15 support JDK 1.7 features 2019-10-19 19:30:46 +08:00
温绍锦 e91f383fed Merge pull request #3232 from pauljoo/master
fix for JdbcSqlStat.getValue lost name/file. issue #1685
2019-10-05 14:18:31 +08:00
高铁 c72aae5496 fix testcase 2019-10-05 14:17:34 +08:00
温绍锦 38efdf375f Merge pull request #3475 from Duncan-tree-zhou/pg_upsert_fix_duncan
修复PGOutputVisitor 输出PGInsertStatementParser的时候on Conflict Update语法的输出错误
2019-10-05 14:08:57 +08:00
高铁 f970286f67 revert #3484 2019-10-05 13:34:32 +08:00
温绍锦 200c138726 Merge pull request #3484 from TonyYan666/master
解决 SQLExprParser.primary方法 union all 前面直接包含子查询 解析异常问题
2019-10-05 08:41:05 +08:00
高铁 a262865c9b backport sql parser improved from fastsql 2019-10-05 08:19:19 +08:00
高铁 da8d80b934 backport sql parser improved from fastsql 2019-10-05 08:18:31 +08:00
高铁 b79edab45f backport sql parser improved from fastsql 2019-10-05 01:50:37 +08:00
Nonlone dcf9103586 Merge branch 'master' into master 2019-09-26 17:20:23 +08:00
TonyYan666 8a93ff9843 解决 SQLExprParser.SQLParser union all 前面直接包含子查询 解析异常 2019-09-25 17:50:17 +08:00
高铁 20801d01ce remove tbdatasource & proxool testcase 2019-09-22 21:22:42 +08:00
高铁 1b24450acc Merge branch 'master' of https://github.com/alibaba/druid 2019-09-22 21:11:40 +08:00
高铁 52e3b36c5f remove proxool testcase 2019-09-22 21:11:14 +08:00
duncan_zhou f577b9ae5e 修复PGOutputVisitor 输出PGInsertStatementParser的时候on Conflict Update语法的输出错误 2019-09-19 13:29:32 +08:00
yidasanqian 81b451b295 Fix typo 2019-09-16 16:38:11 +08:00
温绍锦 9fe7ab46dd Create SECURITY.md 2019-09-16 11:37:55 +08:00
温绍锦 761b3ad044 Merge pull request #3380 from 9526xu/del_execute_comment
去除 execute 中的注释,让 execute 与 executeQuery 执行流程保持一致
2019-09-16 03:06:36 +08:00
温绍锦 73e968f470 Merge pull request #3429 from yidasanqian/master
Improve getObject support, fixed #3302,#3340,#3393
2019-09-15 23:27:49 +08:00
温绍锦 3af2fe2779 Merge pull request #3437 from zhhaojie/patch-1
Update VERSION.java
2019-09-15 23:26:38 +08:00
高铁 c12a2b52c4 bug fix for sql wall 2019-09-15 22:03:59 +08:00
zhouhaojie e700ff7c88 Update VERSION.java
set 1.1.17 to 1.1.20
2019-08-30 11:04:55 +08:00
yidasanqian 4486ef9f20 Improve getObject support, fixed #3302,#3340,#3393
Marked overridden method with @Override annotation

Catch checkException
2019-08-28 16:45:27 +08:00
高铁 1d784d12bd Merge branch 'master' of https://github.com/alibaba/druid 1.1.20 2019-08-28 10:46:05 +08:00
高铁 0419a4e9c1 update version 2019-08-28 10:45:56 +08:00
高铁 daac4ca1cd fix testcase 2019-08-28 10:45:38 +08:00
高铁 0a4625e9ff PageUtils.limit support offset 0 2019-08-28 10:38:43 +08:00
温绍锦 6df3c39b42 Merge pull request #3245 from ufo001sos002/master
issue #3240 visit(MySqlChecksumTableStatement x) 方法中 中文逗号问题
2019-08-28 01:18:25 +08:00
高铁 a33fe5bc81 support JDK 1.7 features 2019-08-28 00:43:57 +08:00
高铁 d5b0ecdef8 support getSchema 2019-08-28 00:13:02 +08:00
高铁 df7ef2fd66 bug fix for sql wall 2019-08-27 18:22:13 +08:00
温绍锦 d2b12bc586 Merge pull request #3263 from xijiu/master
bug fix 解决PagerUtils修改offset的bug,当offset需要修改为0时,取值不正确
2019-08-27 10:04:10 +08:00
温绍锦 41bf1b7459 Merge pull request #3105 from sky-syk/master
fix WaitThreadCount
2019-08-27 10:03:43 +08:00
高铁 cc2c98d3ee code format 2019-08-27 10:02:56 +08:00
温绍锦 2220bedc8e Merge pull request #3255 from gdyjlqh/master
pgsql Driver 9.0以及以下版本不支持setQueryTimeout,可通过设置queryTimeout<0兼容低版本
2019-08-27 10:02:01 +08:00
温绍锦 fd43ca05bf Merge pull request #3305 from daitechang/master
typo
2019-08-27 09:58:54 +08:00