diff --git a/tests/system-test/2-query/max.py b/tests/system-test/2-query/max.py index 34442a3725..3fc68395cc 100644 --- a/tests/system-test/2-query/max.py +++ b/tests/system-test/2-query/max.py @@ -29,9 +29,10 @@ class TDTestCase: % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1)) intData.append(i + 1) floatData.append(i + 0.1) - for i in ['ts','col11','col12','col13']: + + for i in ['col11','col12','col13']: for j in ['db.stb','stb','db.stb_1','stb_1']: - tdSql.error(f'select max({i} from {j} )') + tdSql.error(f'select max({i}) from {j}') for i in range(1,11): for j in ['db.stb','stb','db.stb_1','stb_1']: @@ -40,6 +41,20 @@ class TDTestCase: tdSql.checkData(0, 0, np.max(intData)) elif i>=9: tdSql.checkData(0, 0, np.max(floatData)) + + tdSql.query("select max(now()) from stb_1") + tdSql.checkRows(1) + + tdSql.query("select last(ts) from stb_1") + lastTs = tdSql.getData(0, 0) + tdSql.query("select max(ts) from stb_1") + tdSql.checkData(0, 0, lastTs) + + tdSql.query("select last(ts) from stb") + lastTs = tdSql.getData(0, 0) + tdSql.query("select max(ts) from stb") + tdSql.checkData(0, 0, lastTs) + tdSql.query("select max(col1) from stb_1 where col2<=5") tdSql.checkData(0,0,5) tdSql.query("select max(col1) from stb where col2<=5") @@ -57,9 +72,9 @@ class TDTestCase: % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1)) intData.append(i + 1) floatData.append(i + 0.1) - for i in ['ts','col11','col12','col13']: + for i in ['col11','col12','col13']: for j in ['db.ntb','ntb']: - tdSql.error(f'select max({i} from {j} )') + tdSql.error(f'select max({i}) from {j}') for i in range(1,11): for j in ['db.ntb','ntb']: tdSql.query(f"select max(col{i}) from {j}") @@ -67,6 +82,15 @@ class TDTestCase: tdSql.checkData(0, 0, np.max(intData)) elif i>=9: tdSql.checkData(0, 0, np.max(floatData)) + + tdSql.query("select max(now()) from ntb") + tdSql.checkRows(1) + + tdSql.query("select last(ts) from ntb") + lastTs = tdSql.getData(0, 0) + tdSql.query("select max(ts) from ntb") + tdSql.checkData(0, 0, lastTs) + tdSql.query("select max(col1) from ntb where col2<=5") tdSql.checkData(0,0,5) tdSql.execute('drop database db') diff --git a/tests/system-test/2-query/min.py b/tests/system-test/2-query/min.py index c27e9926ff..4230b302cb 100644 --- a/tests/system-test/2-query/min.py +++ b/tests/system-test/2-query/min.py @@ -36,17 +36,12 @@ class TDTestCase: floatData.append(i + 0.1) # max verifacation - tdSql.error("select min(ts) from stb_1") - tdSql.error("select min(ts) from db.stb_1") tdSql.error("select min(col7) from stb_1") tdSql.error("select min(col7) from db.stb_1") tdSql.error("select min(col8) from stb_1") tdSql.error("select min(col8) from db.stb_1") tdSql.error("select min(col9) from stb_1") tdSql.error("select min(col9) from db.stb_1") - # tdSql.error("select min(a) from stb_1") - # tdSql.error("select min(1) from stb_1") - tdSql.error("select min(now()) from stb_1") tdSql.error("select min(count(c1),count(c2)) from stb_1") tdSql.query("select min(col1) from stb_1") @@ -92,18 +87,26 @@ class TDTestCase: tdSql.query("select min(col1) from stb_1 where col2>=5") tdSql.checkData(0,0,5) + tdSql.query("select min(now()) from stb_1") + tdSql.checkRows(1) + + tdSql.query("select first(ts) from stb_1") + firstTs = tdSql.getData(0, 0) + tdSql.query("select min(ts) from stb_1") + tdSql.checkData(0, 0, firstTs) + + tdSql.query("select first(ts) from db.stb_1") + firstTs = tdSql.getData(0, 0) + tdSql.query("select min(ts) from db.stb_1") + tdSql.checkData(0, 0, firstTs) + - tdSql.error("select min(ts) from stb_1") - tdSql.error("select min(ts) from db.stb_1") tdSql.error("select min(col7) from stb_1") tdSql.error("select min(col7) from db.stb_1") tdSql.error("select min(col8) from stb_1") tdSql.error("select min(col8) from db.stb_1") tdSql.error("select min(col9) from stb_1") tdSql.error("select min(col9) from db.stb_1") - # tdSql.error("select min(a) from stb_1") - # tdSql.error("select min(1) from stb_1") - tdSql.error("select min(now()) from stb_1") tdSql.error("select min(count(c1),count(c2)) from stb_1") tdSql.query("select min(col1) from stb") @@ -149,18 +152,26 @@ class TDTestCase: tdSql.query("select min(col1) from stb where col2>=5") tdSql.checkData(0,0,5) + tdSql.query("select min(now()) from stb_1") + tdSql.checkRows(1) + + tdSql.query("select first(ts) from stb_1") + firstTs = tdSql.getData(0, 0) + tdSql.query("select min(ts) from stb_1") + tdSql.checkData(0, 0, firstTs) + + tdSql.query("select first(ts) from db.stb_1") + firstTs = tdSql.getData(0, 0) + tdSql.query("select min(ts) from db.stb_1") + tdSql.checkData(0, 0, firstTs) + - tdSql.error("select min(ts) from ntb") - tdSql.error("select min(ts) from db.ntb") tdSql.error("select min(col7) from ntb") tdSql.error("select min(col7) from db.ntb") tdSql.error("select min(col8) from ntb") tdSql.error("select min(col8) from db.ntb") tdSql.error("select min(col9) from ntb") tdSql.error("select min(col9) from db.ntb") - # tdSql.error("select min(a) from stb_1") - # tdSql.error("select min(1) from stb_1") - tdSql.error("select min(now()) from ntb") tdSql.error("select min(count(c1),count(c2)) from ntb") tdSql.query("select min(col1) from ntb") @@ -206,6 +217,19 @@ class TDTestCase: tdSql.query("select min(col1) from ntb where col2>=5") tdSql.checkData(0,0,5) + tdSql.query("select min(now()) from stb_1") + tdSql.checkRows(1) + + tdSql.query("select first(ts) from stb_1") + firstTs = tdSql.getData(0, 0) + tdSql.query("select min(ts) from stb_1") + tdSql.checkData(0, 0, firstTs) + + tdSql.query("select first(ts) from db.stb_1") + firstTs = tdSql.getData(0, 0) + tdSql.query("select min(ts) from db.stb_1") + tdSql.checkData(0, 0, firstTs) + def stop(self): tdSql.close()