diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index 37482389f81bfba3734a36ac00752f612eae9b30..672d385cc5cb88c5227e0035934abcbf0b99a376 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -439,7 +439,7 @@ TAOS_FIELD *taos_fetch_fields(TAOS_RES *res) { if (pField->visible) { f[j] = pField->field; - if(f[j].type == TSDB_DATA_TYPE_JSON){ + if(f[j].type == TSDB_DATA_TYPE_JSON && pField->fieldJson.type != TSDB_DATA_TYPE_NULL){ f[j].type = pField->fieldJson.type; if(!IS_VAR_DATA_TYPE(f[j].type) && f[j].type != TSDB_DATA_TYPE_JSON){ f[j].bytes = pField->fieldJson.bytes; diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 9bc0d459d776de06bb347d30f2f4edd8f0597eb0..8b6980e399ae53ed2f37e0ed06826efec9f0fa09 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -2265,7 +2265,7 @@ SInternalField* tscFieldInfoAppend(SFieldInfo* pFieldInfo, TAOS_FIELD* pField) { assert(pFieldInfo != NULL); pFieldInfo->numOfOutput++; - struct SInternalField info = { .pExpr = NULL, .visible = true, .fieldJson={0} }; + struct SInternalField info = { .pExpr = NULL, .visible = true }; info.field = *pField; return taosArrayPush(pFieldInfo->internalField, &info); @@ -2273,7 +2273,7 @@ SInternalField* tscFieldInfoAppend(SFieldInfo* pFieldInfo, TAOS_FIELD* pField) { SInternalField* tscFieldInfoInsert(SFieldInfo* pFieldInfo, int32_t index, TAOS_FIELD* field) { pFieldInfo->numOfOutput++; - struct SInternalField info = { .pExpr = NULL, .visible = true, .fieldJson={0}}; + struct SInternalField info = { .pExpr = NULL, .visible = true }; info.field = *field; return taosArrayInsert(pFieldInfo->internalField, index, &info); diff --git a/tests/pytest/stable/json_tag.py b/tests/pytest/stable/json_tag.py index d953526ec403a3132121a0c3669e23c443d58163..78c63b10eb72405476871e7126b28b1cc3da1295 100644 --- a/tests/pytest/stable/json_tag.py +++ b/tests/pytest/stable/json_tag.py @@ -194,7 +194,7 @@ class TDTestCase: tdSql.checkData(0, 0, "{\"k1\":\"\",\"k2\":true,\"k3\":false,\"k4\":55}") tdSql.query("select jtag->'k2' from db_json_tag_test.jsons1_10") - tdSql.checkData(0, 0, "true") + tdSql.checkData(0, 0, True) tdSql.query("select jtag from db_json_tag_test.jsons1 where jtag->'k1'=''") tdSql.checkRows(1)