Merge pull request #14208 from taosdata/3.0test/jcy

test：update test case 

tests/pytest/util/sqlset.py

@@ -15,7 +15,7 @@ from util.sql import tdSql
 
 class TDSetSql:
     def init(self, conn, logSql):
-        tdSql.init(conn.cursor(), logSql)
+        
         self.stbname = 'stb'
 
     def set_create_normaltable_sql(self, ntbname='ntb', 

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

@@ -3,437 +3,95 @@ from util.dnodes import *
 from util.log import *
 from util.sql import *
 from util.cases import *
-
+from util.sqlset import *
 
 class TDTestCase:
 
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
-        tdSql.init(conn.cursor())
-
-    def run(self):  # sourcery skip: extract-duplicate-method
-        # for func now() , today(), timezone()
+        tdSql.init(conn.cursor(),True)
+        self.setsql = TDSetSql()
+        # name of normal table
+        self.ntbname = 'ntb'    
+        # name of stable
+        self.stbname = 'stb'    
+        # structure of column
+        self.column_dict = {    
+            'ts':'timestamp',
+            'c1':'int',
+            'c2':'float',
+            'c3':'double'
+        }
+        # structure of tag
+        self.tag_dict = {       
+            't0':'int'
+        }
+        # number of child tables
+        self.tbnum = 2       
+        # values of tag,the number of values should equal to tbnum
+        self.tag_values = [     
+            f'10',
+            f'100'
+        ]
+        self.values_list = [
+            f'now,10,99.99,11.111111',
+            f'today(),100,11.111,22.222222'
+        ]
+        self.time_unit = ['b','u','a','s','m','h','d','w']
+        self.symbol = ['+','-','*','/']
+        self.error_values = [1.5,'abc','"abc"','!@','today()']
+    def tbtype_check(self,tb_type):
+        if tb_type == 'normal table' or tb_type == 'child table':
+            tdSql.checkRows(len(self.values_list))  
+        elif tb_type == 'stable':
+            tdSql.checkRows(len(self.values_list) * self.tbnum)
+    def data_check(self,tbname,tb_type):
+        tdSql.query(f'select now() from {tbname}')
+        self.tbtype_check(tb_type)
+        for unit in self.time_unit:
+            for symbol in self.symbol:
+                if symbol in ['+','-']:
+                    tdSql.query(f'select now() {symbol}1{unit} from {tbname}')
+                    self.tbtype_check(tb_type)
+        for k,v in self.column_dict.items():
+            if v.lower() != 'timestamp':
+                continue
+            else:
+                tdSql.query(f'select * from {tbname} where {k}>=now()')
+                tdSql.checkRows(0)
+                tdSql.query(f'select * from {tbname} where {k}<now()')
+                self.tbtype_check(tb_type)
+        for symbol in self.symbol:
+            for param in self.error_values:
+                tdSql.error(f'select now() {symbol}{param} from {tbname}')
+            tdSql.query(f'select now(){symbol}null from {tbname}')
+            self.tbtype_check(tb_type)
+            for i in range(len(self.values_list)):
+                tdSql.checkData(i,0,None)
+
+    def now_check_ntb(self):
         tdSql.prepare()
-        today_date = datetime.datetime.strptime(
-            datetime.datetime.now().strftime("%Y-%m-%d"), "%Y-%m-%d")
-
-        tdLog.printNoPrefix("==========step1:create tables==========")
-        tdSql.execute(
-            '''create table if not exists ntb
-            (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp)
-            '''
-        )
-        tdSql.execute(
-            '''create table if not exists stb
-            (ts timestamp, c1 int, c2 float,c3 double,c4 timestamp) tags(t0 int)
-            '''
-        )
-        tdSql.execute(
-            '''create table if not exists stb_1 using stb tags(100)
-            '''
-        )
-        tdLog.printNoPrefix("==========step2:insert data into ntb==========")
-        tdSql.execute(
-            'insert into ntb values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())')
-        tdSql.execute(
-            'insert into stb_1 values(now,1,1.55,100.555555,today())("2020-1-1 00:00:00",10,11.11,99.999999,now())(today(),3,3.333,333.333333,now())')
-        tdLog.printNoPrefix("==========step2:query test of ntb ==========")
+        tdSql.execute(self.setsql.set_create_normaltable_sql(self.ntbname,self.column_dict))
+        for value in self.values_list:
+            tdSql.execute(
+                f'insert into {self.ntbname} values({value})')
+        self.data_check(self.ntbname,'normal table')
 
-        # test function now()
-        # ntable
-        tdSql.query("select now() from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1w from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1w from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1d from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1d from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1h from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1h from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1m from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1m from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1s from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1s from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1a from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1a from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1u from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1u from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1b from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1b from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1w from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1w from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1d from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1d from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1h from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1h from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1m from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1m from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1s from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1s from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1a from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1a from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1u from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1u from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1b from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1b from db.ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select * from ntb where ts<now()")
-        tdSql.checkRows(3)
-        tdSql.checkData(1, 1, 3)
-        tdSql.query("select * from db.ntb where ts<now()")
-        tdSql.checkRows(3)
-        tdSql.checkData(1, 1, 3)
-        tdSql.query("select * from ntb where ts<=now()")
-        tdSql.checkRows(3)
-        tdSql.checkData(2, 1, 1)
-        tdSql.query("select * from db.ntb where ts<=now()")
-        tdSql.checkRows(3)
-        tdSql.checkData(2, 1, 1)
-        tdSql.query("select c1 from ntb where ts=now()")
-        tdSql.checkRows(0)
-        tdSql.query("select c1 from db.ntb where ts=now()")
-        tdSql.checkRows(0)
-        tdSql.query("select * from ntb where ts>=now()")
-        tdSql.checkRows(0)
-        tdSql.query("select * from db.ntb where ts>=now()")
-        tdSql.checkRows(0)
-        tdSql.query("select * from ntb where ts>now()")
-        tdSql.checkRows(0)
-        tdSql.query("select * from db.ntb where ts>now()")
-        tdSql.checkRows(0)
-        tdSql.query("select now() from ntb where ts=today()")
-        tdSql.checkRows(1)
-        tdSql.query("select now() from db.ntb where ts=today()")
-        tdSql.checkRows(1)
-        tdSql.query("select now()+1 from ntb")
-        tdSql.checkRows(3)
-        tdSql.query("select now()+1 from db.ntb")
-        tdSql.checkRows(3)
-        # tdSql.query("select now()+9223372036854775807 from ntb")
-        # tdSql.checkRows(3)
-
-        tdSql.error("select now()+1.5 from ntb")
-        tdSql.error("select now()+1.5 from db.ntb")
-        tdSql.error("select now()-1.5 from ntb")
-        tdSql.error("select now()-1.5 from db.ntb")
-        tdSql.error("select now()*1.5 from ntb")
-        tdSql.error("select now()*1.5 from db.ntb")
-        tdSql.error("select now()/1.5 from ntb")
-        tdSql.error("select now()/1.5 from db.ntb")
-        tdSql.error("select now()+'abc' from ntb")
-        tdSql.error("select now()+'abc' from db.ntb")
-        tdSql.error("select now()+abc from ntb")
-        tdSql.error("select now()+abc from db.ntb")
-        tdSql.error("select now()+! from ntb")
-        tdSql.error("select now()+! from db.ntb")
-
-        tdSql.query("select now()+null from ntb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()+null from db.ntb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()-null from ntb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()-null from db.ntb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()*null from ntb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()*null from db.ntb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()/null from ntb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()/null from db.ntb")
-        tdSql.checkData(0,0,None)
-
-        tdSql.error("select now() +today() from ntb")
-        tdSql.error("select now() +today() from db.ntb")
-        
-        # stable
-        tdSql.query("select now() from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1w from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1w from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1d from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1d from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1h from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1h from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1m from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1m from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1s from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1s from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1a from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1a from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1u from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1u from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1b from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1b from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1w from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1w from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1d from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1d from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1h from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1h from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1m from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1m from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1s from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1s from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1a from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1a from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1u from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1u from db.stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1b from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1b from db.stb")
-        tdSql.checkRows(3)
-        # tdSql.query("select * from stb where ts<now()")
-        # tdSql.checkRows(3)
-        # tdSql.checkData(1,1,3)
-        # tdSql.query("select * from stb where ts<=now()")
-        # tdSql.checkRows(3)
-        # tdSql.checkData(2,1,1)
-        tdSql.query("select c1 from stb where ts=now()")
-        tdSql.checkRows(0)
-        tdSql.query("select c1 from db.stb where ts=now()")
-        tdSql.checkRows(0)
-        # tdSql.query("select * from stb where ts>=now()")
-        # tdSql.checkRows(0)
-        # tdSql.query("select * from stb where ts>now()")
-        # tdSql.checkRows(0)
-        tdSql.query("select now() from stb where ts=today()")
-        tdSql.checkRows(1)
-        tdSql.query("select now() from db.stb where ts=today()")
-        tdSql.checkRows(1)
-        tdSql.query("select now() +1 from stb")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1 from db.stb")
-        tdSql.checkRows(3)
-        tdSql.error("select now() +1.5 from stb")
-        tdSql.error("select now() -1.5 from stb")
-        tdSql.error("select now() *1.5 from stb")
-        tdSql.error("select now() /1.5 from stb")
-        tdSql.error("select now() +'abc' from stb")
-        tdSql.error("select now() +'abc' from db.stb")
-        tdSql.error("select now() + ! from stb")
-        tdSql.error("select now() + ! from db.stb")
-        tdSql.error("select now() + today() from stb")
-        tdSql.error("select now() + today() from db.stb")
-        tdSql.error("select now() -today() from stb")
-        tdSql.error("select now() - today() from db.stb")
-
-
-        tdSql.query("select now()+null from stb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()+null from db.stb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()-null from stb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()-null from db.stb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()*null from stb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()*null from db.stb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()/null from stb")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()/null from db.stb")
-        tdSql.checkData(0,0,None)
-
-        # table
-        tdSql.query("select now() from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1w from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1w from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1d from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1d from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1h from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1h from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1m from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1m from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1s from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1s from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1a from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1a from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1u from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1u from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1b from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() +1b from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1w from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1w from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1d from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1d from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1h from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1h from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1m from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1m from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1s from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1s from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1a from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1a from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1u from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1u from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1b from stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select now() -1b from db.stb_1")
-        tdSql.checkRows(3)
-        tdSql.query("select * from stb_1 where ts<now()")
-        tdSql.checkRows(3)
-        tdSql.checkData(1, 1, 3)
-        tdSql.query("select * from db.stb_1 where ts<now()")
-        tdSql.checkRows(3)
-        tdSql.checkData(1, 1, 3)
-        tdSql.query("select * from stb_1 where ts<=now()")
-        tdSql.checkRows(3)
-        tdSql.checkData(2, 1, 1)
-        tdSql.query("select * from db.stb_1 where ts<=now()")
-        tdSql.checkRows(3)
-        tdSql.checkData(2, 1, 1)
-        tdSql.query("select c1 from stb_1 where ts=now()")
-        tdSql.checkRows(0)
-        tdSql.query("select c1 from db.stb_1 where ts=now()")
-        tdSql.checkRows(0)
-        tdSql.query("select * from stb_1 where ts>=now()")
-        tdSql.checkRows(0)
-        tdSql.query("select * from db.stb_1 where ts>=now()")
-        tdSql.checkRows(0)
-        tdSql.query("select * from stb_1 where ts>now()")
-        tdSql.checkRows(0)
-        tdSql.query("select * from db.stb_1 where ts>now()")
-        tdSql.checkRows(0)
+    def now_check_stb(self):
+        tdSql.prepare()
+        tdSql.execute(self.setsql.set_create_stable_sql(self.stbname,self.column_dict,self.tag_dict))
+        for i in range(self.tbnum):
+            tdSql.execute(f"create table {self.stbname}_{i} using {self.stbname} tags({self.tag_values[0]})")
+            for value in self.values_list:
+                tdSql.execute(f'insert into {self.stbname}_{i} values({value})')
+        for i in range(self.tbnum):
+            self.data_check(f'{self.stbname}_{i}','child table')
+        self.data_check(self.stbname,'stable')
+    def run(self):  # sourcery skip: extract-duplicate-method
 
-        # tdSql.query("select * from stb_1 where ts<now")
-        # tdSql.checkRows(3)
-        # tdSql.checkData(1, 1, 3)
-        # tdSql.query("select * from stb_1 where ts<=now")
-        # tdSql.checkRows(3)
-        # tdSql.checkData(2, 1, 1)
-        # tdSql.query("select c1 from stb_1 where ts=now")
-        # tdSql.checkRows(0)
-        # tdSql.query("select * from stb_1 where ts>=now")
-        # tdSql.checkRows(0)
-        # tdSql.query("select * from stb_1 where ts>now")
-        # tdSql.checkRows(0)
+        self.now_check_ntb()
+        self.now_check_stb()
         
-        tdSql.query("select now() from stb_1 where ts=today()")
-        tdSql.checkRows(1)
-
-        tdSql.error("select now() +'abc' from stb_1")
-        tdSql.error("select now() +'abc' from db.stb_1")
-        tdSql.error("select now() + ! from stb_1")
-        tdSql.error("select now() + ! from db.stb_1")
-        tdSql.error("select now() + today() from stb_1")
-        tdSql.error("select now() + today() from db.stb_1")
-        tdSql.error("select now() - today() from stb_1")
-        tdSql.error("select now()-today() from db.stb_1")
-
-        tdSql.query("select now()+null from stb_1")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()+null from db.stb_1")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()-null from stb_1")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()-null from db.stb_1")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()*null from stb_1")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()*null from db.stb_1")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()/null from stb_1")
-        tdSql.checkData(0,0,None)
-        tdSql.query("select now()/null from db.stb_1")
-        tdSql.checkData(0,0,None)
     def stop(self):
         tdSql.close()
         tdLog.success(f"{__file__} successfully executed")

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

