From fa3274e825e38c24fec6408846d948bc529c9ba3 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 3 Aug 2022 09:53:18 +0800 Subject: [PATCH 1/4] add test case into ci --- .../system-test/1-insert/db_tb_name_check.py | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 tests/system-test/1-insert/db_tb_name_check.py diff --git a/tests/system-test/1-insert/db_tb_name_check.py b/tests/system-test/1-insert/db_tb_name_check.py new file mode 100644 index 0000000000..6418e0aa40 --- /dev/null +++ b/tests/system-test/1-insert/db_tb_name_check.py @@ -0,0 +1,84 @@ +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + +from util.log import * +from util.cases import * +from util.sql import * +from util.common import * + +class TDTestCase: + + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + self.special_name = ['!','@','#','$','%','^','&','*','(',')','[',']','{','}',\ + ':',';','\'','\"',',','<','>','/','?','-','_','+','=','~'] + def db_name_check(self): + dbname = tdCom.getLongName(10) + for j in self.special_name: + for i in range(len(list(dbname))+1): + new_dbname = list(dbname) + new_dbname.insert(i,j) + dbname_1 = ''.join(new_dbname) + tdSql.execute(f'create database if not exists `{dbname_1}`') + tdSql.query('show databases') + tdSql.checkEqual(tdSql.queryResult[2][0],str(dbname_1)) + tdSql.execute(f'drop database `{dbname_1}`') + for i in range(len(list(dbname))+1): + new_dbname = list(dbname) + new_dbname.insert(i,'.') + dbname_1 = ''.join(new_dbname) + tdSql.error(f'create database if not exists `{dbname_1}`') + + def tb_name_check(self): + dbname = tdCom.getLongName(10) + tdSql.execute(f'create database if not exists `{dbname}`') + tdSql.execute(f'use `{dbname}`') + tbname = tdCom.getLongName(5) + special_name = self.special_name + special_name.append('.') + for i in special_name: + for j in range(len(list(tbname))+1): + tbname1 = list(tbname) + tbname1.insert(j,i) + new_tbname = ''.join(tbname1) + for sql in [f'{dbname}.`{new_tbname}`',f'`{new_tbname}`']: + tdSql.execute(f'create table {sql} (ts timestamp,c0 int)') + tdSql.execute(f'insert into {sql} values(now,1)') + tdSql.query(f'select * from {sql}') + tdSql.checkRows(1) + tdSql.execute(f'drop table {sql}') + + def run(self): + self.db_name_check() + self.tb_name_check() + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) From 2b0b7ff9960072e9df1b24778dff9433acc0950a Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 3 Aug 2022 10:02:14 +0800 Subject: [PATCH 2/4] update --- tests/system-test/1-insert/db_tb_name_check.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/system-test/1-insert/db_tb_name_check.py b/tests/system-test/1-insert/db_tb_name_check.py index 6418e0aa40..c59d918a8d 100644 --- a/tests/system-test/1-insert/db_tb_name_check.py +++ b/tests/system-test/1-insert/db_tb_name_check.py @@ -58,9 +58,7 @@ class TDTestCase: tdSql.execute(f'create database if not exists `{dbname}`') tdSql.execute(f'use `{dbname}`') tbname = tdCom.getLongName(5) - special_name = self.special_name - special_name.append('.') - for i in special_name: + for i in self.special_name: for j in range(len(list(tbname))+1): tbname1 = list(tbname) tbname1.insert(j,i) From 5ad32ac614019f7fdcaf7f105fffc72d72015226 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 3 Aug 2022 10:03:31 +0800 Subject: [PATCH 3/4] add into ci --- tests/system-test/fulltest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index 3fc38ac898..5ec7907e06 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -34,7 +34,7 @@ python3 ./test.py -f 1-insert/table_param_ttl.py python3 ./test.py -f 1-insert/mutil_stage.py python3 ./test.py -f 1-insert/update_data_muti_rows.py - +python3 ./test.py -f 1-insert/db_tb_name_check.py python3 ./test.py -f 2-query/abs.py python3 ./test.py -f 2-query/abs.py -R From 64a82cfd89a6e2d5f3fcc500c3c6d7967397a168 Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Wed, 3 Aug 2022 13:50:42 +0800 Subject: [PATCH 4/4] update --- tests/system-test/1-insert/db_tb_name_check.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/system-test/1-insert/db_tb_name_check.py b/tests/system-test/1-insert/db_tb_name_check.py index c59d918a8d..e4b164e01f 100644 --- a/tests/system-test/1-insert/db_tb_name_check.py +++ b/tests/system-test/1-insert/db_tb_name_check.py @@ -63,13 +63,19 @@ class TDTestCase: tbname1 = list(tbname) tbname1.insert(j,i) new_tbname = ''.join(tbname1) - for sql in [f'{dbname}.`{new_tbname}`',f'`{new_tbname}`']: + for sql in [f'`{dbname}`.`{new_tbname}`',f'`{new_tbname}`']: tdSql.execute(f'create table {sql} (ts timestamp,c0 int)') tdSql.execute(f'insert into {sql} values(now,1)') tdSql.query(f'select * from {sql}') tdSql.checkRows(1) tdSql.execute(f'drop table {sql}') - + for i in range(len(list(tbname))+1): + tbname1 = list(tbname) + tbname1.insert(i,'.') + new_tbname = ''.join(tbname1) + for sql in [f'`{dbname}`.`{new_tbname}`',f'`{new_tbname}`']: + tdSql.error(f'create table {sql} (ts timestamp,c0 int)') + tdSql.execute(f'drop database `{dbname}`') def run(self): self.db_name_check() self.tb_name_check()