Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
d3f5f8fd
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
d3f5f8fd
编写于
10月 09, 2021
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bugs and case issue
上级
9f9f72a6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
18 deletion
+12
-18
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+8
-3
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+2
-1
tests/script/general/parser/tbnameIn_query.sim
tests/script/general/parser/tbnameIn_query.sim
+2
-14
未找到文件。
src/client/src/tscSQLParser.c
浏览文件 @
d3f5f8fd
...
...
@@ -7559,11 +7559,16 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
SStrToken
*
pToken
=
&
pCreateTableInfo
->
stableName
;
bool
dbIncluded
=
false
;
if
(
tscValidateName
(
pToken
,
true
,
&
dbIncluded
)
!=
TSDB_CODE_SUCCESS
)
{
char
buf
[
TSDB_TABLE_FNAME_LEN
];
SStrToken
sTblToken
;
sTblToken
.
z
=
buf
;
int32_t
code
=
validateTableName
(
pToken
->
z
,
pToken
->
n
,
&
sTblToken
,
&
dbIncluded
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
invalidOperationMsg
(
tscGetErrorMsgPayload
(
pCmd
),
msg1
);
}
int32_t
code
=
tscSetTableFullName
(
&
pStableMetaInfo
->
name
,
p
Token
,
pSql
,
dbIncluded
);
code
=
tscSetTableFullName
(
&
pStableMetaInfo
->
name
,
&
sTbl
Token
,
pSql
,
dbIncluded
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
}
...
...
@@ -7793,7 +7798,7 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
}
SRelElementPair
*
p1
=
taosArrayGet
(
pFromInfo
->
list
,
0
);
SStrToken
srcToken
=
{.
z
=
p1
->
tableName
.
z
,
.
n
=
p1
->
tableName
.
n
,
.
type
=
TK_STRING
};
SStrToken
srcToken
=
{.
z
=
p1
->
tableName
.
z
,
.
n
=
p1
->
tableName
.
n
,
.
type
=
p1
->
tableName
.
type
};
bool
dbIncluded2
=
false
;
if
(
tscValidateName
(
&
srcToken
,
true
,
&
dbIncluded2
)
!=
TSDB_CODE_SUCCESS
)
{
...
...
src/kit/shell/src/shellEngine.c
浏览文件 @
d3f5f8fd
...
...
@@ -250,6 +250,7 @@ int32_t shellRunCommand(TAOS* con, char* command) {
break
;
case
'\''
:
case
'"'
:
case
'`'
:
if
(
quote
)
{
*
p
++
=
'\\'
;
}
...
...
@@ -271,7 +272,7 @@ int32_t shellRunCommand(TAOS* con, char* command) {
if
(
quote
==
c
)
{
quote
=
0
;
}
else
if
(
quote
==
0
&&
(
c
==
'\''
||
c
==
'"'
))
{
}
else
if
(
quote
==
0
&&
(
c
==
'\''
||
c
==
'"'
||
c
==
'`'
))
{
quote
=
c
;
}
...
...
tests/script/general/parser/tbnameIn_query.sim
浏览文件 @
d3f5f8fd
...
...
@@ -101,9 +101,9 @@ if $data11 != 2 then
return -1
endi
##
tbname in can accpet Upper case table nam
e
##
no support tbname in Upper cas
e
sql select count(*) from $stb where tbname in ('ti_tb0', 'TI_tb1', 'TI_TB2') group by t1 order by t1
if $rows !=
3
then
if $rows !=
1
then
return -1
endi
if $data00 != 10 then
...
...
@@ -112,18 +112,6 @@ endi
if $data01 != 0 then
return -1
endi
if $data10 != 10 then
return -1
endi
if $data11 != 1 then
return -1
endi
if $data20 != 10 then
return -1
endi
if $data21 != 2 then
return -1
endi
sql select count(*) from $stb where tbname in ('ti_tb1', 'ti_tb300') and tbname in ('ti_tb5', 'ti_tb1000') group by t1 order by t1 asc
if $rows != 0 then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录