xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #6908 from taosdata/fix/TD-5055 

[TD-5055]<fix> handle incorret result
This commit is contained in:
Haojun Liao 2021-07-19 10:41:33 +08:00 committed by GitHub
parent c1fa46d543 58ba4d0081
commit c9a3b75090
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/src/tscSQLParser.c
View File

@ -8277,7 +8277,9 @@ static int32_t doValidateSubquery(SSqlNode* pSqlNode, int32_t index, SSqlObj* pS
// union all is not support currently // union all is not support currently
SSqlNode* p = taosArrayGetP(subInfo->pSubquery, 0); SSqlNode* p = taosArrayGetP(subInfo->pSubquery, 0);
if (taosArrayGetSize(subInfo->pSubquery) >= 2) {
return invalidOperationMsg(msgBuf, "not support union in subquery");
}
SQueryInfo* pSub = calloc(1, sizeof(SQueryInfo)); SQueryInfo* pSub = calloc(1, sizeof(SQueryInfo));
tscInitQueryInfo(pSub); tscInitQueryInfo(pSub);

75
tests/pytest/query/nestquery_last_row.py
View File

@ -160,22 +160,23 @@ class TDTestCase:
tdSql.checkData(0,9,9.000000000) tdSql.checkData(0,9,9.000000000)
tdSql.checkData(0,10,'2020-09-13 20:26:40.009') tdSql.checkData(0,10,'2020-09-13 20:26:40.009')
# incorrect result, not support nest > 2
sql = '''select last_row(*) from sql = '''select last_row(*) from
((select * from table_0) union all ((select * from table_0) union all
(select * from table_1) union all (select * from table_1) union all
(select * from table_2));''' (select * from table_2));'''
tdSql.query(sql) tdSql.error(sql)
tdSql.checkRows(1) #tdSql.checkRows(1)
tdSql.checkData(0,1,self.num-1) #tdSql.checkData(0,1,self.num-1)
tdSql.checkData(0,2,self.num-1) #tdSql.checkData(0,2,self.num-1)
tdSql.checkData(0,3,self.num-1) #tdSql.checkData(0,3,self.num-1)
tdSql.checkData(0,4,self.num-1) #tdSql.checkData(0,4,self.num-1)
tdSql.checkData(0,5,'False') #tdSql.checkData(0,5,'False')
tdSql.checkData(0,6,'binary.9') #tdSql.checkData(0,6,'binary.9')
tdSql.checkData(0,7,'nchar.9') #tdSql.checkData(0,7,'nchar.9')
tdSql.checkData(0,8,9.00000) #tdSql.checkData(0,8,9.00000)
tdSql.checkData(0,9,9.000000000) #tdSql.checkData(0,9,9.000000000)
tdSql.checkData(0,10,'2020-09-13 20:26:40.009') #tdSql.checkData(0,10,'2020-09-13 20:26:40.009')
# bug 5055 # bug 5055
# sql = '''select last_row(*) from # sql = '''select last_row(*) from
@ -189,18 +190,18 @@ class TDTestCase:
((select last_row(*) from table_0) union all ((select last_row(*) from table_0) union all
(select last_row(*) from table_1) union all (select last_row(*) from table_1) union all
(select last_row(*) from table_2));''' (select last_row(*) from table_2));'''
tdSql.query(sql) tdSql.error(sql)
tdSql.checkRows(1) #tdSql.checkRows(1)
tdSql.checkData(0,1,self.num-1) #tdSql.checkData(0,1,self.num-1)
tdSql.checkData(0,2,self.num-1) #tdSql.checkData(0,2,self.num-1)
tdSql.checkData(0,3,self.num-1) #tdSql.checkData(0,3,self.num-1)
tdSql.checkData(0,4,self.num-1) #tdSql.checkData(0,4,self.num-1)
tdSql.checkData(0,5,'False') #tdSql.checkData(0,5,'False')
tdSql.checkData(0,6,'binary.9') #tdSql.checkData(0,6,'binary.9')
tdSql.checkData(0,7,'nchar.9') #tdSql.checkData(0,7,'nchar.9')
tdSql.checkData(0,8,9.00000) #tdSql.checkData(0,8,9.00000)
tdSql.checkData(0,9,9.000000000) #tdSql.checkData(0,9,9.000000000)
tdSql.checkData(0,10,'2020-09-13 20:26:40.009') #tdSql.checkData(0,10,'2020-09-13 20:26:40.009')
# bug 5055 # bug 5055
# sql = '''select last_row(*) from # sql = '''select last_row(*) from
@ -214,18 +215,18 @@ class TDTestCase:
((select * from table_0 limit 5 offset 5) union all ((select * from table_0 limit 5 offset 5) union all
(select * from table_1 limit 5 offset 5) union all (select * from table_1 limit 5 offset 5) union all
(select * from regular_table_1 limit 5 offset 5));''' (select * from regular_table_1 limit 5 offset 5));'''
tdSql.query(sql) tdSql.error(sql)
tdSql.checkRows(1) #tdSql.checkRows(1)
tdSql.checkData(0,1,self.num-1) #tdSql.checkData(0,1,self.num-1)
tdSql.checkData(0,2,self.num-1) #tdSql.checkData(0,2,self.num-1)
tdSql.checkData(0,3,self.num-1) #tdSql.checkData(0,3,self.num-1)
tdSql.checkData(0,4,self.num-1) #tdSql.checkData(0,4,self.num-1)
tdSql.checkData(0,5,'False') #tdSql.checkData(0,5,'False')
tdSql.checkData(0,6,'binary.9') #tdSql.checkData(0,6,'binary.9')
tdSql.checkData(0,7,'nchar.9') #tdSql.checkData(0,7,'nchar.9')
tdSql.checkData(0,8,9.00000) #tdSql.checkData(0,8,9.00000)
tdSql.checkData(0,9,9.000000000) #tdSql.checkData(0,9,9.000000000)
tdSql.checkData(0,10,'2020-09-13 20:26:40.009') #tdSql.checkData(0,10,'2020-09-13 20:26:40.009')
sql = '''select last_row(*) from sql = '''select last_row(*) from
@ -260,4 +261,4 @@ class TDTestCase:
tdCases.addWindows(__file__, TDTestCase()) tdCases.addWindows(__file__, TDTestCase())
tdCases.addLinux(__file__, TDTestCase()) tdCases.addLinux(__file__, TDTestCase())