Merge pull request #3142 from taosdata/udpate_pytest_and_md

Fix version.py and queries-ch.md

documentation20/webdocs/markdowndocs/Queries-ch.md

@@ -12,7 +12,7 @@ TDengine 采用 SQL 作为查询语言。应用程序可以通过 C/C++, Java, G
 - 标签和数值的多种过滤条件：\>, \<,  =, \<>, like 等
 - 聚合结果的分组（Group by）、排序（Order by）、约束输出（Limit/Offset）
 - 数值列及聚合结果的四则运算
-- 时间戳对齐的连接查询（Join Query）操作
+- 时间戳对齐的连接查询（Join Query: 隐式连接）操作
 - 多种聚合/计算函数: count, max, min, avg, sum, twa, stddev, leastsquares, top, bottom, first, last, percentile, apercentile, last_row, spread, diff等
 
 例如：在TAOS Shell中，从表d1001中查询出vlotage > 215的记录，按时间降序排列，仅仅输出2条。

tests/pytest/client/version.py

@@ -25,11 +25,23 @@ class TDTestCase:
     def run(self):
         tdSql.prepare()
 
-        ret = tdSql.query('select server_version()')
-        tdSql.checkData(0, 0, "2.0.0.6")
-
-        ret = tdSql.query('select client_version()')
-        tdSql.checkData(0, 0, "2.0.0.6")
+        sql = "select server_version()"
+        ret = tdSql.query(sql)
+        version = tdSql.getData(0, 0)[0:3]        
+        expectedVersion = "2.0"
+        if(version == expectedVersion):
+            tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % (sql, 0, 0, version, expectedVersion))
+        else:
+            tdLog.exit("sql:%s, row:%d col:%d data:%s != expect:%s" % (sql, 0, 0, version, expectedVersion))
+
+        sql = "select client_version()"
+        ret = tdSql.query(sql)
+        version = tdSql.getData(0, 0)[0:3]        
+        expectedVersion = "2.0"
+        if(version == expectedVersion):
+            tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" % (sql, 0, 0, version, expectedVersion))
+        else:
+            tdLog.exit("sql:%s, row:%d col:%d data:%s != expect:%s" % (sql, 0, 0, version, expectedVersion))
       
 
     def stop(self):