Merge branch 'FIX/TS-1438' of github.com:taosdata/TDengine into FIX/TS-1438

tests/pytest/dbmgmt/dbNameCaseSensitive.py

@@ -52,7 +52,8 @@ class TDTestCase:
         tdSql.checkRows(0)
         tdSql.query("show create database `Db`")
         tdSql.checkRows(1)
-        tdSql.checkData(0, 1, "CREATE DATABASE `Db` REPLICA 1 QUORUM 1 DAYS 10 KEEP 3650 CACHE 16 BLOCKS 6 MINROWS 100 MAXROWS 4096 WAL 2 FSYNC 1000 COMP 2 CACHELAST 1 PRECISION 'ms' UPDATE 0")
+        sql = tdSql.getData(0, 1)
+        tdSql.checkEqual(True, sql.startswith("CREATE DATABASE `Db`"))
 
 
         tdSql.execute("drop database db")
@@ -69,7 +70,8 @@ class TDTestCase:
         tdSql.checkRows(1)
         tdSql.checkData(0, 0, "电力系统")
         tdSql.query("show create database `电力系统`")
-        tdSql.checkData(0, 1, "CREATE DATABASE `电力系统` REPLICA 1 QUORUM 1 DAYS 10 KEEP 3650 CACHE 16 BLOCKS 6 MINROWS 100 MAXROWS 4096 WAL 2 FSYNC 1000 COMP 2 CACHELAST 0 PRECISION 'ms' UPDATE 0")        
+        sql = tdSql.getData(0, 1)
+        tdSql.checkEqual(True, sql.startswith("CREATE DATABASE `电力系统`"))
 
     def stop(self):
         tdSql.close()

tests/pytest/insert/schemalessCaseSensitive.py

@@ -81,6 +81,7 @@ class TDTestCase:
             "meters.current 1648432611249 10.3 location=California.SanFrancisco groupid=2",
             "meters.Current 1648432611250 12.6 location=California.SanFrancisco groupid=2",
             "meters.Current 1648432611249 10.8 Location=California.LosAngeles groupid=3",
+            "meters.Current 1648432611249 10.8 Location=California.LosAngeles location=California.SanFrancisco groupid=3",
             "Meters.current 1648432611250 11.3 location=California.LosAngeles Groupid=3",
             "电表 1648432611250 11.3 位置=California.LosAngeles Groupid=3"
         ]
@@ -90,7 +91,7 @@ class TDTestCase:
         tdSql.checkRows(4)
 
         tdSql.query("show tables")
-        tdSql.checkRows(5)
+        tdSql.checkRows(6)
 
         tdSql.query("describe `meters.Current`")
         tdSql.checkRows(5)        
@@ -118,6 +119,7 @@ class TDTestCase:
             {"metric": "meters.voltage", "timestamp": 1648432611249, "value": 219, "tags": {"Location": "California.LosAngeles", "groupid": 1}},
             {"metric": "meters.Current", "timestamp": 1648432611250, "value": 12.6, "tags": {"location": "California.SanFrancisco", "groupid": 2}},
             {"metric": "meters.voltage", "timestamp": 1648432611250, "value": 221, "tags": {"location": "California.LosAngeles", "groupid": 1}},
+            {"metric": "meters.voltage", "timestamp": 1648432611250, "value": 221, "tags": {"location": "California.LosAngeles", "Location": "California.SanFrancisco", "groupid": 2}},
             {"metric": "电压", "timestamp": 1648432611250, "value": 221, "tags": {"位置": "California.LosAngeles", "groupid": 1}}
         ]
 
@@ -126,7 +128,7 @@ class TDTestCase:
         tdSql.checkRows(4)
 
         tdSql.query("show tables")
-        tdSql.checkRows(5)
+        tdSql.checkRows(6)
 
         tdSql.query("describe `meters.Current`")
         tdSql.checkRows(4)