From 64660c5abf57ee84add5afb213512e9e0a9a8a17 Mon Sep 17 00:00:00 2001 From: Leo Xu <381899826@qq.com> Date: Thu, 22 Aug 2024 20:29:08 +0800 Subject: [PATCH 1/4] add 2 case --- tests/system-test/2-query/concat.py | 2 ++ tests/system-test/2-query/concat_ws.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/system-test/2-query/concat.py b/tests/system-test/2-query/concat.py index 326f6940f6..feb9bcd647 100644 --- a/tests/system-test/2-query/concat.py +++ b/tests/system-test/2-query/concat.py @@ -144,6 +144,8 @@ class TDTestCase: f"{dbname}.ct2", f"{dbname}.ct4", ] + tdSql.query("select concat(null,null)") # TD-31571 + tdSql.checkRows(1) for tb in tbname: for i in range(2,8): self.__concat_check(tb,i) diff --git a/tests/system-test/2-query/concat_ws.py b/tests/system-test/2-query/concat_ws.py index 26731715c1..c148d734c5 100644 --- a/tests/system-test/2-query/concat_ws.py +++ b/tests/system-test/2-query/concat_ws.py @@ -156,7 +156,8 @@ class TDTestCase: f"{dbname}.ct2", f"{dbname}.ct4", ] - + tdSql.query("select concat_ws(null,null,null);") # TD-31572 + tdSql.checkRows(1) for tb in tbname: for errsql in self.__concat_ws_err_check(tb): tdSql.error(sql=errsql) From 6eb2ee6f1b964667ae193c4d28afdc1e0cc43372 Mon Sep 17 00:00:00 2001 From: Leo Xu <381899826@qq.com> Date: Thu, 22 Aug 2024 20:40:14 +0800 Subject: [PATCH 2/4] add check data --- tests/system-test/2-query/concat.py | 1 + tests/system-test/2-query/concat_ws.py | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/system-test/2-query/concat.py b/tests/system-test/2-query/concat.py index feb9bcd647..f2f231a858 100644 --- a/tests/system-test/2-query/concat.py +++ b/tests/system-test/2-query/concat.py @@ -146,6 +146,7 @@ class TDTestCase: ] tdSql.query("select concat(null,null)") # TD-31571 tdSql.checkRows(1) + tdSql.getData(0, 0) == "NULL" for tb in tbname: for i in range(2,8): self.__concat_check(tb,i) diff --git a/tests/system-test/2-query/concat_ws.py b/tests/system-test/2-query/concat_ws.py index c148d734c5..e0fc260527 100644 --- a/tests/system-test/2-query/concat_ws.py +++ b/tests/system-test/2-query/concat_ws.py @@ -158,6 +158,7 @@ class TDTestCase: ] tdSql.query("select concat_ws(null,null,null);") # TD-31572 tdSql.checkRows(1) + tdSql.getData(0, 0) == "NULL" for tb in tbname: for errsql in self.__concat_ws_err_check(tb): tdSql.error(sql=errsql) From c648f708e26acba54804ab2db09d258e1620f6d0 Mon Sep 17 00:00:00 2001 From: Leo Xu <381899826@qq.com> Date: Thu, 22 Aug 2024 22:04:34 +0800 Subject: [PATCH 3/4] add assert --- tests/system-test/2-query/concat.py | 2 +- tests/system-test/2-query/concat_ws.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system-test/2-query/concat.py b/tests/system-test/2-query/concat.py index f2f231a858..2c3667959e 100644 --- a/tests/system-test/2-query/concat.py +++ b/tests/system-test/2-query/concat.py @@ -146,7 +146,7 @@ class TDTestCase: ] tdSql.query("select concat(null,null)") # TD-31571 tdSql.checkRows(1) - tdSql.getData(0, 0) == "NULL" + assert tdSql.getData(0, 0) == None for tb in tbname: for i in range(2,8): self.__concat_check(tb,i) diff --git a/tests/system-test/2-query/concat_ws.py b/tests/system-test/2-query/concat_ws.py index e0fc260527..29df526ff8 100644 --- a/tests/system-test/2-query/concat_ws.py +++ b/tests/system-test/2-query/concat_ws.py @@ -158,7 +158,7 @@ class TDTestCase: ] tdSql.query("select concat_ws(null,null,null);") # TD-31572 tdSql.checkRows(1) - tdSql.getData(0, 0) == "NULL" + assert tdSql.getData(0, 0) == None for tb in tbname: for errsql in self.__concat_ws_err_check(tb): tdSql.error(sql=errsql) From 61baff01c9e830ea58c1bf9dda0ca0ee2b823fcb Mon Sep 17 00:00:00 2001 From: Leo Xu <381899826@qq.com> Date: Fri, 23 Aug 2024 09:52:07 +0800 Subject: [PATCH 4/4] change assert to checkdata --- tests/system-test/2-query/concat.py | 2 +- tests/system-test/2-query/concat_ws.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system-test/2-query/concat.py b/tests/system-test/2-query/concat.py index 2c3667959e..b43d4fafa8 100644 --- a/tests/system-test/2-query/concat.py +++ b/tests/system-test/2-query/concat.py @@ -146,7 +146,7 @@ class TDTestCase: ] tdSql.query("select concat(null,null)") # TD-31571 tdSql.checkRows(1) - assert tdSql.getData(0, 0) == None + tdSql.checkData(0, 0, None) for tb in tbname: for i in range(2,8): self.__concat_check(tb,i) diff --git a/tests/system-test/2-query/concat_ws.py b/tests/system-test/2-query/concat_ws.py index 29df526ff8..338166c61e 100644 --- a/tests/system-test/2-query/concat_ws.py +++ b/tests/system-test/2-query/concat_ws.py @@ -158,7 +158,7 @@ class TDTestCase: ] tdSql.query("select concat_ws(null,null,null);") # TD-31572 tdSql.checkRows(1) - assert tdSql.getData(0, 0) == None + tdSql.checkData(0, 0, None) for tb in tbname: for errsql in self.__concat_ws_err_check(tb): tdSql.error(sql=errsql)