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

View File

@ -142,7 +142,8 @@ 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)
for select_claus in select_claus_list:
group_claus = self.__group_condition(tbname=join_tb, col=select_claus) group_claus = self.__group_condition(tbname=join_tb, col=select_claus)
where_claus = self.__where_condition(query_conditon=select_claus) where_claus = self.__where_condition(query_conditon=select_claus)
having_claus = self.__group_condition(tbname=join_tb, col=select_claus, having=f"{select_claus} is not null") having_claus = self.__group_condition(tbname=join_tb, col=select_claus, having=f"{select_claus} is not null")
@ -156,7 +157,8 @@ class TDTestCase:
) )
__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)
for select_claus in select_claus_list:
group_claus = self.__group_condition(tbname=tb, col=select_claus) group_claus = self.__group_condition(tbname=tb, col=select_claus)
where_claus = self.__where_condition(query_conditon=select_claus) where_claus = self.__where_condition(query_conditon=select_claus)
having_claus = self.__group_condition(tbname=tb, col=select_claus, having=f"{select_claus} is not null") having_claus = self.__group_condition(tbname=tb, col=select_claus, having=f"{select_claus} is not null")