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-17 18:08:45 +08:00
parent 74f3902af0
commit 5c06274aba
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/system-test/2-query/union3.py
View File

@ -223,25 +223,45 @@ class TDTestCase:
res1_type = self.__get_type(0) res1_type = self.__get_type(0)
for j in range(len(sqls[i:])): for j in range(len(sqls[i:])):
tdSql.query(sqls[j+i]) tdSql.query(sqls[j+i])
union_type = False order_union_type = False
rev_order_type = False
all_union_type = False
res2_type = self.__get_type(0) res2_type = self.__get_type(0)
if res1_type in ( "BIGINT" , "NCHAR" ): if res2_type == res1_type:
union_type = True all_union_type = True
elif res2_type == res1_type: elif res1_type in ( "BIGINT" , "NCHAR" ) and res2_type in ("BIGINT" , "NCHAR"):
union_type = True all_union_type = True
elif res1_type in ("BIGINT", "NCHAR"):
order_union_type = True
elif res2_type in ("BIGINT", "NCHAR"):
rev_order_type = True
elif res1_type == "TIMESAMP" and res2_type not in ("BINARY", "NCHAR"): elif res1_type == "TIMESAMP" and res2_type not in ("BINARY", "NCHAR"):
union_type = True order_union_type = True
elif res2_type == "TIMESAMP" and res1_type not in ("BINARY", "NCHAR"):
rev_order_type = True
elif res1_type == "BINARY" and res2_type != "NCHAR": elif res1_type == "BINARY" and res2_type != "NCHAR":
union_type = True order_union_type = True
elif res2_type == "BINARY" and res1_type != "NCHAR":
rev_order_type = True
if union_type: if all_union_type:
tdSql.query(f"{sqls[i]} union {sqls[j+i]}") tdSql.query(f"{sqls[i]} union {sqls[j+i]}")
tdSql.query(f"{sqls[j+i]} union {sqls[i]}") tdSql.query(f"{sqls[j+i]} union {sqls[i]}")
tdSql.checkCols(1) tdSql.checkCols(1)
tdSql.query(f"{sqls[i]} union all {sqls[j+i]}") tdSql.query(f"{sqls[i]} union all {sqls[j+i]}")
tdSql.query(f"{sqls[j+i]} union all {sqls[i]}") tdSql.query(f"{sqls[j+i]} union all {sqls[i]}")
tdSql.checkCols(1) tdSql.checkCols(1)
elif order_union_type:
tdSql.query(f"{sqls[i]} union {sqls[j+i]}")
tdSql.checkCols(1)
tdSql.query(f"{sqls[i]} union all {sqls[j+i]}")
tdSql.checkCols(1)
elif rev_order_type:
tdSql.query(f"{sqls[j+i]} union {sqls[i]}")
tdSql.checkCols(1)
tdSql.query(f"{sqls[j+i]} union all {sqls[i]}")
tdSql.checkCols(1)
else: else:
tdSql.error(f"{sqls[i]} union {sqls[j+i]}") tdSql.error(f"{sqls[i]} union {sqls[j+i]}")