Changeset: d1a381bf1247 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1a381bf1247 Modified Files: clients/R/MonetDB.R/DESCRIPTION monetdb5/extras/rapi/rapi.R sql/backends/monet5/Tests/rapi00.sql sql/backends/monet5/Tests/rapi02.sql sql/backends/monet5/Tests/rapi03.sql sql/backends/monet5/Tests/rapi05.sql sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py sql/backends/monet5/bam/Tests/check_files.sql sql/backends/monet5/bam/Tests/check_files_exact.sql sql/backends/monet5/bam/Tests/drop_last_files.SQL.py sql/backends/monet5/bam/Tests/sam_export.SQL.py sql/backends/monet5/bam/Tests/sql/bam_export.sql sql/backends/monet5/bam/Tests/sql/bam_loader_file.sql sql/backends/monet5/bam/Tests/sql/bam_loader_files.sql sql/backends/monet5/bam/Tests/sql/bam_loader_repos.sql sql/backends/monet5/bam/Tests/sql/sam_export.sql sql/backends/monet5/bam/Tests/verify_load.sql sql/test/BugTracker-2013/Tests/n_regionkey.sorted sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src sql/test/quantiles/Tests/All Branch: default Log Message:
Merge with Oct2014 branch. diffs (203 lines): diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION --- a/clients/R/MonetDB.R/DESCRIPTION +++ b/clients/R/MonetDB.R/DESCRIPTION @@ -11,4 +11,4 @@ Enhances: dplyr (>= 0.3.0) Description: Allows to pull data from MonetDB into R. Includes a DBI implementation and a dplyr backend. License: MPL (== 1.1) URL: http://monetr.r-forge.r-project.org -SystemRequirements: MonetDB, available from http://www.monetdb.org \ No newline at end of file +SystemRequirements: MonetDB, available from http://www.monetdb.org diff --git a/monetdb5/extras/rapi/rapi.R b/monetdb5/extras/rapi/rapi.R --- a/monetdb5/extras/rapi/rapi.R +++ b/monetdb5/extras/rapi/rapi.R @@ -50,4 +50,4 @@ rewireFunc("q", quit, "base") #rewireFunc("system", system, "base") #rewireFunc("system2", system, "base") -rm(rewireFunc) \ No newline at end of file +rm(rewireFunc) diff --git a/sql/backends/monet5/Tests/rapi00.sql b/sql/backends/monet5/Tests/rapi00.sql --- a/sql/backends/monet5/Tests/rapi00.sql +++ b/sql/backends/monet5/Tests/rapi00.sql @@ -7,4 +7,4 @@ language R { SELECT d FROM rapi00() AS R WHERE d > 5; DROP FUNCTION rapi00; -ROLLBACK; \ No newline at end of file +ROLLBACK; diff --git a/sql/backends/monet5/Tests/rapi02.sql b/sql/backends/monet5/Tests/rapi02.sql --- a/sql/backends/monet5/Tests/rapi02.sql +++ b/sql/backends/monet5/Tests/rapi02.sql @@ -11,4 +11,4 @@ SELECT rapi02(i,j,2) as r02 FROM rval; DROP FUNCTION rapi02; DROP TABLE rval; -ROLLBACK; \ No newline at end of file +ROLLBACK; diff --git a/sql/backends/monet5/Tests/rapi03.sql b/sql/backends/monet5/Tests/rapi03.sql --- a/sql/backends/monet5/Tests/rapi03.sql +++ b/sql/backends/monet5/Tests/rapi03.sql @@ -9,4 +9,4 @@ DROP FUNCTION rapi03; DROP TABLE rval; -ROLLBACK; \ No newline at end of file +ROLLBACK; diff --git a/sql/backends/monet5/Tests/rapi05.sql b/sql/backends/monet5/Tests/rapi05.sql --- a/sql/backends/monet5/Tests/rapi05.sql +++ b/sql/backends/monet5/Tests/rapi05.sql @@ -12,4 +12,4 @@ SELECT cluster FROM (SELECT MIN(x) AS mi DROP FUNCTION kmeans; DROP TABLE xdata; -ROLLBACK; \ No newline at end of file +ROLLBACK; diff --git a/sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py b/sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py --- a/sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py +++ b/sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py @@ -29,4 +29,4 @@ bam.exec_sql_file("bam_loader_files.sql" # And clean up our garbage os.remove(files_path); -os.remove(files_qname_path); \ No newline at end of file +os.remove(files_qname_path); diff --git a/sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py b/sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py --- a/sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py +++ b/sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py @@ -1,3 +1,3 @@ import bam -bam.exec_sql_file("bam_loader_repos.sql", {'PWD': bam.SRCDIR}) \ No newline at end of file +bam.exec_sql_file("bam_loader_repos.sql", {'PWD': bam.SRCDIR}) diff --git a/sql/backends/monet5/bam/Tests/check_files.sql b/sql/backends/monet5/bam/Tests/check_files.sql --- a/sql/backends/monet5/bam/Tests/check_files.sql +++ b/sql/backends/monet5/bam/Tests/check_files.sql @@ -1,3 +1,3 @@ SELECT dbschema, format_version, sorting_order, comments FROM bam.files -ORDER BY file_location; \ No newline at end of file +ORDER BY file_location; diff --git a/sql/backends/monet5/bam/Tests/check_files_exact.sql b/sql/backends/monet5/bam/Tests/check_files_exact.sql --- a/sql/backends/monet5/bam/Tests/check_files_exact.sql +++ b/sql/backends/monet5/bam/Tests/check_files_exact.sql @@ -1,2 +1,2 @@ SELECT file_id, dbschema, format_version, sorting_order, comments -FROM bam.files; \ No newline at end of file +FROM bam.files; diff --git a/sql/backends/monet5/bam/Tests/drop_last_files.SQL.py b/sql/backends/monet5/bam/Tests/drop_last_files.SQL.py --- a/sql/backends/monet5/bam/Tests/drop_last_files.SQL.py +++ b/sql/backends/monet5/bam/Tests/drop_last_files.SQL.py @@ -21,4 +21,4 @@ for match in p.finditer(out): mapping['DBSCHEMA_'+match.group(1)] = match.group(2) # And now we can execute the SQL -bam.exec_sql_file("drop_last_files.sql", mapping) \ No newline at end of file +bam.exec_sql_file("drop_last_files.sql", mapping) diff --git a/sql/backends/monet5/bam/Tests/sam_export.SQL.py b/sql/backends/monet5/bam/Tests/sam_export.SQL.py --- a/sql/backends/monet5/bam/Tests/sam_export.SQL.py +++ b/sql/backends/monet5/bam/Tests/sam_export.SQL.py @@ -10,4 +10,4 @@ bam.exec_sql_file("sam_export.sql", {'OU # And remove our garbage os.remove(output_1) -os.remove(output_2) \ No newline at end of file +os.remove(output_2) diff --git a/sql/backends/monet5/bam/Tests/sql/bam_export.sql b/sql/backends/monet5/bam/Tests/sql/bam_export.sql --- a/sql/backends/monet5/bam/Tests/sql/bam_export.sql +++ b/sql/backends/monet5/bam/Tests/sql/bam_export.sql @@ -42,4 +42,4 @@ SELECT qname, flag, rname, pos, mapq, ci FROM bam.alignments_16; # Verify that the export table is now empty -SELECT * FROM bam.export; \ No newline at end of file +SELECT * FROM bam.export; diff --git a/sql/backends/monet5/bam/Tests/sql/bam_loader_file.sql b/sql/backends/monet5/bam/Tests/sql/bam_loader_file.sql --- a/sql/backends/monet5/bam/Tests/sql/bam_loader_file.sql +++ b/sql/backends/monet5/bam/Tests/sql/bam_loader_file.sql @@ -1,4 +1,4 @@ CALL bam.bam_loader_file('PWD/files/file1.bam', 0); CALL bam.bam_loader_file('PWD/files/file2.sam', 0); CALL bam.bam_loader_file('PWD/files/queryname/file1.bam', 1); -CALL bam.bam_loader_file('PWD/files/queryname/file2.sam', 1); \ No newline at end of file +CALL bam.bam_loader_file('PWD/files/queryname/file2.sam', 1); diff --git a/sql/backends/monet5/bam/Tests/sql/bam_loader_files.sql b/sql/backends/monet5/bam/Tests/sql/bam_loader_files.sql --- a/sql/backends/monet5/bam/Tests/sql/bam_loader_files.sql +++ b/sql/backends/monet5/bam/Tests/sql/bam_loader_files.sql @@ -1,2 +1,2 @@ CALL bam.bam_loader_files('PWD/files.txt', 0, 4); -CALL bam.bam_loader_files('PWD/files_qname.txt', 1, 4); \ No newline at end of file +CALL bam.bam_loader_files('PWD/files_qname.txt', 1, 4); diff --git a/sql/backends/monet5/bam/Tests/sql/bam_loader_repos.sql b/sql/backends/monet5/bam/Tests/sql/bam_loader_repos.sql --- a/sql/backends/monet5/bam/Tests/sql/bam_loader_repos.sql +++ b/sql/backends/monet5/bam/Tests/sql/bam_loader_repos.sql @@ -1,3 +1,3 @@ # Load files CALL bam.bam_loader_repos('PWD/files', 0, 4); -CALL bam.bam_loader_repos('PWD/files/queryname', 1, 4); \ No newline at end of file +CALL bam.bam_loader_repos('PWD/files/queryname', 1, 4); diff --git a/sql/backends/monet5/bam/Tests/sql/sam_export.sql b/sql/backends/monet5/bam/Tests/sql/sam_export.sql --- a/sql/backends/monet5/bam/Tests/sql/sam_export.sql +++ b/sql/backends/monet5/bam/Tests/sql/sam_export.sql @@ -42,4 +42,4 @@ SELECT qname, flag, rname, pos, mapq, ci FROM bam.alignments_14; # Verify that the export table is now empty -SELECT * FROM bam.export; \ No newline at end of file +SELECT * FROM bam.export; diff --git a/sql/backends/monet5/bam/Tests/verify_load.sql b/sql/backends/monet5/bam/Tests/verify_load.sql --- a/sql/backends/monet5/bam/Tests/verify_load.sql +++ b/sql/backends/monet5/bam/Tests/verify_load.sql @@ -15,4 +15,4 @@ SELECT * FROM bam.paired_secondary_alignments_3; SELECT * -FROM bam.unpaired_alignments_3; \ No newline at end of file +FROM bam.unpaired_alignments_3; diff --git a/sql/test/BugTracker-2013/Tests/n_regionkey.sorted b/sql/test/BugTracker-2013/Tests/n_regionkey.sorted index b881cb424d3e8135b4414ef6e850b0e5672f886d..ebeb58c579a0e423e9e5b3061c83726c96b1c167 GIT binary patch literal 21 Wc${NoU|?VZVrC#_0b*7l<^li!x&Rsg diff --git a/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py b/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py --- a/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py +++ b/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py @@ -39,4 +39,4 @@ open(cn) print(cn.cmd('sSELECT name FROM tables WHERE system=0;\n')) print(cn.cmd('sDROP TABLE a;\n')) -cn.disconnect() \ No newline at end of file +cn.disconnect() diff --git a/sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src b/sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src --- a/sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src +++ b/sql/test/Dependencies/Tests/Dependencies_bam.SQL.py.src @@ -1,1 +1,1 @@ -$RELSRCDIR/Dependencies.SQL.py \ No newline at end of file +$RELSRCDIR/Dependencies.SQL.py diff --git a/sql/test/quantiles/Tests/All b/sql/test/quantiles/Tests/All --- a/sql/test/quantiles/Tests/All +++ b/sql/test/quantiles/Tests/All @@ -1,1 +1,1 @@ -quantiles \ No newline at end of file +quantiles _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