@@ -12,7 +12,37 @@ class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
         tdSql.init(conn.cursor())
+        # name of normal table
+        self.ntbname = 'ntb'    
+        # name of stable
+        self.stbname = 'stb'    
+        # structure of column
+        self.column_dict = {    
+            'ts':'timestamp',
+            'c1':'int',
+            'c2':'float',
+            'c3':'binary(20)',
+            'c4':'nchar(20)'
+        }
+        # structure of tag
+        self.tag_dict = {       
+            't0':'int'
+        }
+        # number of child tables
+        self.tbnum = 2       
+        # values of tag,the number of values should equal to tbnum
+        self.tag_values = [     
+            f'10',
+            f'100'
+        ]
+        # values of rows, structure should be same as column
+        self.values_list = [
+            f'now,10,99.99,"2020-1-1 00:00:00"',
+            f'today(),100,11.111,22.222222'
 
+        ]
+        self.error_param = [1,'now()']
+    
     def run(self):  # sourcery skip: extract-duplicate-method
         tdSql.prepare()
         tdLog.printNoPrefix("==========step1:create tables==========")

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

@@ -60,10 +60,10 @@ class TDTestCase:
             tdSql.checkRows(1)
             tdSql.checkData(0, 1, None)
         #!bug TD-16561
-        # for i in ['stb','db.stb']:
-        #     tdSql.query(f"select first(*) from {i}")
-        #     tdSql.checkRows(1)
-        #     tdSql.checkData(0, 1, None)
+        for i in ['stb','db.stb']:
+            tdSql.query(f"select first(*) from {i}")
+            tdSql.checkRows(1)
+            tdSql.checkData(0, 1, None)
         for i in column_list:
             for j in ['stb_1','db.stb_1','stb_1','db.stb_1']:
                 tdSql.query(f"select first({i}) from {j}")
