fix case

tests/system-test/2-query/between.py

@@ -45,16 +45,16 @@ class TDTestCase:
 
         tdLog.printNoPrefix("==========step3:query timestamp type")
 
-        # tdSql.query("select * from t1 where ts between now()-1m and now()+10m")
-        # tdSql.checkRows(10)
-        # tdSql.query("select * from t1 where ts between '2021-01-01 00:00:00.000' and '2121-01-01 00:00:00.000'")
-        # tdSql.checkRows(11)
-        # tdSql.query("select * from t1 where ts between '1969-01-01 00:00:00.000' and '1969-12-31 23:59:59.999'")
-        # tdSql.checkRows(0)
-        # tdSql.query("select * from t1 where ts between -2793600 and 31507199")
-        # tdSql.checkRows(0)
-        # tdSql.query("select * from t1 where ts between 1609430400000 and 4765104000000")
-        # tdSql.checkRows(11)
+        tdSql.query("select * from t1 where ts between now()-1m and now()+10m")
+        tdSql.checkRows(10)
+        tdSql.query("select * from t1 where ts between '2021-01-01 00:00:00.000' and '2121-01-01 00:00:00.000'")
+        tdSql.checkRows(11)
+        tdSql.query("select * from t1 where ts between '1969-01-01 00:00:00.000' and '1969-12-31 23:59:59.999'")
+        tdSql.checkRows(0)
+        tdSql.query("select * from t1 where ts between -2793600 and 31507199")
+        tdSql.checkRows(0)
+        tdSql.query("select * from t1 where ts between 1609430400000 and 4765104000000")
+        tdSql.checkRows(11)
 
         tdLog.printNoPrefix("==========step4:query int type")
 
@@ -66,10 +66,10 @@ class TDTestCase:
         tdSql.checkRows(0)
         tdSql.query("select * from t1 where c1 between 'a' and 'e'")
         tdSql.checkRows(0)
-        # tdSql.query("select * from t1 where c1 between 0x64 and 0x69")
-        # tdSql.checkRows(6)
-        # tdSql.query("select * from t1 where c1 not between 100 and 106")
-        # tdSql.checkRows(11)
+        tdSql.query("select * from t1 where c1 between 0x64 and 0x69")
+        tdSql.checkRows(6)
+        tdSql.query("select * from t1 where c1 not between 100 and 106")
+        tdSql.checkRows(11)
         tdSql.query(f"select * from t1 where c1 between {2**31-2} and {2**31+1}")
         tdSql.checkRows(1)
         tdSql.error(f"select * from t2 where c1 between null and {1-2**31}")
@@ -88,11 +88,11 @@ class TDTestCase:
         tdSql.query("select * from t1 where c2 between 'DC3' and 'SYN'")
         tdSql.checkRows(0)
         tdSql.query("select * from t1 where c2 not between 0.1 and 0.2")
-        # tdSql.checkRows(11)
+        tdSql.checkRows(11)
         tdSql.query(f"select * from t1 where c2 between {pow(10,38)*3.4} and {pow(10,38)*3.4+1}")
-        # tdSql.checkRows(1)
+        tdSql.checkRows(1)
         tdSql.query(f"select * from t2 where c2 between {-3.4*10**38-1} and {-3.4*10**38}")
-        # tdSql.checkRows(2)
+        tdSql.checkRows(2)
         tdSql.error(f"select * from t2 where c2 between null and {-3.4*10**38}")
         # tdSql.checkRows(3)
 
@@ -101,17 +101,17 @@ class TDTestCase:
         tdSql.query(f"select * from t1 where c3 between {2**31} and {2**31+10}")
         tdSql.checkRows(10)
         tdSql.query(f"select * from t1 where c3 between {-2**63} and {2**63}")
-        # tdSql.checkRows(11)
+        tdSql.checkRows(11)
         tdSql.query(f"select * from t1 where c3 between {2**31+10} and {2**31}")
         tdSql.checkRows(0)
         tdSql.query("select * from t1 where c3 between 'a' and 'z'")
         tdSql.checkRows(0)
         tdSql.query("select * from t1 where c3 not between 1 and 2")
