refactor：refine Now.py to be parameter driven

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

@@ -9,7 +9,7 @@ class TDTestCase:
 
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
-        tdSql.init(conn.cursor())
+        tdSql.init(conn.cursor(),True)
         self.setsql = TDSetSql()
         # name of normal table
         self.ntbname = 'ntb'    
@@ -38,7 +38,36 @@ class TDTestCase:
             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()
@@ -46,435 +75,23 @@ class TDTestCase:
         for value in self.values_list:
             tdSql.execute(
                 f'insert into {self.ntbname} values({value})')
-        
+        self.data_check(self.ntbname,'normal table')
 
-
-        pass
     def now_check_stb(self):
-        pass
-    def run(self):  # sourcery skip: extract-duplicate-method
-        # for func now() , today(), timezone()
         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 ==========")
-
-        # 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)
+        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")