@@ -125,10 +125,10 @@ class TDTestCase:
             tdSql.execute(f"create table {stbname}_{i} using {stbname} tags('beijing')")
             tdSql.execute(f"insert into {stbname}_{i}(ts) values(%d)" % (self.ts - 1-i))
         #!bug TD-16561
-        # for i in [f'{stbname}', f'{dbname}.{stbname}']:
-        #     tdSql.query(f"select first(*) from {i}")
-        #     tdSql.checkRows(1)
-        #     tdSql.checkData(0, 1, None)
+        for i in [f'{stbname}', f'{dbname}.{stbname}']:
+            tdSql.query(f"select first(*) from {i}")
+            tdSql.checkRows(1)
+            tdSql.checkData(0, 1, None)
         tdSql.query('show tables')
         vgroup_list = []
         for i in range(len(tdSql.queryResult)):
@@ -170,8 +170,8 @@ class TDTestCase:
                 elif 'nchar' in v:
                     tdSql.checkData(0, 0, f'{self.nchar_str}1')
         #!bug TD-16569
-        # tdSql.query(f"select first(*),last(*) from {stbname} where ts < 23 interval(1s)")
-        # tdSql.checkRows(0)
+        tdSql.query(f"select first(*),last(*) from {stbname} where ts < 23 interval(1s)")
+        tdSql.checkRows(0)
         tdSql.execute(f'drop database {dbname}')
         
         

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

