Commit Graph
5049 Commits
Author SHA1 Message Date
lihengming 3a1c0824dc 注释 2017-05-03 15:04:11 +08:00
lihengming a68d96df4d 1.优化代码&注释;
2.默认不对StatViewServlet和WebStatFilter进行自动配置与原项目保持一致,按需自行决定是否进行自动配置;
2017-05-03 15:00:31 +08:00
lihengming 69521ee57d 优化DruidDataSourceBuilder,当自行使用Builder创建数据源时,如果数据源基础配置的前缀不是sping.datasource.druid可自行set。 2017-04-27 17:44:21 +08:00
lihengming aa91df1fc7 添加注解@ConditionalOnMissingBean,当Context中已存在用户自定义的数据源的时不再进行自动配置。 2017-04-27 17:39:19 +08:00
lihengming 166634288d Merge remote-tracking branch 'origin/master' 2017-04-27 16:56:49 +08:00
lihengming 7e7dd5da38 修改注释 2017-04-27 16:56:39 +08:00
土豆 d1797e02bd utf-8 2017-04-27 16:39:34 +08:00
土豆 5b5bb73444 醉了,明明是utf-8的...修复乱码 2017-04-27 16:39:08 +08:00
lihengming a17033158f 删除原 druid-spring-boot-starter 项目文件 2017-04-27 16:23:03 +08:00
lihengming 3dc56de574 测试示例配置文件修改 2017-04-27 16:21:27 +08:00
lihengming c15d5b5370 增加测试示例依赖,由于Spring Boot版本为1.5.2(需spring1.3.4)而spring.version版本为3.2.5,导致测试示例无法启动,所以引入了Spring Dependency Manager 升级spring.version为3.3.4 2017-04-27 16:19:44 +08:00
lihengming 6d5a1278a3 测试示例配置及配置文件模板 2017-04-27 16:16:12 +08:00
lihengming 893b7e4fe7 1. 重构 druid-spring-boot-starter 并入主项目。
2. 提供DruidDataSourceBuilder支持Spring Boot下Druid多数据源配置。
2017-04-27 16:12:53 +08:00
土豆 261e8956cf utf-8 2017-04-26 13:48:45 +08:00
土豆 68b4e5149c utf-8 2017-04-26 13:47:57 +08:00
lihengming a414a3e462 utf-8 2017-04-26 13:42:06 +08:00
lihengming dba8131864 utf-8 2017-04-26 13:40:19 +08:00
lihengming 4e8a7296f1 add druid-spring-boot-starter support 2017-04-26 13:23:06 +08:00
wenshao e3a868ec4f bug fixed for SchemaStat for Hierarchical Query pseudocolumn. 2017-04-24 19:05:14 +08:00
wenshao 7b998a45ff bug fixed for SchemaStat for Hierarchical Query pseudocolumn. 2017-04-24 18:45:29 +08:00
wenshao 30a79c41ab bug fixed for SchemaStat for Hierarchical Query pseudocolumn. 2017-04-24 18:43:40 +08:00
wenshao 7f75fb3eb9 db2 sql parser support hierarchical. 2017-04-24 17:52:40 +08:00
wenshao ff7a6ee52e add testcase. 2017-04-24 15:23:08 +08:00
wenshao d3bacf9e70 mysql parser support Hierarchical clause. 2017-04-24 00:39:18 +08:00
wenshao 915854c7c8 refactor sql parser for oracle Hierarchical clause. 2017-04-23 16:26:06 +08:00
wenshao f217ba8e93 improved PageUtils.hasUnorderedLimit. 2017-04-23 15:39:56 +08:00
wenshao bdfb02eb41 improved PageUtils.hasUnorderedLimit. 2017-04-23 15:39:19 +08:00
wenshao ed803392d8 more GetConnectionTimeout message info. add field 'creatingCount' 2017-04-23 15:38:28 +08:00
wenshao ea064d96d0 import spring-boot-starter. 2017-04-19 14:17:59 +08:00
wenshao 4e00ace631 add method PageUtils.hasUnorderedLimit for mysql. for issue #1688 2017-04-18 17:08:07 +08:00
wenshao ef4a419c7f add testcase for issue #1689 2017-04-18 16:30:35 +08:00
wenshao 6fe79f5ec1 bug fixed for mysql 5.7 union. 2017-04-18 15:51:25 +08:00
wenshao 9e80c23b7b improved ExceptionSorter. 2017-04-18 15:49:54 +08:00
wenshao 85aeca86ec log more info. for issue #1682 2017-04-14 11:56:23 +08:00
wenshao a0db5a1d90 bug fixed for issue #1684 2017-04-14 11:12:10 +08:00
高铁 7f9023feae Merge pull request #1681 from zxy1123/Branch_1.0.28
for corona fix
2017-04-12 10:20:55 +08:00
zxy 1bdddef7f3 for corona fix 2017-04-11 22:27:39 +08:00
wenshao a18e8b3a4a bug fixed for issue #1663 2017-04-05 20:39:34 +08:00
wenshao 23d2bf5fe7 improved odps sql parser, support more 'change column' syntax. 2017-04-05 20:14:10 +08:00
wenshao 99337c1ffb refactor sql parser about the desc and explain parts of the code 2017-03-25 20:10:44 +08:00
高铁 7322da961b Merge pull request #1651 from bobtiernay-okta/1645-add-full-mysql-explain-support
#1645 - Added full support for MySQL EXPLAIN / DESCRIBE.
2017-03-25 17:49:54 +08:00
高铁 17fda371b7 Merge pull request #1655 from kerry8899/patch-2
SQL执行异常时,输出可执行SQL
2017-03-24 22:00:44 +08:00
wenshao 6d6aa8eda1 improved support hints. 2017-03-24 21:06:38 +08:00
wenshao 04d7a1a32d 1.0.30-SNAPSHOT 2017-03-24 21:06:10 +08:00
wenshao cd8b7dce11 improved mysql parser add_index support. for issue #1645 2017-03-23 23:10:58 +08:00
kerry8899 bbd241a654 SQL异常时, 输出可执行的SQL
SQL异常时, 输出可执行的SQL, 并是否输出可执行SQL受配置参数statementExecutableSqlLogEnable的约束
2017-03-23 22:24:01 +08:00
wenshao c607356412 improved sql parser for mysql explain. for issue #1645 2017-03-22 13:52:30 +08:00
Bob Tiernay 6c147a5667 #1645 - Added full support for MySQL EXPLAIN / DESCRIBE. 2017-03-21 20:58:51 -04:00
wenshao a861aeab24 fixed copyright info. 2101 -> 2017 1.0.29 2017-03-14 21:39:18 +08:00
wenshao c3db40c748 fixed copyright info. 2101 -> 2017 2017-03-14 21:18:18 +08:00