diff --git a/tests/system-test/2-query/tbnameIn.py b/tests/system-test/2-query/tbnameIn.py index b463f00770..91fdf9f73e 100644 --- a/tests/system-test/2-query/tbnameIn.py +++ b/tests/system-test/2-query/tbnameIn.py @@ -28,13 +28,13 @@ class TDTestCase: tdSql.execute(f'drop database if exists {dbname}') tdSql.execute(f'create database {dbname}') tdSql.execute(f'use {dbname}') - tdSql.execute('CREATE STABLE `st1` (`ts` TIMESTAMP, `v1` INT) TAGS (`t1` INT);') - tdSql.execute('CREATE STABLE `st2` (`ts` TIMESTAMP, `v1` INT) TAGS (`t1` INT);') - tdSql.execute('CREATE TABLE `t11` USING `st1` (`t1`) TAGS (11);') - tdSql.execute('CREATE TABLE `t12` USING `st1` (`t1`) TAGS (12);') - tdSql.execute('CREATE TABLE `t21` USING `st2` (`t1`) TAGS (21);') - tdSql.execute('CREATE TABLE `t22` USING `st2` (`t1`) TAGS (22);') - tdSql.execute('CREATE TABLE `ta` (`ts` TIMESTAMP, `v1` INT);') + tdSql.execute(f'CREATE STABLE {dbname}.`st1` (`ts` TIMESTAMP, `v1` INT) TAGS (`t1` INT);') + tdSql.execute(f'CREATE STABLE {dbname}.`st2` (`ts` TIMESTAMP, `v1` INT) TAGS (`t1` INT);') + tdSql.execute(f'CREATE TABLE {dbname}.`t11` USING {dbname}.`st1` (`t1`) TAGS (11);') + tdSql.execute(f'CREATE TABLE {dbname}.`t12` USING {dbname}.`st1` (`t1`) TAGS (12);') + tdSql.execute(f'CREATE TABLE {dbname}.`t21` USING {dbname}.`st2` (`t1`) TAGS (21);') + tdSql.execute(f'CREATE TABLE {dbname}.`t22` USING {dbname}.`st2` (`t1`) TAGS (22);') + tdSql.execute(f'CREATE TABLE {dbname}.`ta` (`ts` TIMESTAMP, `v1` INT);') tdSql.execute(f"insert into {dbname}.t11 values ( '2025-01-21 00:11:01', 111 )") tdSql.execute(f"insert into {dbname}.t11 values ( '2025-01-21 00:11:02', 112 )") @@ -55,79 +55,79 @@ class TDTestCase: tdSql.execute(f"insert into {dbname}.ta values ( '2025-01-21 00:00:03', 3 )") tdLog.debug(f"-------------- step1: normal table test ------------------") - tdSql.query("select last(*) from ta where tbname in ('ta');") + tdSql.query(f"select last(*) from {dbname}.ta where tbname in ('ta');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:00:03') tdSql.checkData(0, 1, 3) - tdSql.query("select last(*) from ta where tbname in ('ta', 't21');") + tdSql.query(f"select last(*) from {dbname}.ta where tbname in ('ta', 't21');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:00:03') tdSql.checkData(0, 1, 3) - tdSql.query("select last(*) from ta where tbname in ('t21');") + tdSql.query(f"select last(*) from {dbname}.ta where tbname in ('t21');") tdSql.checkRows(0) - tdSql.query("select last(*) from ta where tbname in ('ta') and tbname in ('ta');") + tdSql.query(f"select last(*) from {dbname}.ta where tbname in ('ta') and tbname in ('ta');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:00:03') tdSql.checkData(0, 1, 3) - tdSql.query("select last(*) from ta where tbname in ('ta') or tbname in ('ta');") + tdSql.query(f"select last(*) from {dbname}.ta where tbname in ('ta') or tbname in ('ta');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:00:03') tdSql.checkData(0, 1, 3) - tdSql.query("select last(*) from ta where tbname in ('ta') or tbname in ('tb');") + tdSql.query(f"select last(*) from {dbname}.ta where tbname in ('ta') or tbname in ('tb');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:00:03') tdSql.checkData(0, 1, 3) - tdSql.query("select last(*) from ta where tbname in ('ta', 't21') and tbname in ('ta');") + tdSql.query(f"select last(*) from {dbname}.ta where tbname in ('ta', 't21') and tbname in ('ta');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:00:03') tdSql.checkData(0, 1, 3) - tdSql.query("select last(*) from ta where tbname in ('ta', 't21') and tbname in ('t21');") + tdSql.query(f"select last(*) from {dbname}.ta where tbname in ('ta', 't21') and tbname in ('t21');") tdSql.checkRows(0) - tdSql.query("select last(*) from ta where tbname in ('t21') or tbname in ('ta');") + tdSql.query(f"select last(*) from {dbname}.ta where tbname in ('t21') or tbname in ('ta');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:00:03') tdSql.checkData(0, 1, 3) tdLog.debug(f"-------------- step2: super table test ------------------") - tdSql.query("select last(*) from st1 where tbname in ('t11');") + tdSql.query(f"select last(*) from {dbname}.st1 where tbname in ('t11');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:11:03') tdSql.checkData(0, 1, 113) - tdSql.query("select last(*) from st1 where tbname in ('t21');") + tdSql.query(f"select last(*) from {dbname}.st1 where tbname in ('t21');") tdSql.checkRows(0) - tdSql.query("select last(*) from st1 where tbname in ('ta', 't21');") + tdSql.query(f"select last(*) from {dbname}.st1 where tbname in ('ta', 't21');") tdSql.checkRows(0) - tdSql.query("select last(*) from st1 where tbname in ('t21', 't12');") + tdSql.query(f"select last(*) from {dbname}.st1 where tbname in ('t21', 't12');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:12:03') tdSql.checkData(0, 1, 123) - tdSql.query("select last(*) from st1 where tbname in ('ta') and tbname in ('t12');") + tdSql.query(f"select last(*) from {dbname}.st1 where tbname in ('ta') and tbname in ('t12');") tdSql.checkRows(0) - tdSql.query("select last(*) from st1 where tbname in ('t12') or tbname in ('t11');") + tdSql.query(f"select last(*) from {dbname}.st1 where tbname in ('t12') or tbname in ('t11');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:12:03') tdSql.checkData(0, 1, 123) - tdSql.query("select last(*) from st1 where tbname in ('ta') or tbname in ('t21');") + tdSql.query(f"select last(*) from {dbname}.st1 where tbname in ('ta') or tbname in ('t21');") tdSql.checkRows(0) - tdSql.query("select last(*) from st1 where tbname in ('t12', 't21') and tbname in ('t21');") + tdSql.query(f"select last(*) from {dbname}.st1 where tbname in ('t12', 't21') and tbname in ('t21');") tdSql.checkRows(0) - tdSql.query("select last(*) from st1 where tbname in ('t12', 't11') and tbname in ('t11');") + tdSql.query(f"select last(*) from {dbname}.st1 where tbname in ('t12', 't11') and tbname in ('t11');") tdSql.checkRows(1) tdSql.checkData(0, 0, '2025-01-21 00:11:03') tdSql.checkData(0, 1, 113)