Explorar el Código

add conflict for local,memdb,cache

lizg hace 1 semana
padre
commit
f995b2b4ae

+ 9 - 3
odbctest/mql/basic/01clear/1_delete_all_test_data.mql

@@ -515,6 +515,12 @@ onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
+delete from /test/malert_status_local with version
+/**
+onerror(continue,`not exist`,`not find`,`not found`)
+**/
+;
+
 delete from /test/malert_status_seq with version
 /**
 onerror(continue,`not exist`,`not find`,`not found`)
@@ -533,19 +539,19 @@ onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
-delete from /test/malert_status_seq3 with version
+delete from /test/alert_status_memdb with version
 /**
 onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
-delete from /test/malert_status3 with version
+delete from /test/alert_status_cache with version
 /**
 onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
-delete from /test/alert_status3 with version
+delete from /test/alert_status_local with version
 /**
 onerror(continue,`not exist`,`not find`,`not found`)
 **/

+ 4 - 3
odbctest/mql/basic/01clear/2_drop_all_test_class.mql

@@ -89,12 +89,13 @@ drop class if exists /test/interface ;
 
 drop class if exists /test/malert_status_memdb ;
 drop class if exists /test/malert_status_cache ;
+drop class if exists /test/malert_status_local ;
 drop class if exists /test/malert_status_seq ;
 drop class if exists /test/malert_status ;
 drop class if exists /test/alert_status ;
-drop class if exists /test/malert_status_seq3 ;
-drop class if exists /test/malert_status3 ;
-drop class if exists /test/alert_status3 ;
+drop class if exists /test/alert_status_cache ;
+drop class if exists /test/alert_status_local ;
+drop class if exists /test/alert_status_memdb ;
 
 drop class if exists /test/datetime ;
 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
odbctest/mql/basic/30conflictcache/00class.mql


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
odbctest/mql/basic/30conflictlocal/00class.mql


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
odbctest/mql/basic/30conflictmemdb/00class.mql