From 5d5b2f2a361bd480c327a748d9e6f6cb059cbc72 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Thu, 21 Apr 2022 17:34:37 +0800 Subject: [PATCH] update cases --- tests/system-test/2-query/NowandToday.py | 560 +++++++++++++++++++++++ tests/system-test/2-query/timezone.py | 275 ++--------- 2 files changed, 587 insertions(+), 248 deletions(-) create mode 100644 tests/system-test/2-query/NowandToday.py diff --git a/tests/system-test/2-query/NowandToday.py b/tests/system-test/2-query/NowandToday.py new file mode 100644 index 0000000000..8265243646 --- /dev/null +++ b/tests/system-test/2-query/NowandToday.py @@ -0,0 +1,560 @@ +from tarfile import SYMTYPE +from time import sleep +from tkinter import E +import taos +import sys + +from util.log import * +from util.sql import * +from util.cases 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.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 today() + # normal table + tdSql.query("select today() from ntb") + tdSql.checkRows(3) + tdSql.checkData(0, 0, str(today_date)) + tdSql.query("select today() from db.ntb") + tdSql.checkRows(3) + tdSql.checkData(0, 0, str(today_date)) + tdSql.query("select today() +1w from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1w from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1d from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1d from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1h from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1h from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1m from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1m from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1s from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1s from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1a from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1a from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1u from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1u from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1b from ntb") + tdSql.checkRows(3) + tdSql.query("select today() +1b from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1w from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1w from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1d from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1d from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1h from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1h from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1m from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1m from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1s from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1s from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1a from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1a from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1u from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1u from db.ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1b from ntb") + tdSql.checkRows(3) + tdSql.query("select today() -1b from db.ntb") + tdSql.checkRows(3) + tdSql.query("select * from ntb where ts=today()") + tdSql.checkRows(1) + tdSql.checkData(0, 1, 3) + tdSql.query("select * from ntb where ts<=today()") + tdSql.checkRows(2) + # for bug + # tdSql.query("select * from ntb where ts=today()") + tdSql.checkRows(2) + # tdSql.query("select * from ntb where ts>today()") + # tdSql.checkRows(1) + tdSql.query("select c4 from ntb where c4=today()") + tdSql.checkRows(1) + tdSql.query("select today() from ntb where ts=today()") + # tdSql.checkRows(2) + # # tdSql.query("select * from ntb where ts>today()") + # # tdSql.checkRows(1) + # tdSql.query("select c4 from stb where c4=today()") + # tdSql.checkRows(1) + # tdSql.query("select today() from stb where ts=today()") + tdSql.checkRows(2) + # tdSql.query("select * from ntb where ts>today()") + # tdSql.checkRows(1) + tdSql.query("select c4 from stb_1 where c4=today()") + tdSql.checkRows(1) + tdSql.query("select today() from stb_1 where ts=now()") + tdSql.checkRows(0) + tdSql.query("select * from ntb where ts>now()") + tdSql.checkRows(0) + tdSql.query("select now() from ntb where ts=today()") + tdSql.checkRows(1) + + # stable + # tdSql.query("select now() from 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(0) + # # tdSql.query("select * from stb where ts>now()") + # # tdSql.checkRows(0) + # tdSql.query("select now() from stb where ts=today()") + # tdSql.checkRows(1) + + # table + tdSql.query("select now() from 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(0) + tdSql.query("select * from stb_1 where ts>now()") + tdSql.checkRows(0) + tdSql.query("select now() from stb_1 where ts=today()") + tdSql.checkRows(1) + + def stop(self): + tdSql.close() + tdLog.success(f"{__file__} successfully executed") + + +tdCases.addLinux(__file__, TDTestCase()) +tdCases.addWindows(__file__, TDTestCase()) diff --git a/tests/system-test/2-query/timezone.py b/tests/system-test/2-query/timezone.py index a93ecc90c4..8c24996336 100644 --- a/tests/system-test/2-query/timezone.py +++ b/tests/system-test/2-query/timezone.py @@ -17,266 +17,45 @@ class TDTestCase: tdSql.init(conn.cursor()) def run(self): # sourcery skip: extract-duplicate-method + # for func now() , today(), timezone() tdSql.prepare() - tdLog.printNoPrefix("==========step1:create normal table==========") + tdLog.printNoPrefix("==========step1:create tables==========") tdSql.execute( - '''create table if not exists normaltb + '''create table if not exists ntb (ts timestamp, c1 int, c2 float,c3 double) ''' ) - tdLog.printNoPrefix("==========step2:insert data==========") - tdSql.execute("insert into normaltb values(now,1,1.55,100.555555)") - tdSql.query("select timezone() from normaltb") - tdSql.checkRows(1) + 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) + ''' + ) - tdSql.execute("insert into normaltb values(now(),2,2.222,222.222222)") - tdSql.query("select timezone() from normaltb") + 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==========") + tdSql.query("select timezone() from ntb") + tdSql.checkRows(2) + tdSql.query("select timezone() from db.ntb") tdSql.checkRows(2) - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - # tdSql.checkData(1,0,"Asia/Shanghai (CST, +0800)") - - tdSql.execute("insert into normaltb values(today(),3,3.333,333.333333)") - tdSql.query("select * from normaltb where ts=today()") - tdSql.checkRows(1) - tdSql.checkData(0,1,3) - # for bug TD-14905 - # for i in range(0,50): - # tdSql.query("select timezone() from db.normaltb") - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - # i+=1 - # sleep(0.5) - - tdSql.query("select today() from normaltb") - tdSql.checkRows(3) - tdSql.query("select today() from db.normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1w from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1w from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1d from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1d from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1h from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1h from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1m from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1m from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1s from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1s from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1a from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1a from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1u from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1u from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() +1b from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() +1b from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1w from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1w from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1d from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1d from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1h from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1h from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1m from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1m from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1s from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1s from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1a from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1a from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1u from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1u from normaltb") - tdSql.checkRows(3) - - tdSql.query("select now() -1b from db.normaltb") - tdSql.checkRows(3) - tdSql.query("select now() -1b from normaltb") - tdSql.checkRows(3) - - tdSql.query("select timezone() from normaltb where ts=today()") - tdSql.checkRows(1) - - tdSql.query("select timezone() from normaltb where tsnow()") - # tdSql.checkRows(0) - # tdSql.query("select timezone() from normaltb where ts >=now()") - # tdSql.checkRows(0) - - - - tdLog.printNoPrefix("==========step3:create super table==========") - tdSql.execute("create table stb (ts timestamp,c0 int) tags(t0 int)") - tdSql.execute("create table stb_1 using stb tags(1)") - # tdSql.execute("create table stb_2 using stb tags(1)") - - tdLog.printNoPrefix("==========step4:insert data==========") - tdSql.execute("insert into stb_1 values(now(),1000)") tdSql.query("select timezone() from stb") - tdSql.checkRows(1) - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") + tdSql.checkRows(2) + tdSql.query("select timezone() from db.stb") + tdSql.checkRows(2) - tdSql.query("select timezone() from stb where ts<=now()") - tdSql.checkRows(1) - tdSql.query("select timezone() from stb where ts=now()") - # tdSql.checkRows(0) - # tdSql.query("select timezone() from stb where ts>now()") - # tdSql.checkRows(0) - - tdSql.execute("insert into stb_1 values(now(),1000)") - # tdSql.query("select timezone() from stb") - # tdSql.checkRows(2) - # tdSql.checkData(0,0,"Asia/Shanghai (CST, +0800)") - - # tdSql.execute("insert into stb_2 values(now,1000)") - # tdSql.query("select timezone() from stb") - # tdSql.checkRows(3) - - tdSql.query("select now() from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1w from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1w from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1d from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1d from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1h from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1h from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1m from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1m from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1s from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1s from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1a from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1a from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1u from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1u from stb") - tdSql.checkRows(3) - - tdSql.query("select now() +1b from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() +1b from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1w from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1w from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1d from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1d from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1h from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1h from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1m from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1m from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1s from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1s from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1a from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1a from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1u from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1u from stb") - tdSql.checkRows(3) - - tdSql.query("select now() -1b from db.stb") - tdSql.checkRows(3) - tdSql.query("select now() -1b from stb") - tdSql.checkRows(3) - - tdSql.execute("insert into stb_1 values(today(),100)") - tdSql.query("select * from stb_1 where ts=today()") - tdSql.checkRows(1) - tdSql.checkData(0,1,100) - # tdSql.execute()