Merge remote-tracking branch 'origin/develop' into feature/hash

tests/pytest/insert/multi.py

+###################################################################
+#           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 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+
+        tdLog.info("create table")
+
+        tdSql.execute(
+            "create table if not exists st(ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            "CREATE TABLE if not exists dev_001 using st tags('dev_01')")
+
+        print("==============step2")
+        tdLog.info("multiple inserts")
+        tdSql.execute(
+            "INSERT INTO dev_001 VALUES ('2020-05-13 10:00:00.000', 1),('2020-05-13 10:00:00.001', 1)")
+        tdSql.checkAffectedRows(2)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/table/alter_column.py

+###################################################################
+#           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, db_test.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 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        tdSql.prepare()
+
+        print("==============step1")
+
+        tdLog.info("create database and table")
+        tdSql.execute("create database db_test")
+        tdSql.execute(
+            "create table if not exists db_test.st(ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            "CREATE TABLE if not exists db_test.dev_001 using db_test.st tags('dev_01')")
+
+        print("==============step2")
+        tdLog.info("alter table add column")
+        tdSql.execute(
+            "ALTER TABLE db_test.st add COLUMN tag_version nchar(20)")
+        tdSql.query("describe db_test.st")
+        tdSql.checkRows(4)
+
+        print("==============step3")
+        tdLog.info("alter table drop column")
+        tdSql.execute("ALTER TABLE db_test.st drop COLUMN tag_version")
+        tdSql.query("describe db_test.st")
+        tdSql.checkRows(3)
+
+        print("==============step4")
+        tdLog.info("drop table")
+        tdSql.execute("drop table db_test.st")
+        tdSql.execute(
+            "create table if not exists db_test.st(ts timestamp, tagtype int) tags(dev nchar(50))")
+        tdSql.execute(
+            "CREATE TABLE if not exists db_test.dev_001 using db_test.st tags('dev_01')")
+        tdSql.execute(
+            "INSERT INTO db_test.dev_001 VALUES ('2020-05-13 10:00:00.000', 1)")
+        tdSql.query("select * from db_test.dev_001")
+        tdSql.checkRows(1)
+
+        print("==============step5")
+        tdLog.info("alter table add column")
+        tdSql.execute(
+            "ALTER TABLE db_test.st add COLUMN tag_version nchar(20)")
+        tdSql.query("describe db_test.st")
+        tdSql.checkRows(4)
+
+        tdSql.execute(
+            "INSERT INTO db_test.dev_001 VALUES ('2020-05-13 10:00:00.010', 1, '1.2.1')")
+        tdSql.query("select * from db_test.st")
+        tdSql.checkRows(2)
+
+        print("==============step6")
+        tdLog.info("alter table drop column")
+        tdSql.execute("ALTER TABLE db_test.st drop COLUMN tag_version")
+        tdSql.query("describe db_test.st")
+        tdSql.checkRows(3)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/table/del_stable.py

@@ -38,8 +38,18 @@ class TDTestCase:
             tdSql.execute("drop table db.st")
         except Exception as e:
             tdLog.exit(e)
-        tdSql.execute("select * from db.st")
-        tdSql.checkRows(1)
+
+        try:
+            tdSql.execute("select * from db.st")
+        except Exception as e:
+            if e.args[0] != 'invalid table name':
+                tdLog.exit(e)
+
+        try:
+            tdSql.execute("select * from db.tb")
+        except Exception as e:
+            if e.args[0] != 'invalid table name':
+                tdLog.exit(e)
 
     def stop(self):
         tdSql.close()

tests/script/general/connection/connection.sim

@@ -16,6 +16,6 @@ sql connect
 
 print ============= step3
 sql close
-sql connect write
+sql connect
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/general/db/vnodes.sim

@@ -33,6 +33,8 @@ endw
 
 print ========== step2
 sql select * from mt
+print $rows
+print $totalRows
 if $rows != $totalRows then
   return -1
 endi  

tests/script/general/user/authority.sim

@@ -30,7 +30,7 @@ sleep 2000
 
 sql create database dwrite
 sql show databases
-if $rows != 1 then
+if $rows != 2 then
   return -1
 endi
 
@@ -48,25 +48,19 @@ print ============ step5
 sql close
 sql connect read
 sleep 2000
-
 sql drop database dread
-sql drop database dwrite -x step51
+sql drop database dwrite
 
-step51:
 
 sql close
 sql connect
 sql show databases
-if $rows != 1 then
+if $rows != 0 then
   return -1
 endi
 
 sql close
 sql connect
 sleep 2000
-sql drop database d1
-sql drop database d2
-sql drop database d3
-sql drop database d4
 
 system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
\ No newline at end of file