Merge branch 'master' of https://git.wecise.com/libf/odbtools

odbctest/mql/basic/30conflict/10clear.mql

@@ -15,4 +15,11 @@ delete from /test/malert_status_seq with version ;
 /**
 onerror(continue,`not exist`,`not find`,`not found`,` Not Found`)
 **/
-;
+;
+
+select tally FROM /test/alert_status refresh
+/**
+output()
+count(0)
+**/
+;

odbctest/mql/basic/30conflict/13data_update.mql

@@ -1,4 +1,15 @@
 
+/**
+sleep(3s)
+**/;
+
+select tally FROM /test/alert_status refresh
+/**
+output()
+matchcount("tally", 40, 4)
+**/
+;
+
 update /test/alert_status set connect = nil
 ;
 

odbctest/mql/basic/33network/12valid.mql

@@ -20,13 +20,13 @@ count(1)
 
 SELECT  _tokens FROM  /test/node_memdb where _tokens like '%server3%'
 /**
-count(1)
+xcount(1)
 **/
 ;
 
 SELECT  _tokens FROM  /test/node_local where _tokens like '%server3%'
 /**
-count(1)
+xcount(1)
 **/
 ;
 

odbctest/mql/problem/basic/36prepare/11data.mql

@@ -297,30 +297,92 @@ params("3", `{
 **/
 ;
 
+update /test/prepare set _group = nil where v_varchar == ?
+/**
+params("*abc*")
+**/
+;
+
+select _group from /test/prepare where v_varchar=='*abc*' refresh
+/**
+count(1)
+matchcount(_group, nil, 1)
+**/
+;
+
 update /test/prepare set _group = _group + ? where v_varchar == ?
 /**
 params("aa", "*abc*")
 **/
 ;
 
+select _group from /test/prepare where v_varchar=='*abc*' refresh
+/**
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa"
+  ]
+}, 1)
+**/
+;
+
 update /test/prepare set _group = _group + ? where v_varchar == ?
 /**
 params(["bb"], "*abc*")
 **/
 ;
 
+select _group from /test/prepare where v_varchar=='*abc*' refresh
+/**
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"bb"
+  ]
+}, 1)
+**/
+;
+
 update /test/prepare set _group = _group + ? where v_varchar == ?
 /**
 params(["cc"], "*abc*")
 **/
 ;
 
+select _group from /test/prepare where v_varchar=='*abc*' refresh
+/**
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"bb",
+	"cc"
+  ]
+}, 1)
+**/
+;
+
 update /test/prepare set _group = _group + ? where v_varchar == ?
 /**
 params(["dd"], "*abc*")
 **/
 ;
 
+select _group from /test/prepare where v_varchar=='*abc*' refresh
+/**
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"bb",
+	"cc",
+	"dd"
+  ]
+}, 1)
+**/
+;
 
 update /test/prepare set _group = _group - ? where v_varchar == ?
 /**
@@ -328,12 +390,37 @@ params(["bb"], "*abc*")
 **/
 ;
 
+select _group from /test/prepare where v_varchar=='*abc*' refresh
+/**
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"cc",
+	"dd"
+  ]
+}, 1)
+**/
+;
+
 update /test/prepare set _group = _group - ? where v_varchar == ?
 /**
 params("cc", "*abc*")
 **/
 ;
 
+select _group from /test/prepare where v_varchar=='*abc*' refresh
+/**
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"dd",
+  ]
+}, 1)
+**/
+;
+
 /**
 sleep(2s)
 **/

odbctest/mql/problem/basic/36prepare/21data.mql

@@ -297,43 +297,137 @@ params("3", `{
 **/
 ;
 
-update /test/prepare set _group = _group + ? where v_varchar == ?
+update /test/mprepare set _group = nil where v_varchar == ?
+/**
+params("*abc*")
+**/
+;
+
+select _group from /test/mprepare where v_varchar=='*abc*' refresh
+/**
+output()
+count(1)
+matchcount(_group, nil, 1)
+**/
+;
+
+update /test/mprepare set _group = _group + ? where v_varchar == ?
 /**
 params("aa", "*abc*")
 **/
 ;
 
-update /test/prepare set _group = _group + ? where v_varchar == ?
+select _group from /test/mprepare where v_varchar=='*abc*' refresh
+/**
+output()
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa"
+  ]
+}, 1)
+**/
+;
+
+update /test/mprepare set _group = _group + ? where v_varchar == ?
 /**
 params(["bb"], "*abc*")
 **/
 ;
 
-update /test/prepare set _group = _group + ? where v_varchar == ?
+select _group from /test/mprepare where v_varchar=='*abc*' refresh
+/**
+output()
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"bb"
+  ]
+}, 1)
+**/
+;
+
+update /test/mprepare set _group = _group + ? where v_varchar == ?
 /**
 params(["cc"], "*abc*")
 **/
 ;
 
-update /test/prepare set _group = _group + ? where v_varchar == ?
+select _group from /test/mprepare where v_varchar=='*abc*' refresh
+/**
+output()
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"bb",
+	"cc"
+  ]
+}, 1)
+**/
+;
+
+update /test/mprepare set _group = _group + ? where v_varchar == ?
 /**
 params(["dd"], "*abc*")
 **/
 ;
 
+select _group from /test/mprepare where v_varchar=='*abc*' refresh
+/**
+output()
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"bb",
+	"cc",
+	"dd"
+  ]
+}, 1)
+**/
+;
 
-update /test/prepare set _group = _group - ? where v_varchar == ?
+update /test/mprepare set _group = _group - ? where v_varchar == ?
 /**
 params(["bb"], "*abc*")
 **/
 ;
 
-update /test/prepare set _group = _group - ? where v_varchar == ?
+select _group from /test/mprepare where v_varchar=='*abc*' refresh
+/**
+output()
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"cc",
+	"dd"
+  ]
+}, 1)
+**/
+;
+
+update /test/mprepare set _group = _group - ? where v_varchar == ?
 /**
 params("cc", "*abc*")
 **/
 ;
 
+select _group from /test/mprepare where v_varchar=='*abc*' refresh
+/**
+output()
+count(1)
+matchcount(_group, {
+  "_all": [
+    "aa",
+	"dd"
+  ]
+}, 1)
+**/
+;
+
 /**
 sleep(2s)
 **/

odbctest/mql/problem/basic/36prepare/22valid.mql

@@ -7,6 +7,7 @@ matchcount(v_varchar, "*abc*", v_text, `hello word 2003 123-456-789 中华人民
 
 select _group from /test/mprepare where v_varchar=='*abc*'
 /**
+output()
 count(1)
 matchcount(_group, {
   "_all": [