Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity
6,066 Commits 16 Branches 87 Tags
ff81af779abbc1d433e9b993e35672cd4e71e0ff
Commit Graph
6066 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
温绍锦 ff81af779a Merge pull request #3704 from ldming/master 
Support polardb
 2020-03-24 14:49:51 +08:00
ldming b0cc835a40 Support polardb 2020-03-01 12:50:57 +08:00
温绍锦 18606b51c7 Merge pull request #3558 from eryanwcp/master 
解决Spring Boot环境下AOP二次代理问题
 2020-01-29 23:40:12 +08:00
温绍锦 5c14f97809 Merge pull request #3659 from codeimport/master-fix-maxEvictableIdleTimeMillis 
数据源初始化后才用判断maxEvictableIdleTimeMillis大小
 2020-01-29 14:38:26 +08:00
温绍锦 736cd292f1 Merge pull request #3624 from auntyellow/master 
fix article word use in pom description
 2020-01-29 14:34:28 +08:00
codeimport 6ee952e4c2 数据库初始化后才用判断maxEvictableIdleTimeMillis大小 2019-12-30 18:03:34 +08:00
auntyellow c7089f7ea7 An JDBC ... => A JDBC ... 2019-12-16 10:30:12 +08:00
高铁 b73e55f498 Merge remote-tracking branch 'origin/master' 2019-11-25 22:46:09 +08:00
高铁 206ef1dbe0 add method : parseStatements(String sql, String dbType, SQLParserFeature... features); 2019-11-25 22:45:38 +08:00
高铁 ef2d83f74a bug fixed for concurrent close & discard connection 2019-11-25 22:45:15 +08:00
温绍锦 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
eryan a49446a22d 解决Spring Boot环境下AOP二次代理问题 2019-11-08 08:33:44 +08:00
eryan 0a081d5a3f Merge pull request #1 from alibaba/master 
sync
 2019-11-08 08:23:27 +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