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

fix case

This commit is contained in:
cpwu 2022-05-16 14:25:47 +08:00
parent 8c6da59e09
commit c58fd6ec63
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/system-test/2-query/union.py
View File

@ -142,30 +142,32 @@ class TDTestCase:
__join_tblist = self.__join_tblist __join_tblist = self.__join_tblist
for join_tblist in __join_tblist: for join_tblist in __join_tblist:
for join_tb in join_tblist: for join_tb in join_tblist:
select_claus = self.__query_condition(join_tb) select_claus_list = self.__query_condition(join_tb)
group_claus = self.__group_condition(tbname=join_tb, col=select_claus) for select_claus in select_claus_list:
where_claus = self.__where_condition(query_conditon=select_claus) group_claus = self.__group_condition(tbname=join_tb, col=select_claus)
having_claus = self.__group_condition(tbname=join_tb, col=select_claus, having=f"{select_claus} is not null") where_claus = self.__where_condition(query_conditon=select_claus)
sqls.extend( having_claus = self.__group_condition(tbname=join_tb, col=select_claus, having=f"{select_claus} is not null")
( sqls.extend(
self.__single_sql(select_claus, join_tb, where_claus, group_claus), (
self.__single_sql(select_claus, join_tb, where_claus, having_claus), self.__single_sql(select_claus, join_tb, where_claus, group_claus),
self.__single_sql(select_claus, self.__join_condition(join_tblist), where_claus, having_claus), self.__single_sql(select_claus, join_tb, where_claus, having_claus),
self.__single_sql(select_claus, self.__join_condition(join_tblist, INNER=True), where_claus, having_claus), self.__single_sql(select_claus, self.__join_condition(join_tblist), where_claus, having_claus),
self.__single_sql(select_claus, self.__join_condition(join_tblist, INNER=True), where_claus, having_claus),
)
) )
)
__no_join_tblist = self.__tb_liast __no_join_tblist = self.__tb_liast
for tb in __no_join_tblist: for tb in __no_join_tblist:
select_claus = self.__query_condition(tb) select_claus_list = self.__query_condition(tb)
group_claus = self.__group_condition(tbname=tb, col=select_claus) for select_claus in select_claus_list:
where_claus = self.__where_condition(query_conditon=select_claus) group_claus = self.__group_condition(tbname=tb, col=select_claus)
having_claus = self.__group_condition(tbname=tb, col=select_claus, having=f"{select_claus} is not null") where_claus = self.__where_condition(query_conditon=select_claus)
sqls.extend( having_claus = self.__group_condition(tbname=tb, col=select_claus, having=f"{select_claus} is not null")
( sqls.extend(
self.__single_sql(select_claus, join_tb, where_claus, group_claus), (
self.__single_sql(select_claus, join_tb, where_claus, having_claus), self.__single_sql(select_claus, join_tb, where_claus, group_claus),
self.__single_sql(select_claus, join_tb, where_claus, having_claus),
)
) )
)
return sqls return sqls