Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
ce0386a9
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
ce0386a9
编写于
11月 16, 2021
作者:
S
shenglian zhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TS-636]<fix>:escape % with \ suport
上级
1e61044b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
43 addition
and
3 deletion
+43
-3
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+1
-1
src/util/src/tcompare.c
src/util/src/tcompare.c
+1
-0
src/util/src/tutil.c
src/util/src/tutil.c
+1
-1
tests/script/general/parser/like.sim
tests/script/general/parser/like.sim
+40
-1
未找到文件。
src/kit/shell/src/shellEngine.c
浏览文件 @
ce0386a9
...
@@ -262,7 +262,7 @@ int32_t shellRunCommand(TAOS* con, char* command) {
...
@@ -262,7 +262,7 @@ int32_t shellRunCommand(TAOS* con, char* command) {
}
}
if
(
c
==
'\\'
)
{
if
(
c
==
'\\'
)
{
if
(
quote
!=
0
&&
(
*
command
==
'_'
||
*
command
==
'\\'
))
{
if
(
quote
!=
0
&&
(
*
command
==
'_'
||
*
command
==
'
%'
||
*
command
==
'
\\'
))
{
//DO nothing
//DO nothing
}
else
{
}
else
{
esc
=
true
;
esc
=
true
;
...
...
src/util/src/tcompare.c
浏览文件 @
ce0386a9
...
@@ -278,6 +278,7 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
...
@@ -278,6 +278,7 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
if
(
j
<=
size
)
{
if
(
j
<=
size
)
{
if
(
c
==
'\\'
&&
patterStr
[
i
]
==
'_'
&&
c1
==
'_'
)
{
i
++
;
continue
;
}
if
(
c
==
'\\'
&&
patterStr
[
i
]
==
'_'
&&
c1
==
'_'
)
{
i
++
;
continue
;
}
if
(
c
==
'\\'
&&
patterStr
[
i
]
==
'%'
&&
c1
==
'%'
)
{
i
++
;
continue
;
}
if
(
c
==
c1
||
tolower
(
c
)
==
tolower
(
c1
)
||
(
c
==
pInfo
->
matchOne
&&
c1
!=
0
))
{
if
(
c
==
c1
||
tolower
(
c
)
==
tolower
(
c1
)
||
(
c
==
pInfo
->
matchOne
&&
c1
!=
0
))
{
continue
;
continue
;
}
}
...
...
src/util/src/tutil.c
浏览文件 @
ce0386a9
...
@@ -64,7 +64,7 @@ int32_t strRmquote(char *z, int32_t len){
...
@@ -64,7 +64,7 @@ int32_t strRmquote(char *z, int32_t len){
int32_t
j
=
0
;
int32_t
j
=
0
;
for
(
uint32_t
k
=
1
;
k
<
len
-
1
;
++
k
)
{
for
(
uint32_t
k
=
1
;
k
<
len
-
1
;
++
k
)
{
if
(
z
[
k
]
==
'\\'
||
(
z
[
k
]
==
delim
&&
z
[
k
+
1
]
==
delim
))
{
if
(
z
[
k
]
==
'\\'
||
(
z
[
k
]
==
delim
&&
z
[
k
+
1
]
==
delim
))
{
if
(
z
[
k
]
==
'\\'
&&
z
[
k
+
1
]
==
'_'
)
{
if
(
(
z
[
k
]
==
'\\'
&&
z
[
k
+
1
]
==
'_'
)
||
(
z
[
k
]
==
'\\'
&&
z
[
k
+
1
]
==
'%'
)
)
{
//match '_' self
//match '_' self
}
else
{
}
else
{
z
[
j
]
=
z
[
k
+
1
];
z
[
j
]
=
z
[
k
+
1
];
...
...
tests/script/general/parser/like.sim
浏览文件 @
ce0386a9
...
@@ -23,7 +23,7 @@ sql create table $table2 (ts timestamp, b binary(20))
...
@@ -23,7 +23,7 @@ sql create table $table2 (ts timestamp, b binary(20))
sql insert into $table1 values(now, "table_name")
sql insert into $table1 values(now, "table_name")
sql insert into $table1 values(now-1m, "tablexname")
sql insert into $table1 values(now-1m, "tablexname")
sql insert into $table1 values(now-2m, "tablexxx")
sql insert into $table1 values(now-2m, "tablexxx")
sql insert into $table1 values(now-
2
m, "table")
sql insert into $table1 values(now-
3
m, "table")
sql select b from $table1
sql select b from $table1
if $rows != 4 then
if $rows != 4 then
...
@@ -56,6 +56,45 @@ if $rows != 1 then
...
@@ -56,6 +56,45 @@ if $rows != 1 then
return -1
return -1
endi
endi
sql create database escape_percentage;
sql use escape_percentage;
$table1 = tablename
$table2 = `table%`
sql create table $table1 (ts timestamp, b binary(20))
sql create table $table2 (ts timestamp, b binary(20))
sql insert into $table1 values(now, "table%name")
sql insert into $table1 values(now-1m, "table%")
sql insert into $table1 values(now-2m, "table%%%")
sql insert into $table1 values(now-3m, "table")
sql select b from $table1 where b like 'table\%'
print $rows
if $rows != 1 then
return -1
endi
sql select b from $table1 where b like 'table\%\%\%'
print $rows
if $rows != 1 then
return -1
endi
sql select b from $table1 where b like 'table%'
print $rows
if $rows != 4 then
return -1
endi
sql show tables like 'table\%'
print $rows
if $rows != 1 then
return -1
endi
sql show tables like 'table%'
print $rows
if $rows != 2 then
return -1
endi
sql drop database escape_percentage
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s stop -x SIGINT
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录