diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh old mode 100644 new mode 100755 diff --git a/tests/pytest/query/unionAllTest.py b/tests/pytest/query/unionAllTest.py index 3064e2f63e871e5c90d03d19bf125447714dd6cb..cbff89fd9576b984887c832a51d47a577e89bea4 100644 --- a/tests/pytest/query/unionAllTest.py +++ b/tests/pytest/query/unionAllTest.py @@ -24,7 +24,7 @@ class TDTestCase: tdLog.debug("start to execute %s" % __file__) tdSql.init(conn.cursor(), logSql) - self.ts = 1500000000000 + self.ts = 1600000000000 self.num = 10 def run(self): @@ -84,6 +84,26 @@ class TDTestCase: tdSql.query("select 'dcs' as options from stb where col > 200 limit 1 union all select 'aaa' as options from stb limit 10") tdSql.checkData(0, 0, 'aaa') + # https://jira.taosdata.com:18080/browse/TS-444 + tdLog.info("test case for TS-444") + + tdSql.query("select count(*) as count, loc from st where ts between 1600000000000 and 1600000000010 group by loc") + tdSql.checkRows(6) + + tdSql.query("select count(*) as count, loc from st where ts between 1600000000020 and 1600000000030 group by loc") + tdSql.checkRows(0) + + tdSql.query(''' select count(*) as count, loc from st where ts between 1600000000000 and 1600000000010 group by loc + union all + select count(*) as count, loc from st where ts between 1600000000020 and 1600000000030 group by loc''') + tdSql.checkRows(6) + + tdSql.query(''' select count(*) as count, loc from st where ts between 1600000000020 and 1600000000030 group by loc + union all + select count(*) as count, loc from st where ts between 1600000000000 and 1600000000010 group by loc''') + tdSql.checkRows(6) + + def stop(self): tdSql.close() tdLog.success("%s successfully executed" % __file__)