Commit Graph
4325 Commits
Author SHA1 Message Date
zz 6469d239eb Merge pull request #1 from alibaba/master
update 1
2015-09-14 09:52:28 +08:00
高铁 ed3dbe7485 Merge pull request #954 from zhujunxxxxx/master
增加mysql对procedure语法的识别
2015-09-12 23:34:30 +08:00
高铁 1bcd5eda86 Merge pull request #956 from wenshao/master
bug fixed for phyConnectTimeMillis
2015-09-12 23:24:04 +08:00
高铁 a6c9cd80c1 bug fixed for phyConnectTimeMillis 2015-09-12 23:25:17 +08:00
高铁 887d538a91 bug fixed for pg sql parser 2015-09-12 22:52:45 +08:00
高铁 d283cd76a6 Merge pull request #955 from wenshao/master
bug fixed for pg sql parser
2015-09-12 22:51:01 +08:00
zhujunxxxxx 4a66c27b31 增加mysql对procedure语法的识别 2015-09-11 20:10:39 +08:00
高铁 ec0e19ec52 Merge pull request #947 from wenshao/master
bug fixed for mysql connection validation checker, and improved odps …
2015-09-07 11:27:10 +08:00
高铁 820e9f3581 bug fixed for mysql connection validation checker, and improved odps sql formatter 2015-09-07 11:28:16 +08:00
Yako bbcbad629c Merge pull request #945 from yakolee/master
update license
2015-09-01 15:53:24 +08:00
Yako 9c42bfa2b5 update license 2015-09-01 15:52:13 +08:00
高铁 961ae42433 improved sql formatter 2015-08-31 23:50:06 +08:00
高铁 7a2f364af3 Merge pull request #943 from wenshao/master
improved sql formatter
2015-08-31 23:48:38 +08:00
高铁 549c66a7ea improved odps sql formmater 2015-08-31 20:57:48 +08:00
高铁 2aff049506 Merge pull request #942 from wenshao/master
improved odps sql formatter
2015-08-31 20:56:29 +08:00
高铁 e0ad248845 improved odps sql parser, support distribute by 2015-08-26 19:39:56 +08:00
高铁 ac2e74da98 Merge pull request #941 from wenshao/master
improved odps sql parser, support distribute by
2015-08-26 19:38:40 +08:00
高铁 91edb244f2 Merge pull request #930 from 52Jolynn/master
修复若干bug及增加若干特性
2015-08-22 00:53:52 +08:00
高铁 9007375ca0 Merge pull request #938 from lstoars/master
1.修复自定义加密key的bug;2.修改生成加密密码的main方法。
2015-08-22 00:53:17 +08:00
高铁 17e158759f Merge pull request #939 from blackshadowwalker/master
处理 mysql 8 小时超时问题 和 修改丢弃连接堆栈
2015-08-22 00:51:45 +08:00
lijian af74742212 syn pom.xml 2015-08-18 17:02:26 +08:00
lijian 4e39c48772 syn alibaba/druid/master 2015-08-18 16:58:23 +08:00
lijian a64b9f9287 syn alibaba/druid/master 2015-08-18 16:53:36 +08:00
lijian dace336b0d Merge remote-tracking branch 'karl/master' into 20150818-phyTimeoutMillis
Conflicts:
	pom.xml
	src/main/java/com/alibaba/druid/pool/DruidDataSource.java
	src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
2015-08-18 16:03:13 +08:00
lijian 2c09b80eff 1.系统计时器的时间(connectedTimeNano)记录到日志中不能准确的反映连接的时间(connectedTimeNano),换用(增加参数) connectedTimeMillis 记录获取连接的时间
2.处理 mysql 8 小时超时问题(即使testWhileIdle=false,testOnBorrow=false,testOnReturn=false),在物理连接的已连接时间超过 phyTimeoutMillis(默认7小时) 后就自动关闭该物理连接
3.修正单词拼写 destoryTask -> destroyTask
2015-08-18 15:54:35 +08:00
lstoars f2f2479199 1.修复自定义加密key的bug;2.修改生成随机密码的main方法。 2015-08-18 13:43:03 +08:00
高铁 883b1fbc64 fixed copyright 2015-08-16 23:45:03 +08:00
高铁 e6a637890a Merge pull request #936 from wenshao/master
fixed copyright
2015-08-16 23:44:57 +08:00
高铁 0db015cc16 Merge pull request #933 from wenshao/master
MySqlValidConnectionChecker use pingInternal replace ping
2015-08-08 15:47:10 +08:00
shaojin.wensj b35ea0326f MySqlValidConnectionChecker use pingInternal replace ping 2015-08-08 15:46:23 +08:00
huangtiande 7d1b290c43 修复 with as 语句列解析bug 2015-08-06 16:07:53 +08:00
shaojin.wensj c361cd420c improved odps sql formatter 2015-08-05 16:33:29 +08:00
高铁 183572a9d3 Merge pull request #929 from wenshao/master
improved odps sql formatter
2015-08-05 16:32:47 +08:00
Yako 5c322e835b add license 2015-08-04 11:27:49 +08:00
Yako c1a85a6537 add license 2015-08-04 09:39:27 +08:00
shaojin.wensj c38ce08786 improve odps sql support 2015-08-04 09:32:51 +08:00
高铁 db4e4067a9 Merge pull request #928 from wenshao/master
improve odps sql support
2015-08-04 09:32:28 +08:00
Yako 37f4f86b5e add license 2015-07-30 16:18:12 +08:00
高铁 e7e6578c29 Merge pull request #926 from wenshao/master
improved odps support
2015-07-30 13:22:40 +08:00
shaojin.wensj eb7b7037c4 improved odps support 2015-07-30 13:22:13 +08:00
高铁 a98ed16406 Merge pull request #925 from wenshao/master
improved odps sql formmatter
2015-07-29 00:57:55 +08:00
shaojin.wensj 9d45ec9d12 improved odps sql formmatter 2015-07-28 23:33:01 +08:00
shaojin.wensj 3de275fa8c improved odps sql formmatter 2015-07-28 23:19:17 +08:00
高铁 24ddf8fc38 Merge pull request #924 from wenshao/master
improved odps sql formatter
2015-07-28 22:24:44 +08:00
shaojin.wensj 87f3f8144b improved odps sql formatter 2015-07-28 22:24:07 +08:00
shaojin.wensj 29d0889d86 improved sql formatter 2015-07-27 14:03:00 +08:00
高铁 394a6ee9f9 Merge pull request #922 from wenshao/master
improved sql formatter
2015-07-27 14:02:57 +08:00
Yako ba51efd738 Merge pull request #921 from LQZYC/master
修复type不能作为别名 char()方法解析失败的问题
2015-07-23 16:03:31 +08:00
LQZYC 502bb5641c 修复type不能作为别名 char()方法解析失败的问题 2015-07-23 15:53:58 +08:00
Yako 1fd1178b7f Merge pull request #920 from yakolee/master
bugfix for \n
2015-07-22 17:33:53 +08:00