未验证 提交 bda6a93f 编写于 作者: H haojun Liao 提交者: GitHub

Merge pull request #6477 from taosdata/hotfix/td-4681

[TD-4681]<fix>: return invalid operator for not equal on primary ts column
...@@ -4694,7 +4694,10 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t ...@@ -4694,7 +4694,10 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
win->skey = val; win->skey = val;
} else if (optr == TK_EQ) { } else if (optr == TK_EQ) {
win->ekey = win->skey = val; win->ekey = win->skey = val;
} else if (optr == TK_NE) {
return TSDB_CODE_TSC_INVALID_SQL;
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
......
...@@ -91,8 +91,8 @@ class TDTestCase: ...@@ -91,8 +91,8 @@ class TDTestCase:
tdSql.query("select * from db.st where name = 1231231") tdSql.query("select * from db.st where name = 1231231")
tdSql.checkRows(0) tdSql.checkRows(0)
# <> for timestamp type # <> for timestamp type not supported for primary timestamp
tdSql.query("select * from db.st where ts <> '2020-05-13 10:00:00.002'") tdSql.error("select * from db.st where ts <> '2020-05-13 10:00:00.002'")
# tdSql.checkRows(4) # tdSql.checkRows(4)
# <> for numeric type # <> for numeric type
......
...@@ -58,8 +58,8 @@ class TDTestCase: ...@@ -58,8 +58,8 @@ class TDTestCase:
ts_len4 = len(tdSql.cursor.fetchall()) ts_len4 = len(tdSql.cursor.fetchall())
tdSql.execute("select * from t2ts1 where ts = now") tdSql.execute("select * from t2ts1 where ts = now")
ts_len5 = len(tdSql.cursor.fetchall()) ts_len5 = len(tdSql.cursor.fetchall())
tdSql.execute("select * from t2ts1 where ts <> now") # tdSql.execute("select * from t2ts1 where ts <> now")
ts_len6 = len(tdSql.cursor.fetchall()) ts_len6 = 3
tdSql.execute("select * from t2ts1 where ts between 0 and now") tdSql.execute("select * from t2ts1 where ts between 0 and now")
ts_len7 = len(tdSql.cursor.fetchall()) ts_len7 = len(tdSql.cursor.fetchall())
tdSql.execute("select * from t2ts1 where ts between now and now+100d") tdSql.execute("select * from t2ts1 where ts between now and now+100d")
......
...@@ -24,6 +24,8 @@ $tsu = $tsu + $ts0 ...@@ -24,6 +24,8 @@ $tsu = $tsu + $ts0
print ==================>issue #3481, normal column not allowed, print ==================>issue #3481, normal column not allowed,
sql_error select ts,c1,min(c2) from ts_stb0 sql_error select ts,c1,min(c2) from ts_stb0
print ==================>issue #4681, not equal operator on primary timestamp not allowed
sql_error select * from ts_stb0 where ts <> $ts0
##### select from supertable ##### select from supertable
$tb = $tbPrefix . 0 $tb = $tbPrefix . 0
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册