Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
34aac279
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,发现更多精彩内容 >>
提交
34aac279
编写于
5月 05, 2017
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor SQLExpr
上级
e12567ce
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
47 addition
and
37 deletion
+47
-37
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/context/ConditionContext.java
...ddframe/rdb/sharding/parser/context/ConditionContext.java
+3
-3
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/dialect/mysql/parser/MySQLInsertParser.java
...arding/parser/dialect/mysql/parser/MySQLInsertParser.java
+2
-2
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLCharExpr.java
...angdang/ddframe/rdb/sharding/parser/expr/SQLCharExpr.java
+0
-25
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLExpr.java
...om/dangdang/ddframe/rdb/sharding/parser/expr/SQLExpr.java
+5
-0
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLIdentifierExpr.java
...g/ddframe/rdb/sharding/parser/expr/SQLIdentifierExpr.java
+6
-1
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLLiteralExpr.java
...dang/ddframe/rdb/sharding/parser/expr/SQLLiteralExpr.java
+5
-0
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLNumberExpr.java
...gdang/ddframe/rdb/sharding/parser/expr/SQLNumberExpr.java
+6
-1
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLPlaceholderExpr.java
.../ddframe/rdb/sharding/parser/expr/SQLPlaceholderExpr.java
+6
-1
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLPropertyExpr.java
...ang/ddframe/rdb/sharding/parser/expr/SQLPropertyExpr.java
+6
-1
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLTextExpr.java
...angdang/ddframe/rdb/sharding/parser/expr/SQLTextExpr.java
+6
-1
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/parser/SQLParser.java
...angdang/ddframe/rdb/sharding/parser/parser/SQLParser.java
+2
-2
未找到文件。
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/context/ConditionContext.java
浏览文件 @
34aac279
...
...
@@ -18,10 +18,10 @@
package
com.dangdang.ddframe.rdb.sharding.parser.context
;
import
com.dangdang.ddframe.rdb.sharding.parser.contstant.ShardingOperator
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.AbstractSQLTextLiteralExpr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLExpr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLNumberExpr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLPlaceholderExpr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLTextExpr
;
import
com.google.common.base.Optional
;
import
lombok.EqualsAndHashCode
;
import
lombok.Getter
;
...
...
@@ -126,8 +126,8 @@ public final class ConditionContext {
if
(
sqlExpr
instanceof
SQLPlaceholderExpr
)
{
values
.
add
((
Comparable
)
((
SQLPlaceholderExpr
)
sqlExpr
).
getValue
());
valueIndices
.
add
(((
SQLPlaceholderExpr
)
sqlExpr
).
getIndex
());
}
else
if
(
sqlExpr
instanceof
AbstractSQLTextLiteral
Expr
)
{
values
.
add
(((
AbstractSQLTextLiteral
Expr
)
sqlExpr
).
getText
());
}
else
if
(
sqlExpr
instanceof
SQLText
Expr
)
{
values
.
add
(((
SQLText
Expr
)
sqlExpr
).
getText
());
}
else
if
(
sqlExpr
instanceof
SQLNumberExpr
)
{
values
.
add
((
Comparable
)
((
SQLNumberExpr
)
sqlExpr
).
getNumber
());
}
...
...
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/dialect/mysql/parser/MySQLInsertParser.java
浏览文件 @
34aac279
...
...
@@ -21,7 +21,7 @@ import com.dangdang.ddframe.rdb.sharding.api.rule.ShardingRule;
import
com.dangdang.ddframe.rdb.sharding.parser.context.ConditionContext
;
import
com.dangdang.ddframe.rdb.sharding.parser.context.ShardingColumnContext
;
import
com.dangdang.ddframe.rdb.sharding.parser.dialect.mysql.lexer.MySQLKeyword
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQL
Char
Expr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQL
Text
Expr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLExpr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLIgnoreExpr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLNumberExpr
;
...
...
@@ -69,7 +69,7 @@ public final class MySQLInsertParser extends AbstractInsertParser {
}
else
if
(
getExprParser
().
equalAny
(
Literals
.
FLOAT
))
{
sqlExpr
=
new
SQLNumberExpr
(
Double
.
parseDouble
(
getExprParser
().
getLexer
().
getCurrentToken
().
getLiterals
()));
}
else
if
(
getExprParser
().
equalAny
(
Literals
.
CHARS
))
{
sqlExpr
=
new
SQL
Char
Expr
(
getExprParser
().
getLexer
().
getCurrentToken
().
getLiterals
());
sqlExpr
=
new
SQL
Text
Expr
(
getExprParser
().
getLexer
().
getCurrentToken
().
getLiterals
());
}
else
if
(
getExprParser
().
equalAny
(
DefaultKeyword
.
NULL
))
{
sqlExpr
=
new
SQLIgnoreExpr
();
}
else
if
(
getExprParser
().
equalAny
(
Symbol
.
QUESTION
))
{
...
...
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLCharExpr.java
已删除
100755 → 0
浏览文件 @
e12567ce
/*
* 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
com.dangdang.ddframe.rdb.sharding.parser.expr
;
public
class
SQLCharExpr
extends
AbstractSQLTextLiteralExpr
{
public
SQLCharExpr
(
final
String
text
)
{
super
(
text
);
}
}
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLExpr.java
浏览文件 @
34aac279
...
...
@@ -17,5 +17,10 @@
package
com.dangdang.ddframe.rdb.sharding.parser.expr
;
/**
* SQL表达式接口.
*
* @author zhangliang
*/
public
interface
SQLExpr
{
}
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLIdentifierExpr.java
浏览文件 @
34aac279
...
...
@@ -20,9 +20,14 @@ package com.dangdang.ddframe.rdb.sharding.parser.expr;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
/**
* 标识表达式.
*
* @author zhangliang
*/
@RequiredArgsConstructor
@Getter
public
class
SQLIdentifierExpr
implements
SQLExpr
{
public
final
class
SQLIdentifierExpr
implements
SQLExpr
{
private
final
String
name
;
}
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLLiteralExpr.java
浏览文件 @
34aac279
...
...
@@ -17,5 +17,10 @@
package
com.dangdang.ddframe.rdb.sharding.parser.expr
;
/**
* 字面量表达式.
*
* @author zhangliang
*/
public
interface
SQLLiteralExpr
extends
SQLExpr
{
}
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLNumberExpr.java
浏览文件 @
34aac279
...
...
@@ -20,9 +20,14 @@ package com.dangdang.ddframe.rdb.sharding.parser.expr;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
/**
* 数字表达式.
*
* @author zhangliang
*/
@RequiredArgsConstructor
@Getter
public
class
SQLNumberExpr
implements
SQLLiteralExpr
{
public
final
class
SQLNumberExpr
implements
SQLLiteralExpr
{
private
final
Number
number
;
}
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLPlaceholderExpr.java
浏览文件 @
34aac279
...
...
@@ -20,9 +20,14 @@ package com.dangdang.ddframe.rdb.sharding.parser.expr;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
/**
* 占位符表达式.
*
* @author zhangliang
*/
@RequiredArgsConstructor
@Getter
public
class
SQLPlaceholderExpr
implements
SQLExpr
{
public
final
class
SQLPlaceholderExpr
implements
SQLExpr
{
private
final
int
index
;
...
...
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/SQLPropertyExpr.java
浏览文件 @
34aac279
...
...
@@ -20,9 +20,14 @@ package com.dangdang.ddframe.rdb.sharding.parser.expr;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
/**
* 属性表达式.
*
* @author zhangliang
*/
@RequiredArgsConstructor
@Getter
public
class
SQLPropertyExpr
implements
SQLExpr
{
public
final
class
SQLPropertyExpr
implements
SQLExpr
{
private
final
SQLIdentifierExpr
owner
;
...
...
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/
AbstractSQLTextLiteral
Expr.java
→
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/expr/
SQLText
Expr.java
浏览文件 @
34aac279
...
...
@@ -20,9 +20,14 @@ package com.dangdang.ddframe.rdb.sharding.parser.expr;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
/**
* 文本表达式.
*
* @author zhangliang
*/
@RequiredArgsConstructor
@Getter
public
abstract
class
AbstractSQLTextLiteral
Expr
implements
SQLLiteralExpr
{
public
final
class
SQLText
Expr
implements
SQLLiteralExpr
{
private
final
String
text
;
}
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/parser/SQLParser.java
浏览文件 @
34aac279
...
...
@@ -28,7 +28,7 @@ import com.dangdang.ddframe.rdb.sharding.parser.context.ShardingColumnContext;
import
com.dangdang.ddframe.rdb.sharding.parser.context.TableContext
;
import
com.dangdang.ddframe.rdb.sharding.parser.context.TableToken
;
import
com.dangdang.ddframe.rdb.sharding.parser.contstant.AggregationType
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQL
Char
Expr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQL
Text
Expr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLExpr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLIdentifierExpr
;
import
com.dangdang.ddframe.rdb.sharding.parser.expr.SQLIgnoreExpr
;
...
...
@@ -119,7 +119,7 @@ public class SQLParser extends AbstractParser {
return
new
SQLPlaceholderExpr
(
parametersIndex
-
1
,
parameters
.
get
(
parametersIndex
-
1
));
}
if
(
equalAny
(
Literals
.
CHARS
))
{
return
new
SQL
Char
Expr
(
literals
);
return
new
SQL
Text
Expr
(
literals
);
}
// TODO 考虑long的情况
if
(
equalAny
(
Literals
.
INT
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录