@@ -2,7 +2,7 @@
 from util.log import *
 from util.sql import *
 from util.cases import *
-
+from util.sqlset import *
 import platform
 import os
 if platform.system().lower() == 'windows':
@@ -14,10 +14,39 @@ class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
         tdSql.init(conn.cursor())
+        self.setsql = TDSetSql()
+        self.arithmetic_operators = ['+','-','*','/']
+        self.arithmetic_values = [0,1,100,15.5]
+        # name of normal table
+        self.ntbname = 'ntb'    
+        # name of stable
+        self.stbname = 'stb'    
+        # structure of column
+        self.column_dict = {    
+            'ts':'timestamp',
+            'c1':'int',
+            'c2':'float',
+            'c3':'double'
+        }
+        # structure of tag
+        self.tag_dict = {       
+            't0':'int'
+        }
+        # number of child tables
+        self.tbnum = 2       
+        # values of tag,the number of values should equal to tbnum
+        self.tag_values = [     
+            f'10',
+            f'100'
+        ]
+        # values of rows, structure should be same as column
+        self.values_list = [
+            f'now,10,99.99,11.111111',
+            f'today(),100,11.111,22.222222'
 
-    def run(self):  # sourcery skip: extract-duplicate-method
-        tdSql.prepare()
-        # get system timezone
+        ]
+        self.error_param = [1,'now()']
+    def get_system_timezone(self):
         if platform.system().lower() == 'windows':
             time_zone_1 = tzlocal.get_localzone_name()
             time_zone_2 = time.strftime('(UTC, %z)')
