Changeset: 28d44d766dc4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=28d44d766dc4 Modified Files: sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows Branch: default Log Message:
Approved Windows output diffs (60 lines): diff --git a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows --- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows +++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows @@ -80,9 +80,6 @@ QUERY = plan copy into cm_tmp from '/fil ERROR = !COPY INTO: filename must have absolute path: "/file1" CODE = 42000 MAPI = monetdb@WIN2K12R2:33746 -QUERY = plan copy into cm_tmp from E'\\file1',E'\\file2'; -ERROR = !COPY INTO: filename must have absolute path: "\\file1" -CODE = 42000 # 08:59:53 > # 08:59:53 > Done. diff --git a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out --- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out +++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out @@ -15,10 +15,6 @@ stdout of test 'copy_multiple_files.SF-2 # Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:36694/ # MonetDB/SQL module v2.34.0 loaded -#function user.main():void; -# clients.quit(); -#end main; - # 08:59:53 > # 08:59:53 > mclient -lsql -i --host=alf --port=36694 diff --git a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows --- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows +++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows @@ -15,15 +15,25 @@ stdout of test 'copy_multiple_files.SF-2 # Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:36694/ # MonetDB/SQL module v2.34.0 loaded -#function user.main():void; -# clients.quit(); -#end main; - # 08:59:53 > # 08:59:53 > mclient -lsql -i --host=alf --port=36694 # 08:59:53 > +#create table cm_tmp(i int); +#plan copy into cm_tmp from E'\\file1',E'\\file2'; +% .plan # table_name +% rel # name +% clob # type +% 210 # length +insert( +| table(sys.cm_tmp) [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ] +| union ( +| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "\\file1", bigint "-1", bigint "0", int "0", int "0", varchar "NULL", int "0"), [ "cm_tmp"."i" ] COUNT , +| | table sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar "NULL", varchar "null", varchar "\\file2", bigint "-1", bigint "0", int "0", int "0", varchar "NULL", int "0"), [ "cm_tmp"."i" ] COUNT +| ) [ int "NULL" ] +) +#plan copy into cm_tmp from E'a:\\file1','Z:/file2'; % .plan # table_name % rel # name % clob # type _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