-        # tdSql.checkRows(0)
+        tdSql.checkRows(0)
         tdSql.query(f"select * from t1 where c3 between {2**63-2} and {2**63-1}")
         tdSql.checkRows(1)
         tdSql.query(f"select * from t2 where c3 between {-2**63} and {1-2**63}")
-        # tdSql.checkRows(3)
+        tdSql.checkRows(3)
         tdSql.error(f"select * from t2 where c3 between null and {1-2**63}")
         # tdSql.checkRows(2)
 
@@ -127,11 +127,11 @@ class TDTestCase:
         tdSql.query("select * from t1 where c4 between 'a' and 'z'")
         tdSql.checkRows(0)
         tdSql.query("select * from t1 where c4 not between 1 and 2")
-        # tdSql.checkRows(0)
+        tdSql.checkRows(0)
         tdSql.query(f"select * from t1 where c4 between {1.7*10**308} and {1.7*10**308+1}")
-        # tdSql.checkRows(1)
+        tdSql.checkRows(1)
         tdSql.query(f"select * from t2 where c4 between {-1.7*10**308-1} and {-1.7*10**308}")
-        # tdSql.checkRows(3)
+        tdSql.checkRows(3)
         tdSql.error(f"select * from t2 where c4 between null and {-1.7*10**308}")
         # tdSql.checkRows(3)
 
@@ -146,7 +146,7 @@ class TDTestCase:
         tdSql.query("select * from t1 where c5 between '~' and 'ˆ'")
         tdSql.checkRows(0)
         tdSql.query("select * from t1 where c5 not between 1 and 2")
-        # tdSql.checkRows(0)
+        tdSql.checkRows(0)
         tdSql.query("select * from t1 where c5 between 32767 and 32768")
         tdSql.checkRows(1)
         tdSql.query("select * from t2 where c5 between -32768 and -32767")
@@ -165,7 +165,7 @@ class TDTestCase:
         tdSql.query("select * from t1 where c6 between 'NUL' and 'HT'")
         tdSql.checkRows(1)
         tdSql.query("select * from t1 where c6 not between 1 and 2")
-        # tdSql.checkRows(1)
+        tdSql.checkRows(1)
         tdSql.query("select * from t1 where c6 between 127 and 128")
         tdSql.checkRows(1)
         tdSql.query("select * from t2 where c6 between -128 and -127")
@@ -175,16 +175,16 @@ class TDTestCase:
 
         tdLog.printNoPrefix("==========step10:invalid query type")
 
-        # tdSql.query("select * from supt where location between 'beijing' and 'shanghai'")
-        # tdSql.checkRows(23)
-        # # 非0值均解析为1，因此"between 负值 and o"解析为"between 1 and 0"
-        # tdSql.query("select * from supt where isused between 0 and 1")
-        # tdSql.checkRows(23)
-        # tdSql.query("select * from supt where isused between -1 and 0")
-        # tdSql.checkRows(0)
-        # tdSql.error("select * from supt where isused between false and true")
-        # tdSql.query("select * from supt where family between '拖拉机' and '自行车'")
-        # tdSql.checkRows(23)
+        tdSql.query("select * from supt where location between 'beijing' and 'shanghai'")
+        tdSql.checkRows(23)
+        # 非0值均解析为1，因此"between 负值 and o"解析为"between 1 and 0"
+        tdSql.query("select * from supt where isused between 0 and 1")
+        tdSql.checkRows(23)
+        tdSql.query("select * from supt where isused between -1 and 0")
+        tdSql.checkRows(0)
+        tdSql.error("select * from supt where isused between false and true")
+        tdSql.query("select * from supt where family between '拖拉机' and '自行车'")
+        tdSql.checkRows(23)
 
         tdLog.printNoPrefix("==========step11:query HEX/OCT/BIN type")