@@ -32,122 +61,61 @@ class TDTestCase:
                 time_zone_2 = os.popen('date "+(%Z, %z)"').read().strip()
                 time_zone = time_zone_1 + " " + time_zone_2
         print("expected time zone: " + time_zone)
-
-        tdLog.printNoPrefix("==========step1:create tables==========")
-        tdSql.execute(
-            '''create table if not exists ntb
-            (ts timestamp, c1 int, c2 float,c3 double)
-            '''
-        )
-        tdSql.execute(
-            '''create table if not exists stb
-            (ts timestamp, c1 int, c2 float,c3 double) tags(t0 int)
-            '''
-        )
-        tdSql.execute(
-            '''create table if not exists stb_1 using stb tags(100)
-            '''
-        )
-
-        tdLog.printNoPrefix("==========step2:insert data==========")
-        tdSql.execute(
-            "insert into ntb values(now,10,99.99,11.111111)(today(),100,11.111,22.222222)")
-        tdSql.execute(
-            "insert into stb_1 values(now,111,99.99,11.111111)(today(),1,11.111,22.222222)")
-
-        tdLog.printNoPrefix("==========step3:query data==========")
+        return time_zone
+    
+    def tb_type_check(self,tb_type):
+        if tb_type in ['normal_table','child_table']:
+            tdSql.checkRows(len(self.values_list))
+        elif tb_type == 'stable':
+            tdSql.checkRows(len(self.values_list*self.tbnum))
+    def data_check(self,timezone,tbname,tb_type):
+        tdSql.query(f"select timezone() from {tbname}")
+        self.tb_type_check(tb_type)
+        tdSql.checkData(0,0,timezone)
+        for symbol in self.arithmetic_operators:
+            tdSql.query(f"select timezone(){symbol}null from {tbname}")
+            self.tb_type_check(tb_type)
+            tdSql.checkData(0,0,None)
+        for i in self.arithmetic_values:
+            for symbol in self.arithmetic_operators:
+                tdSql.query(f"select timezone(){symbol}{i} from {tbname}")
+                self.tb_type_check(tb_type)
+                if symbol == '+':
+                    tdSql.checkData(0,0,i)
+                elif symbol == '-':
+                    tdSql.checkData(0,0,-i)
+                elif symbol in ['*','/','%']:
+                    if i == 0 and symbol == '/':
+                        tdSql.checkData(0,0,None)
+                    else:
+                        tdSql.checkData(0,0,0)
+        for param in self.error_param:
+            tdSql.error(f'select timezone({param}) from {tbname}')
+        tdSql.query(f"select * from {tbname} where timezone()='{timezone}'")
+        self.tb_type_check(tb_type)
+    def timezone_check_ntb(self,timezone):
+        tdSql.prepare()
+        tdSql.execute(self.setsql.set_create_normaltable_sql(self.ntbname,self.column_dict))
+        for value in self.values_list:
+            tdSql.execute(
+                f'insert into {self.ntbname} values({value})')
+        self.data_check(timezone,self.ntbname,'normal_table')
+        tdSql.execute('drop database db')
+    def timezone_check_stb(self,timezone):
+        tdSql.prepare()
+        tdSql.execute(self.setsql.set_create_stable_sql(self.stbname,self.column_dict,self.tag_dict))
+        for i in range(self.tbnum):
+            tdSql.execute(f'create table if not exists {self.stbname}_{i} using {self.stbname} tags({self.tag_values[i]})')
+            for j in self.values_list:
+                tdSql.execute(f'insert into {self.stbname}_{i} values({j})')
+        self.data_check(timezone,self.stbname,'stable')
+        for i in range(self.tbnum):
+            self.data_check(timezone,f'{self.stbname}_{i}','child_table')
+    def run(self):  # sourcery skip: extract-duplicate-method
+        timezone = self.get_system_timezone()
+        self.timezone_check_ntb(timezone)
+        self.timezone_check_stb(timezone)
         
