wecisecode 1 semana atrás
pai
commit
86ab1a2157

+ 62 - 4
odbctest/mql/0/0.mql

@@ -1,13 +1,71 @@
 
+-- select * from /test/delete
+-- /**
+-- output()
+-- count(3)
+-- **/
+-- ;
 
 
+-- select * from  ( select * from /test/delete) vv
+-- /**
+-- output()
+-- count(3)
+-- **/
+-- ;
 
-SELECT
-	 name, vtime
-FROM /matrix/filesystem where name='variables.png'
+
+-- select * from /test/delete where v_timestamp = '2019-10-22 23:59:59'
+-- /**
+-- output()
+-- count(1)
+-- **/
+-- ;
+
+
+select * from  ( select * from /test/delete) vv where v_timestamp = '2019-10-22 23:59:59'
+/**
+output()
+match("v_timestamp", "2019-10-22T23:59:59+08:00")
+**/
+;
+
+
+select * from  ( select * from /test/delete) vv where vv.v_timestamp = '2019-10-22 23:59:59'
 /**
 output()
-match(vtime,"2026-04-07T18:53:23.871+08:00")
+match("v_timestamp", "2019-10-22T23:59:59+08:00")
 **/
 ;
 
+select v_timestamp from  ( select v_timestamp from /test/delete) vv where vv.v_timestamp = '2019-10-22 23:59:59'
+/**
+output()
+match("v_timestamp", "2019-10-22T23:59:59+08:00")
+**/
+;
+
+select v_timestamp from  ( select v_timestamp from /test/delete) where v_timestamp = '2019-10-22 23:59:59'
+/**
+output()
+match("v_timestamp", "2019-10-22T23:59:59+08:00")
+**/
+;
+
+select vtime from /test/delete 
+/**
+output()
+**/
+;
+
+select vtime from (select vtime from /test/delete)
+/**
+output()
+**/
+;
+
+select vtime from (select * from /test/delete)
+/**
+output()
+**/
+;

+ 34 - 0
odbctest/mql/basic/13delete/98.subqueryconds.mql

@@ -1,31 +1,33 @@
 
+select * from /test/delete
+/**
+output()
+count(3)
+**/
+;
 
 
+select * from  ( select * from /test/delete) vv
+/**
+output()
+count(3)
+**/
+;
 
 
+select * from /test/delete where v_timestamp = '2019-10-22 23:59:59'
+/**
+output()
+count(1)
+match("v_timestamp", "2019-10-22T23:59:59+08:00")
+**/
+;
 
 
 select * from  ( select * from /test/delete) vv where v_timestamp = '2019-10-22 23:59:59'
 /**
 output()
+match("v_timestamp", "2019-10-22T23:59:59+08:00")
 **/
 ;
 
@@ -33,6 +35,20 @@ output()
 select * from  ( select * from /test/delete) vv where vv.v_timestamp = '2019-10-22 23:59:59'
 /**
 output()
+match("v_timestamp", "2019-10-22T23:59:59+08:00")
+**/
+;
+
+select v_timestamp from  ( select v_timestamp from /test/delete) vv where vv.v_timestamp = '2019-10-22 23:59:59'
+/**
+output()
+match("v_timestamp", "2019-10-22T23:59:59+08:00")
 **/
 ;
 
+select v_timestamp from  ( select v_timestamp from /test/delete) where v_timestamp = '2019-10-22 23:59:59'
+/**
+output()
+match("v_timestamp", "2019-10-22T23:59:59+08:00")
+**/
+;

+ 1 - 1
odbctest/odbcmql/mql_run.go

@@ -98,7 +98,7 @@ func Run(t *testing.T) {
 		if len(os.Args) > 2 && os.Args[1] == "-" {
 			s := strings.Join(os.Args[2:], " ")
 			spath = []string{"/tmp/1.mql"}
-			os.WriteFile(spath[0], []byte(s+"/**output()**/"), os.ModePerm)
+			os.WriteFile(spath[0], []byte(s+"\n/**output()**/"), os.ModePerm)
 		} else {
 			for i := 1; i < len(os.Args); i++ {
 				ap := os.Args[i]

+ 1 - 1
odbctest/odbcmql/mqls_match.go

@@ -124,7 +124,7 @@ func matchvalue(matcher any, matchingvalue any) (bool, string) {
 				return sv >= fvrange[0] && sv <= fvrange[len(fvrange)-1], sv
 			}
 		case time.Time:
-			sv = fmt.Sprintf("%#v", v.Format("2006-01-02T15:04:05.000-07:00"))
+			sv = fmt.Sprintf("%#v", v.Format("2006-01-02T15:04:05.999999999-07:00"))
 		default:
 			sv = fmt.Sprintf("%#v", matchingvalue)
 		}