Changeset: b3b9f319873d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3b9f319873d Modified Files: clients/R/Tests/dplyr-flights.stable.err monetdb5/extras/rapi/Tests/rapi02.malC monetdb5/extras/rapi/Tests/rapi02.stable.out Branch: leftmart Log Message:
merge with default diffs (36 lines): diff --git a/clients/R/Tests/dplyr-flights.stable.err b/clients/R/Tests/dplyr-flights.stable.err --- a/clients/R/Tests/dplyr-flights.stable.err +++ b/clients/R/Tests/dplyr-flights.stable.err @@ -30,7 +30,7 @@ stderr of test 'dplyr-flights` in direct # 11:44:05 > "R" "--vanilla" "--slave" "--args" "30588" # 11:44:05 > -Identifier(s) year, month, day, hour, minute are reserved SQL keywords and need to be quoted. +Identifier(s) year, month, day, hour, minute are reserved SQL keywords and need(s) to be quoted in queries. # 11:44:15 > # 11:44:15 > "Done." diff --git a/monetdb5/extras/rapi/Tests/rapi02.malC b/monetdb5/extras/rapi/Tests/rapi02.malC --- a/monetdb5/extras/rapi/Tests/rapi02.malC +++ b/monetdb5/extras/rapi/Tests/rapi02.malC @@ -89,7 +89,7 @@ bat.append(bstr,"asdf":str); bat.append(bstr,"sd asd asd asd asd a":str); bat.append(bstr,"":str); bat.append(bstr,nil:str); -rstr:bat[:oid,:int] := rapi.eval(nil:ptr,"unlist(lapply(arg1,nchar))",bstr); +rstr:bat[:oid,:int] := rapi.eval(nil:ptr,"nchar(arg1)",bstr); io.print(rstr); diff --git a/monetdb5/extras/rapi/Tests/rapi02.stable.out b/monetdb5/extras/rapi/Tests/rapi02.stable.out --- a/monetdb5/extras/rapi/Tests/rapi02.stable.out +++ b/monetdb5/extras/rapi/Tests/rapi02.stable.out @@ -112,7 +112,7 @@ Ready. [ 0@0, 4 ] [ 1@0, 20 ] [ 2@0, 0 ] -[ 3@0, 1 ] +[ 3@0, 2 ] #io.print(rintbi); #--------------------------# # h t # name _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