-        tdSql.query("select timezone() from ntb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 0, time_zone)
-        tdSql.query("select timezone() from db.ntb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 0, time_zone)
-        tdSql.query("select timezone() from stb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 0, time_zone)
-        tdSql.query("select timezone() from db.stb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 0, time_zone)
-        tdSql.query("select timezone() from stb_1")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 0, time_zone)
-        tdSql.query("select timezone() from db.stb_1 ")
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 0, time_zone)
-
-        tdSql.error("select timezone(1) from stb")
-        tdSql.error("select timezone(1) from db.stb")
-        tdSql.error("select timezone(1) from ntb")
-        tdSql.error("select timezone(1) from db.ntb")
-        tdSql.error("select timezone(1) from stb_1")
-        tdSql.error("select timezone(1) from db.stb_1")
-        tdSql.error("select timezone(now()) from stb")
-        tdSql.error("select timezone(now()) from db.stb")
-
-        tdSql.query(f"select * from ntb where timezone()='{time_zone}'")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()+1 from ntb")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()+1 from db.ntb")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()+1 from stb")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()+1 from db.stb")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()+1 from stb_1")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()+1 from db.stb_1")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()+1.5 from ntb")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()+1.5 from db.ntb")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()-100 from ntb")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()*100 from ntb")
-        tdSql.checkRows(2)
-        tdSql.query("select timezone()/10 from ntb")
-        # tdSql.query("select timezone()/0 from ntb")
-
-
-        tdSql.query("select timezone()+null from ntb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()-null from ntb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()*null from ntb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()/null from ntb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        # tdSql.query("select timezone()")
-        tdSql.query("select timezone()+null from stb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()-null from stb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()*null from stb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()/null from stb")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()+null from stb_1")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()-null from stb_1")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()*null from stb_1")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
-        tdSql.query("select timezone()/null from stb_1")
-        tdSql.checkRows(2)
-        tdSql.checkData(0,0,None)
     def stop(self):
         tdSql.close()
         tdLog.success(f"{__file__} successfully executed")