Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
21816e5b
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
21816e5b
编写于
10月 10, 2017
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #386
上级
79d3d55d
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
106 addition
and
1 deletion
+106
-1
RELEASE-NOTES.md
RELEASE-NOTES.md
+4
-0
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/routing/router/ParsingSQLRouter.java
...io/shardingjdbc/core/routing/router/ParsingSQLRouter.java
+4
-1
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/routing/type/all/DatabaseAllRoutingEngine.java
...gjdbc/core/routing/type/all/DatabaseAllRoutingEngine.java
+48
-0
sharding-jdbc-core/src/test/resources/integrate/assert/select.xml
...-jdbc-core/src/test/resources/integrate/assert/select.xml
+5
-0
sharding-jdbc-core/src/test/resources/integrate/dataset/masterslave/expect/select/SelectOne.xml
...integrate/dataset/masterslave/expect/select/SelectOne.xml
+3
-0
sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/db/expect/select/SelectOne.xml
...integrate/dataset/sharding/db/expect/select/SelectOne.xml
+12
-0
sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/dbtbl/expect/select/SelectOne.xml
...egrate/dataset/sharding/dbtbl/expect/select/SelectOne.xml
+12
-0
sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/masterslave/expect/select/SelectOne.xml
.../dataset/sharding/masterslave/expect/select/SelectOne.xml
+12
-0
sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/SelectOne.xml
...ntegrate/dataset/sharding/tbl/expect/select/SelectOne.xml
+3
-0
sharding-jdbc-core/src/test/resources/parser/select.xml
sharding-jdbc-core/src/test/resources/parser/select.xml
+2
-0
sharding-jdbc-core/src/test/resources/sql/dql/select.xml
sharding-jdbc-core/src/test/resources/sql/dql/select.xml
+1
-0
未找到文件。
RELEASE-NOTES.md
浏览文件 @
21816e5b
## 2.0.0.M1
### 功能提升
1.
[
ISSUE #386
](
https://github.com/shardingjdbc/sharding-jdbc/issues/386
)
支持SELECT 1这种不包含表名称的SQL
### 缺陷修正
1.
[
ISSUE #387
](
https://github.com/shardingjdbc/sharding-jdbc/issues/387
)
当函数+列名中存在'
`
'防止关键字时处理出错
...
...
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/routing/router/ParsingSQLRouter.java
浏览文件 @
21816e5b
...
...
@@ -17,6 +17,7 @@
package
io.shardingjdbc.core.routing.router
;
import
io.shardingjdbc.core.routing.type.all.DatabaseAllRoutingEngine
;
import
io.shardingjdbc.core.rule.ShardingRule
;
import
io.shardingjdbc.core.constant.DatabaseType
;
import
io.shardingjdbc.core.jdbc.core.ShardingContext
;
...
...
@@ -108,7 +109,9 @@ public final class ParsingSQLRouter implements SQLRouter {
private
RoutingResult
route
(
final
List
<
Object
>
parameters
,
final
SQLStatement
sqlStatement
)
{
Collection
<
String
>
tableNames
=
sqlStatement
.
getTables
().
getTableNames
();
RoutingEngine
routingEngine
;
if
(
1
==
tableNames
.
size
()
||
shardingRule
.
isAllBindingTables
(
tableNames
)
||
shardingRule
.
isAllInDefaultDataSource
(
tableNames
))
{
if
(
tableNames
.
isEmpty
())
{
routingEngine
=
new
DatabaseAllRoutingEngine
(
shardingRule
.
getDataSourceMap
());
}
else
if
(
1
==
tableNames
.
size
()
||
shardingRule
.
isAllBindingTables
(
tableNames
)
||
shardingRule
.
isAllInDefaultDataSource
(
tableNames
))
{
routingEngine
=
new
SimpleRoutingEngine
(
shardingRule
,
parameters
,
tableNames
.
iterator
().
next
(),
sqlStatement
);
}
else
{
// TODO config for cartesian set
...
...
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/routing/type/all/DatabaseAllRoutingEngine.java
0 → 100644
浏览文件 @
21816e5b
/*
* Copyright 1999-2015 dangdang.com.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* </p>
*/
package
io.shardingjdbc.core.routing.type.all
;
import
io.shardingjdbc.core.routing.type.RoutingEngine
;
import
io.shardingjdbc.core.routing.type.RoutingResult
;
import
io.shardingjdbc.core.routing.type.TableUnit
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
javax.sql.DataSource
;
import
java.util.Map
;
/**
* Database all routing engine.
*
* @author zhangliang
*/
@RequiredArgsConstructor
@Slf4j
public
final
class
DatabaseAllRoutingEngine
implements
RoutingEngine
{
private
final
Map
<
String
,
DataSource
>
dataSourceMap
;
@Override
public
RoutingResult
route
()
{
RoutingResult
result
=
new
RoutingResult
();
for
(
String
each
:
dataSourceMap
.
keySet
())
{
result
.
getTableUnits
().
getTableUnits
().
add
(
new
TableUnit
(
each
,
""
,
""
));
}
return
result
;
}
}
sharding-jdbc-core/src/test/resources/integrate/assert/select.xml
浏览文件 @
21816e5b
<?xml version="1.0" encoding="UTF-8"?>
<sqls>
<sql
id=
"assertSelectOne"
>
<sharding-rule>
<data
expected=
"select/SelectOne.xml"
/>
</sharding-rule>
</sql>
<sql
id=
"assertSelectNotEqualsWithSingleTable"
>
<sharding-rule
value=
"tbl"
>
<data
parameter=
"100000"
expected=
"select/SelectNotEqualsWithSingleTable.xml"
/>
...
...
sharding-jdbc-core/src/test/resources/integrate/dataset/masterslave/expect/select/SelectOne.xml
0 → 100644
浏览文件 @
21816e5b
<dataset>
<t_order
a=
"1"
/>
</dataset>
sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/db/expect/select/SelectOne.xml
0 → 100644
浏览文件 @
21816e5b
<dataset>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
</dataset>
sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/dbtbl/expect/select/SelectOne.xml
0 → 100644
浏览文件 @
21816e5b
<dataset>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
</dataset>
sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/masterslave/expect/select/SelectOne.xml
0 → 100644
浏览文件 @
21816e5b
<dataset>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
<t_order
a=
"1"
/>
</dataset>
sharding-jdbc-core/src/test/resources/integrate/dataset/sharding/tbl/expect/select/SelectOne.xml
0 → 100644
浏览文件 @
21816e5b
<dataset>
<t_order
a=
"1"
/>
</dataset>
sharding-jdbc-core/src/test/resources/parser/select.xml
浏览文件 @
21816e5b
<?xml version="1.0" encoding="UTF-8"?>
<asserts>
<assert
id=
"assertSelectOne"
>
</assert>
<assert
id=
"assertSelectNotEqualsWithSingleTable"
parameters=
"1"
>
<tables>
<table
name=
"t_order_item"
/>
...
...
sharding-jdbc-core/src/test/resources/sql/dql/select.xml
浏览文件 @
21816e5b
<?xml version="1.0" encoding="UTF-8"?>
<sqls>
<sql
id=
"assertSelectOne"
value=
"SELECT 1 as a"
/>
<sql
id=
"assertSelectNotEqualsWithSingleTable"
value=
"SELECT * FROM t_order_item WHERE item_id <> %s ORDER BY item_id"
/>
<sql
id=
"assertSelectNotEqualsWithSingleTableForExclamationEqual"
value=
"SELECT * FROM t_order_item WHERE item_id != %s ORDER BY item_id"
/>
<sql
id=
"assertSelectNotEqualsWithSingleTableForNotIn"
value=
"SELECT * FROM t_order_item WHERE item_id NOT IN (%s) ORDER BY item_id"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录