Commit Graph
6018 Commits
Author SHA1 Message Date
温绍锦 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
温绍锦 7bc9dff8e4 Merge pull request #3416 from zhangxueyii/fix-chinese-lang-notEmptyWaitMillis
修改中文notEmptyWaitMillis的中文描述和英文typo
2019-08-27 09:55:10 +08:00
Richard Zhang 143012deec fix lang 2019-08-23 14:29:10 +08:00
Richard Zhang ca125a9698 fix NotEmptyWaitMillis lang 2019-08-23 14:09:26 +08:00
温绍锦 e9f235fa36 Merge pull request #3398 from alibaba/recover_fatal_error
Recover fatal error
2019-08-22 10:46:59 +08:00
agapple 712d00e1d9 fixed testcase failed 2019-08-21 20:32:05 +08:00
agapple a8a2e60b9f fixed onFatalError emptySingle improve 2019-08-21 18:19:03 +08:00
agapple c2a8d3d7b2 fixed shrink bypass checkTime bug 2019-08-21 13:13:29 +08:00
agapple 109f95be76 fixed shrink 2019-08-21 13:06:13 +08:00
agapple f32d83d55e fixed onFatalError Recover 2019-08-21 12:37:48 +08:00
高铁 3943006477 recover fatal error 2019-08-20 21:36:11 +08:00
高铁 22e962b17c recover fatal error 2019-08-20 20:30:13 +08:00
高铁 6b9b189d41 recover fatal error 2019-08-20 19:52:54 +08:00
高铁 0666546a2f recover fatal error 2019-08-19 16:32:33 +08:00
高铁 4b2df57add change version to 1.1.19 1.1.19 2019-07-15 02:27:06 +08:00
高铁 35e27d21b5 Merge branch 'master' of https://github.com/alibaba/druid 2019-07-14 13:21:37 +08:00
高铁 39ac64c32e support JDBC 4.1 2019-07-14 13:21:15 +08:00
高铁 6368449a1d update version 1.1.18 2019-06-30 22:19:55 +08:00
daitechang 9419872d40 typo 2019-06-24 15:51:52 +08:00
温绍锦 8ad802e74b Merge pull request #3303 from lihengming/master
update doc dependency version for #3294
2019-06-22 22:30:42 +08:00
lihengming c200853e01 update doc dependency version 2019-06-22 21:55:14 +08:00
高铁 3dda738b59 improve getObject support, fixed #3194 2019-06-17 11:09:22 +08:00
likangning 2017fb7cf1 解决PagerUtils修改offset的bug,当offset需要修改为0时,取值不正确 2019-05-31 14:16:05 +08:00
gdyjlqh d8805ae98c pgsql Driver 9.0以及以下版本不支持setQueryTimeout,可通过设置queryTimeout<0兼容低版本 2019-05-30 02:50:02 +08:00
高铁 8dc5d2d307 add more error info for DataSourceDisableException 2019-05-27 19:09:56 +08:00
zoupeng f0e702fe75 针对MySQL Cursor FETCH Syntax 语法中 包含 NEXT FROM 关键字处理
FETCH [[NEXT] FROM] cursor_name INTO var_name [, var_name] ...
2019-05-23 11:57:31 +08:00
zoupeng 53a364aa13 issue #3240 visit(MySqlChecksumTableStatement x) 方法中 中文逗号问题 2019-05-23 10:54:52 +08:00
shaojin.wensj a2e5d01826 bug fixed for scheduler keepAlive support 2019-05-07 15:15:53 +08:00
shaojin.wensj fb1d83e64e bug fixed for scheduler keepAlive support 2019-05-07 13:46:12 +08:00
shaojin.wensj 2e0b24936b add license info 2019-05-06 23:25:47 +08:00
shaojin.wensj aea3ca118d Merge branch 'master' of https://github.com/alibaba/druid 2019-05-06 10:54:22 +08:00
shaojin.wensj 5ffa30a3ed bug fixed for keepAlive 2019-05-05 21:01:55 +08:00
温绍锦 a36bc07614 Merge pull request #3169 from digitalsonic/master
优化 HighAvailableDataSource 逻辑
2019-04-21 20:15:19 +08:00