Changeset: e2e2e1803d09 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2e2e1803d09 Added Files: clients/Tests/SQL-dump.SQL.py sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.sql sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.stable.err sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.stable.out sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.err sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out sql/test/BugTracker-2016/Tests/consolidated_table.Bug-3954.sql sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.sql sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.err sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/foreign_key.Bug-3938.sql sql/test/BugTracker-2016/Tests/foreign_key.Bug-3938.stable.err sql/test/BugTracker-2016/Tests/foreign_key.Bug-3938.stable.out sql/test/BugTracker-2016/Tests/group_distinct_quantile.Bug-3927.sql sql/test/BugTracker-2016/Tests/group_distinct_quantile.Bug-3927.stable.err sql/test/BugTracker-2016/Tests/group_distinct_quantile.Bug-3927.stable.out sql/test/BugTracker-2016/Tests/invalidcolumns.Bug-3968.sql sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.sql sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.err sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.sql sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.err sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/check.SQL.py.src sql/test/emptydb-upgrade-chain-hge/Tests/check.reqtests sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py sql/test/emptydb-upgrade-chain-hge/Tests/dump.reqtests sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/package.py sql/test/emptydb-upgrade-chain-hge/Tests/package.reqtests sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.py sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.sql sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/All sql/test/emptydb-upgrade-chain/Tests/check.SQL.py.src sql/test/emptydb-upgrade-chain/Tests/check.reqtests sql/test/emptydb-upgrade-chain/Tests/check.stable.err sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py sql/test/emptydb-upgrade-chain/Tests/dump.reqtests sql/test/emptydb-upgrade-chain/Tests/dump.stable.err sql/test/emptydb-upgrade-chain/Tests/dump.stable.out sql/test/emptydb-upgrade-chain/Tests/package.py sql/test/emptydb-upgrade-chain/Tests/package.reqtests sql/test/emptydb-upgrade-chain/Tests/package.stable.err sql/test/emptydb-upgrade-chain/Tests/package.stable.out sql/test/emptydb-upgrade-chain/Tests/unpackage.py sql/test/emptydb-upgrade-chain/Tests/unpackage.stable.err sql/test/emptydb-upgrade-chain/Tests/unpackage.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.sql sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.err sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/All sql/test/emptydb-upgrade-hge/Tests/check.SQL.py.src sql/test/emptydb-upgrade-hge/Tests/check.reqtests sql/test/emptydb-upgrade-hge/Tests/check.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py sql/test/emptydb-upgrade-hge/Tests/dump.reqtests sql/test/emptydb-upgrade-hge/Tests/dump.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/unpackage.py sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.sql sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/All sql/test/emptydb-upgrade/Tests/check.SQL.py.src sql/test/emptydb-upgrade/Tests/check.reqtests sql/test/emptydb-upgrade/Tests/check.stable.err sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/dump.SQL.py sql/test/emptydb-upgrade/Tests/dump.reqtests sql/test/emptydb-upgrade/Tests/dump.stable.err sql/test/emptydb-upgrade/Tests/dump.stable.out sql/test/emptydb-upgrade/Tests/unpackage.py sql/test/emptydb-upgrade/Tests/unpackage.stable.err sql/test/emptydb-upgrade/Tests/unpackage.stable.out sql/test/emptydb-upgrade/Tests/upgrade.sql sql/test/emptydb-upgrade/Tests/upgrade.stable.err sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/All sql/test/emptydb/Tests/check.SQL.py.src sql/test/emptydb/Tests/check.reqtests sql/test/emptydb/Tests/check.stable.err sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.int128 sql/test/emptydb/Tests/dump.SQL.py sql/test/emptydb/Tests/dump.reqtests sql/test/emptydb/Tests/dump.stable.err sql/test/emptydb/Tests/dump.stable.out sql/test/emptydb/Tests/load.sql sql/test/emptydb/Tests/load.stable.err sql/test/emptydb/Tests/load.stable.out sql/test/emptydb/Tests/package-hge.py sql/test/emptydb/Tests/package-hge.stable.err.int128 sql/test/emptydb/Tests/package-hge.stable.out.int128 sql/test/emptydb/Tests/package.py sql/test/emptydb/Tests/package.reqtests sql/test/emptydb/Tests/package.stable.err sql/test/emptydb/Tests/package.stable.out sql/test/emptydb/updatetests tools/embedded/rcheck.sh Removed Files: clients/Tests/SQL-dump.sql Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog.Jun2016 clients/ChangeLog.Jun2016 clients/R/MonetDB.R/DESCRIPTION clients/R/MonetDB.R/NAMESPACE clients/R/MonetDB.R/R/dbi.R clients/R/MonetDB.R/R/dplyr.R clients/R/Tests/deps-install.R clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr.R clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog debian/control debian/monetdb5-sql.install gdk/ChangeLog.Jul2015 gdk/ChangeLog.Jun2016 gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_project.c gdk/gdk_system.c gdk/gdk_tm.c gdk/libbat.rc geom/monetdb5/geom.c geom/monetdb5/geom.h geom/monetdb5/geom_upgrade.c java/ChangeLog.Jun2016 java/build.properties java/pom.xml java/release.txt java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in libversions monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/json.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batmmath.h monetdb5/modules/kernel/batmmath.mal monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/bbp.h monetdb5/modules/mal/bbp.mal monetdb5/modules/mal/querylog.c monetdb5/modules/mal/querylog.h monetdb5/modules/mal/querylog.mal monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/opt_volcano.c monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal monetdb5/tools/libmonetdb5.rc sql/backends/monet5/Makefile.ag sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/benchmarks/tpch/Tests/20-plan.stable.out sql/benchmarks/tpch/Tests/20-plan.stable.out.int128 sql/common/sql_types.c sql/include/sql_mem.h sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.out sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_parser.y sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_utils.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.sql sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.err sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out sql/test/Dependencies/Tests/dependency_loop.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Via-m/Tests/event_s11.stable.err sql/test/Via-m/Tests/event_s11.stable.out sql/test/Via-m/Tests/media_s18.stable.err sql/test/Via-m/Tests/media_s18.stable.out sql/test/Via-m/Tests/media_s19.stable.err sql/test/Via-m/Tests/media_s19.stable.out sql/test/copy/Tests/int_parse.stable.err sql/test/copy/Tests/int_parse.stable.out sql/test/copy/Tests/int_parse_best.stable.out sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out sql/test/copy/Tests/null_as_string_errors.stable.err sql/test/copy/Tests/null_as_string_errors.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2.stable.out.int128 sql/test/pg_regress/Tests/case.stable.out sql/test/pg_regress/Tests/create_misc.stable.err sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-dump.stable.out sql/test/testdb/Tests/testdb-dump.stable.out.Windows sql/test/testdb/Tests/testdb-load.sql testing/Mfilter.py testing/Mtest.py.in testing/process.py tools/embedded/build-on-windows.bat tools/embedded/build-rpkg.sh tools/embedded/demo.c tools/embedded/embedded.c tools/embedded/embedded.h tools/embedded/embeddedr.c tools/embedded/embeddedr.h tools/embedded/rpackage/DESCRIPTION tools/embedded/rpackage/R/monetdb.R tools/embedded/rpackage/configure tools/embedded/rpackage/man/embedded.Rd tools/merovingian/daemon/monetdbd.1.in tools/merovingian/daemon/monetdbd.service.in tools/mserver/monet_version.c.in tools/mserver/mserver5.c vertoo.data Branch: leftmart Log Message:
merge with default diffs (truncated from 205886 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -618,3 +618,5 @@ 25c9f569add9c341d40920f30936890ae6ea68a8 feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_15 feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_SP3_release ee2d8c8d65c35ed022ca0785f30fcf4b051a542e Jun2016_root +ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_17 +ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -106,6 +106,8 @@ License: MPLv2.0 URL: http://www.monetdb.org/ Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP3/%{name}-%{version}.tar.bz2 +# we need systemd for the _unitdir macro to exist +BuildRequires: systemd BuildRequires: bison BuildRequires: bzip2-devel %if %{?with_fits:1}%{!?with_fits:0} @@ -117,7 +119,7 @@ BuildRequires: geos-devel >= 3.0.0 BuildRequires: gsl-devel %if %{?with_lidar:1}%{!?with_lidar:0} BuildRequires: liblas-devel gdal-devel libgeotiff-devel -# Fedora 22 libas-devel does not depend on liblas: +# Fedora 22 liblas-devel does not depend on liblas: BuildRequires: liblas %endif BuildRequires: libatomic_ops-devel @@ -984,6 +986,29 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Thu Mar 24 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.17-20160324 +- Rebuilt. +- BZ#2972: SQL URL functionality contains errors +- BZ#3881: Server crashes on bulk load +- BZ#3890: Window function + group by in subselect, rel2bin_project: + Assertion `0' failed +- BZ#3891: MonetDB crashes when executing SQL with window function +- BZ#3900: null handling in some sql statements is incorrect +- BZ#3906: Multi-column 1-N table-function with mitosis produces different + column counts +- BZ#3917: Date difference returns month_interval instead of day_interval +- BZ#3938: Wrong error message on violating foreign key constraint +- BZ#3941: Wrong coercion priority +- BZ#3948: SQL: select * from sys.sys.table_name; is accepted but should + return an error +- BZ#3951: extern table_funcs not visible from Windows DLL for extensions + like vaults (crashes) +- BZ#3952: Stream table gives segfault +- BZ#3953: MIN/MAX of a UUID column produces wrong results +- BZ#3954: Consolidate table assertion error +- BZ#3955: (incorrect) MAL loop instead of manifold triggered by simple + change in target list + * Thu Mar 10 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.15-20160310 - Rebuilt. - BZ#3549: bulk string operations very slow diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -148,7 +148,7 @@ /* #undef HAVE_FDATASYNC */ /* Define to 1 if you have the <fenv.h> header file. */ -#if !defined(_MSV_VER) || _MSC_VER > 1600 +#if !defined(_MSC_VER) || _MSC_VER > 1600 #define HAVE_FENV_H 1 #endif @@ -240,7 +240,7 @@ #define HAVE_IO_H 1 /* Define to 1 if you have the `isinf' function. */ -#if !defined(_MSV_VER) || _MSC_VER > 1600 +#if !defined(_MSC_VER) || _MSC_VER > 1600 #define HAVE_ISINF 1 #endif @@ -309,7 +309,7 @@ /* Define to 1 if you have the `llabs' function. */ #define HAVE_LLABS 1 -#if defined(_MSV_VER) && _MSC_VER <= 1500 +#if defined(_MSC_VER) && _MSC_VER <= 1500 #define llabs _abs64 #endif @@ -460,7 +460,7 @@ /* #undef HAVE_RLIMIT_H */ /* Define to 1 if you have the `round' function. */ -#if !defined(_MSV_VER) || _MSC_VER > 1600 +#if !defined(_MSC_VER) || _MSC_VER > 1600 #define HAVE_ROUND 1 #endif diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -274,13 +274,20 @@ create_winconfig_conds_new_py: $(ECHO) # > "$(TOPDIR)\winconfig_conds_new.py" !IFDEF BITS32 $(ECHO) BITS32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" + $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE $(ECHO) BITS32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF BITS64 $(ECHO) BITS64_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" +!IFDEF MONET_OID32 + $(ECHO) BITS64OID32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" +!ELSE + $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" +!ENDIF !ELSE $(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" + $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" +!ENDIF !ENDIF !IFDEF CROSS_COMPILING $(ECHO) CROSS_COMPILING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" diff --git a/buildtools/ChangeLog.Jun2016 b/buildtools/ChangeLog.Jun2016 --- a/buildtools/ChangeLog.Jun2016 +++ b/buildtools/ChangeLog.Jun2016 @@ -7,5 +7,5 @@ * Sat Jan 23 2016 Sjoerd Mullender <sjo...@acm.org> - Implemented a systemd configuration file for a monetdbd.service - on Fedora. + on systems that support it (Fedora, newer Ubuntu). diff --git a/clients/ChangeLog.Jun2016 b/clients/ChangeLog.Jun2016 --- a/clients/ChangeLog.Jun2016 +++ b/clients/ChangeLog.Jun2016 @@ -1,3 +1,7 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Wed Mar 16 2016 Sjoerd Mullender <sjo...@acm.org> +- The Ruby client is now in a separate repository + (http://dev.monetdb.org/hg/monetdb-ruby) and released independently. + 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 @@ -1,5 +1,5 @@ Package: MonetDB.R -Version: 1.0.1 +Version: 1.0.2 Title: Connect MonetDB to R Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email = "han...@cwi.nl"), person("Anthony Damico", role = "aut"), diff --git a/clients/R/MonetDB.R/NAMESPACE b/clients/R/MonetDB.R/NAMESPACE --- a/clients/R/MonetDB.R/NAMESPACE +++ b/clients/R/MonetDB.R/NAMESPACE @@ -21,18 +21,4 @@ export(monetdb.server.getpid) # dplyr.R export(src_monetdb) -export(src_translate_env.src_monetdb) -export(src_desc.src_monetdb) -export(tbl.src_monetdb) -export(db_query_fields.MonetDBConnection) -export(db_query_fields.MonetDBEmbeddedConnection) -export(db_query_rows.MonetDBConnection) -export(db_query_rows.MonetDBEmbeddedConnection) -export(db_save_query.MonetDBConnection) -export(db_insert_into.MonetDBConnection) -export(db_create_index.MonetDBConnection) -export(db_analyze.MonetDBConnection) -export(sql_subquery.MonetDBConnection) -export(monetdb_queryinfo) -export(sample_n.tbl_monetdb) -export(sample_frac.tbl_monetdb) +# rest of dplyr.R exported via hack in src_monetdb diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R --- a/clients/R/MonetDB.R/R/dbi.R +++ b/clients/R/MonetDB.R/R/dbi.R @@ -97,7 +97,8 @@ setMethod("dbConnect", "MonetDBDriver", if (!requireNamespace("MonetDBLite", quietly=T)) { stop("MonetDBLite package required for embedded mode") } - MonetDBLite::monetdb_embedded_startup(embedded, !getOption("monetdb.debug.embedded", FALSE)) + MonetDBLite::monetdb_embedded_startup(embedded, !getOption("monetdb.debug.embedded", FALSE), + getOption("monetdb.sequential", TRUE)) connenv <- new.env(parent=emptyenv()) connenv$conn <- MonetDBLite::monetdb_embedded_connect() connenv$open <- TRUE @@ -331,7 +332,7 @@ setMethod("dbSendQuery", signature(conn= # This one does all the work in this class setMethod("dbSendQuery", signature(conn="MonetDBEmbeddedConnection", statement="character"), - def=function(conn, statement, ..., list=NULL, notreally=F) { + def=function(conn, statement, ..., list=NULL, execute = T, resultconvert = T) { if (!conn@connenv$open) { stop("This connection was closed.") } @@ -344,7 +345,7 @@ setMethod("dbSendQuery", signature(conn= if(!is.null(log_file <- getOption("monetdb.log.query", NULL))) cat(c(statement, ";\n"), file = log_file, sep="", append = TRUE) startt <- Sys.time() - resp <- MonetDBLite::monetdb_embedded_query(conn@connenv$conn, statement, notreally) + resp <- MonetDBLite::monetdb_embedded_query(conn@connenv$conn, statement, execute, resultconvert) takent <- round(as.numeric(Sys.time() - startt), 2) env <- new.env(parent=emptyenv()) if (resp$type == Q_TABLE) { diff --git a/clients/R/MonetDB.R/R/dplyr.R b/clients/R/MonetDB.R/R/dplyr.R --- a/clients/R/MonetDB.R/R/dplyr.R +++ b/clients/R/MonetDB.R/R/dplyr.R @@ -4,7 +4,26 @@ src_monetdb <- function(dbname="demo", h con <- DBI::dbConnect(MonetDB.R(), dbname = dbname , host = host, port = port, user = user, password = password, ...) } - dplyr::src_sql("monetdb", con, info = DBI::dbGetInfo(con)) + s <- dplyr::src_sql("monetdb", con, info = DBI::dbGetInfo(con)) + + # this is a (dirty) hack so we don't need to depend on dplyr + dplyrMt <- getNamespace("dplyr")$.__S3MethodsTable__. + + dplyrMt[["src_translate_env.src_monetdb"]] <- src_translate_env.src_monetdb + dplyrMt[["src_desc.src_monetdb"]] <- src_desc.src_monetdb + dplyrMt[["tbl.src_monetdb"]] <- tbl.src_monetdb + dplyrMt[["db_query_fields.MonetDBConnection"]] <- db_query_fields.MonetDBEmbeddedConnection + dplyrMt[["db_query_rows.MonetDBConnection"]] <- db_query_rows.MonetDBConnection + dplyrMt[["db_query_rows.MonetDBEmbeddedConnection"]] <- db_query_rows.MonetDBEmbeddedConnection + dplyrMt[["db_save_query.MonetDBConnection"]] <- db_save_query.MonetDBConnection + dplyrMt[["db_insert_into.MonetDBConnection"]] <- db_insert_into.MonetDBConnection + dplyrMt[["db_create_index.MonetDBConnection"]] <- db_create_index.MonetDBConnection + dplyrMt[["db_analyze.MonetDBConnection"]] <- db_analyze.MonetDBConnection + dplyrMt[["sql_subquery.MonetDBConnection"]] <- sql_subquery.MonetDBConnection + dplyrMt[["sample_n.tbl_monetdb"]] <- sample_n.tbl_monetdb + dplyrMt[["sample_frac.tbl_monetdb"]] <- sample_frac.tbl_monetdb + + s } src_translate_env.src_monetdb <- function(x) { @@ -59,7 +78,7 @@ db_query_fields.MonetDBConnection <- fun } db_query_fields.MonetDBEmbeddedConnection <- function(con, sql, ...) { - names(DBI::dbGetQuery(con, dplyr::build_sql("SELECT * FROM ", sql), notreally=T)) + names(DBI::dbGetQuery(con, dplyr::build_sql("SELECT * FROM ", sql), execute = F)) } db_query_rows.MonetDBConnection <- function(con, sql, ...) { @@ -67,7 +86,7 @@ db_query_rows.MonetDBConnection <- funct } db_query_rows.MonetDBEmbeddedConnection <- function(con, sql, ...) { - attr(DBI::dbGetQuery(con, sql, notreally=T), "__rows") + attr(DBI::dbGetQuery(con, sql, resultconvert = F), "__rows") } db_insert_into.MonetDBConnection <- function(con, table, values, ...) { diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R --- a/clients/R/Tests/deps-install.R +++ b/clients/R/Tests/deps-install.R @@ -3,11 +3,6 @@ dir.create(unlist(strsplit(Sys.getenv("R # autoinstall DBI and digest, we need those to install MonetDB.R dd <- capture.output(suppressMessages(suppressWarnings({ - (function(lp) { - np <- lp[!(lp %in% installed.packages()[,"Package"])] - repos <- "http://cran.rstudio.com/"; - if(length(np)) install.packages(np,repos=repos, quiet=T) - update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T) - x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)}) - })(c("DBI", "digest")) + install.packages(c("devtools", "digest"), repos="http://cran.rstudio.com/";, quiet=T) + devtools::install_github("rstats-db/DBI", quiet=T) }))) diff --git a/clients/R/Tests/dplyr-flights.R b/clients/R/Tests/dplyr-flights.R --- a/clients/R/Tests/dplyr-flights.R +++ b/clients/R/Tests/dplyr-flights.R @@ -10,9 +10,6 @@ dd <- capture.output( suppressMessages ( library(dplyr, quietly=T) -# FIXME: this should no longer be required -library(MonetDB.R, quietly = T) - args <- commandArgs(trailingOnly = TRUE) dbport <- 50000 dbname <- "mTests_clients_R" diff --git a/clients/R/Tests/dplyr.R b/clients/R/Tests/dplyr.R --- a/clients/R/Tests/dplyr.R +++ b/clients/R/Tests/dplyr.R @@ -10,9 +10,6 @@ dd <- capture.output( suppressMessages ( library(dplyr, quietly = T) -# FIXME: this should no longer be required -library(MonetDB.R, quietly = T) - args <- commandArgs(trailingOnly = TRUE) dbport <- 50000 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
