Changeset: 7cc2548343c3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7cc2548343c3 Added Files: sql/scripts/51_sys_schema_extension.sql sql/test/BugTracker-2015/Tests/adddrop_unknown_table.Bug-3718.sql sql/test/BugTracker-2015/Tests/adddrop_unknown_table.Bug-3718.stable.err sql/test/BugTracker-2015/Tests/adddrop_unknown_table.Bug-3718.stable.out sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.sql sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.err sql/test/BugTracker-2015/Tests/convert-to-bit.Bug-3719.stable.out sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.sql sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.stable.err sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.stable.out sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.sql sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.stable.err sql/test/BugTracker-2015/Tests/leftjoin.Bug-3720.stable.out sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.err sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.out sql/test/BugTracker-2015/Tests/union_project.Bug-3723.sql sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.err sql/test/BugTracker-2015/Tests/union_project.Bug-3723.stable.out sql/test/mergetables/Tests/mergedrop1.sql sql/test/mergetables/Tests/mergedrop1.stable.err sql/test/mergetables/Tests/mergedrop1.stable.out sql/test/mergetables/Tests/mergedrop2.sql sql/test/mergetables/Tests/mergedrop2.stable.err sql/test/mergetables/Tests/mergedrop2.stable.out sql/test/mergetables/Tests/mergequery.stable.out.single sql/test/remote/Tests/partition_elim.sql sql/test/remote/Tests/partition_elim.stable.err sql/test/remote/Tests/partition_elim.stable.out tools/mserver/monetdblogo.png tools/mserver/tomographintro.docx tools/mserver/tomographintro.pdf 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 clients/R/MonetDB.R/DESCRIPTION clients/R/MonetDB.R/NEWS clients/R/MonetDB.R/R/dbi.R clients/R/Tests/dbi.R clients/R/Tests/dplyr.R 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/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/Tests/tomograph--help.stable.err clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/mclient.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/mapi.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py common/stream/stream.c configure.ag debian/changelog debian/control gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_calc_compare.h gdk/gdk_cross.c gdk/gdk_delta.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_join_legacy.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_setop.c gdk/gdk_storage.c gdk/gdk_tm.c gdk/gdk_utils.c gdk/gdk_value.c gdk/libbat.rc geom/monetdb5/geom.c libversions monetdb5/extras/rapi/rapi.c monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_parser.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resource.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/mtime.mal monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/logger.c monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/mal/Tests/inspect00.stable.out monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/joinpath.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/mdb.mal monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/transaction.c monetdb5/modules/mal/txtsim.c monetdb5/optimizer/opt_pushselect.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/bam/bam_loader.c sql/backends/monet5/generator/generator.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_optimizer.h sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/benchmarks/ssbm/Tests/01-plan.stable.out sql/benchmarks/ssbm/Tests/02-plan.stable.out sql/benchmarks/ssbm/Tests/03-plan.stable.out sql/benchmarks/ssbm/Tests/04-plan.stable.out sql/benchmarks/ssbm/Tests/05-plan.stable.out sql/benchmarks/ssbm/Tests/06-plan.stable.out sql/benchmarks/ssbm/Tests/07-plan.stable.out sql/benchmarks/ssbm/Tests/08-plan.stable.out sql/benchmarks/ssbm/Tests/09-plan.stable.out sql/benchmarks/ssbm/Tests/10-plan.stable.out sql/benchmarks/ssbm/Tests/11-plan.stable.out sql/benchmarks/ssbm/Tests/12-plan.stable.out sql/benchmarks/ssbm/Tests/13-plan.stable.out sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/Tests/02-plan.stable.out sql/benchmarks/tpch/Tests/03-plan.stable.out sql/benchmarks/tpch/Tests/03-plan.stable.out.int128 sql/benchmarks/tpch/Tests/05-plan.stable.out sql/benchmarks/tpch/Tests/05-plan.stable.out.int128 sql/benchmarks/tpch/Tests/07-plan.stable.out sql/benchmarks/tpch/Tests/07-plan.stable.out.int128 sql/benchmarks/tpch/Tests/08-plan.stable.out sql/benchmarks/tpch/Tests/08-plan.stable.out.int128 sql/benchmarks/tpch/Tests/09-plan.stable.out sql/benchmarks/tpch/Tests/09-plan.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-plan.stable.out sql/benchmarks/tpch/Tests/11-plan.stable.out.int128 sql/benchmarks/tpch/Tests/12-plan.stable.out sql/benchmarks/tpch/Tests/13-plan.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.stable.out sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 sql/benchmarks/tpch/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/16-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out.int128 sql/benchmarks/tpch/Tests/19-plan.stable.out sql/benchmarks/tpch/Tests/19-plan.stable.out.int128 sql/benchmarks/tpch/Tests/20-plan.stable.out sql/benchmarks/tpch/Tests/20-plan.stable.out.int128 sql/benchmarks/tpch/Tests/21-plan.stable.out sql/benchmarks/tpch/Tests/22-plan.stable.out sql/include/sql_mem.h sql/include/sql_relation.h sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/scripts/10_math.sql sql/scripts/12_url.sql sql/scripts/13_date.sql sql/scripts/14_inet.sql sql/scripts/15_querylog.sql sql/scripts/16_tracelog.sql sql/scripts/21_dependency_functions.sql sql/scripts/22_clients.sql sql/scripts/25_debug.sql sql/scripts/39_analytics.sql sql/scripts/40_json.sql sql/scripts/75_storagemodel.sql sql/scripts/80_statistics.sql sql/scripts/Makefile.ag sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_semantic.c sql/server/rel_semantic.h sql/server/rel_updates.c sql/server/sql_atom.c sql/server/sql_atom.h sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_logger.c sql/storage/bat/bat_table.c sql/storage/sql_catalog.c sql/storage/store.c sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32 sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.out sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.stable.out sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.stable.out.int128 sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.sql sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.stable.out sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.stable.out sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out sql/test/Dependencies/Tests/Dependencies.stable.err sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/DropCascade/Tests/drop_columns_cascade.stable.out sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out sql/test/Tests/All sql/test/Tests/keys.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Tests/trace.sql sql/test/Tests/trace.stable.out.int128 sql/test/Triggers/trigger_activation.sql sql/test/bugs/Tests/case_cast-bug-sf-1019506.stable.out sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.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/drop3.stable.out sql/test/leaks/Tests/drop3.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/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/mergetables/Tests/All sql/test/mergetables/Tests/alter.stable.err sql/test/mergetables/Tests/doubletable.stable.err sql/test/mergetables/Tests/mergedropcrash.stable.err sql/test/pg_regress/Tests/alter_table.sql sql/test/pg_regress/Tests/timestamptz.stable.out sql/test/pg_regress/Tests/without_oid.sql sql/test/testdb-upgrade-chain/Tests/package.py sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-package.py testing/Mtest.py.in testing/malcheck.py tools/mserver/Makefile.ag vertoo.data Branch: arrays Log Message:
merge with default diffs (truncated from 35962 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -591,3 +591,5 @@ d98df578687e677ae3abbc0ba41e3bb0631ef08a c80c3439c5d7b2bddb710e584eb0936adc21d462 MonetDB.R-0.9.6 0529873485e7ec8e4c723f8bf7fc14020a7390b2 Oct2014_11 f59ba5dedd0122403ab175cd1d44a88ab6b3be02 Oct2014_SP3_release +027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_13 +027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP3/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP4/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -160,7 +160,9 @@ more client packages. %package devel Summary: MonetDB development files Group: Applications/Databases -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release} +Requires: libatomic_ops-devel %description devel MonetDB is a database management system that is developed from a @@ -199,7 +201,7 @@ various other components. %package stream-devel Summary: MonetDB stream library Group: Applications/Databases -Requires: %{name}-stream = %{version}-%{release} +Requires: %{name}-stream%{?_isa} = %{version}-%{release} Requires: bzip2-devel Requires: libcurl-devel Requires: zlib-devel @@ -247,7 +249,7 @@ MonetDB, you will very likely need this %package client-tools Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} %description client-tools MonetDB is a database management system that is developed from a @@ -267,8 +269,8 @@ tools can be used to monitor the MonetDB %package client-devel Summary: MonetDB - Monet Database Management System Client Programs Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-stream-devel = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} +Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release} Requires: openssl-devel %description client-devel @@ -290,7 +292,7 @@ This package contains the files needed t %package client-odbc Summary: MonetDB ODBC driver Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} Requires(pre): unixODBC %description client-odbc @@ -347,7 +349,6 @@ program. %package client-perl Summary: MonetDB perl interface Group: Applications/Databases -Requires: %{name}-client = %{version}-%{release} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBI) Requires: perl(Digest::SHA) @@ -426,12 +427,12 @@ This package contains the activerecord a %package client-tests Summary: MonetDB Client tests package Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} -Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-client-odbc = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} +Requires: %{name}-client-odbc%{?_isa} = %{version}-%{release} Requires: %{name}-client-perl = %{version}-%{release} Requires: %{name}-client-php = %{version}-%{release} -Requires: %{name}-SQL-server5 = %{version}-%{release} +Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release} Requires: python-monetdb = %{version}-%{release} %description client-tests @@ -464,7 +465,7 @@ developer. %package geom-MonetDB5 Summary: MonetDB5 SQL GIS support module Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} Obsoletes: %{name}-geom Obsoletes: %{name}-geom-devel @@ -488,7 +489,7 @@ extensions for %{name}-SQL-server5. %package gsl-MonetDB5 Summary: MonetDB5 SQL interface to the gsl library Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %description gsl-MonetDB5 MonetDB is a database management system that is developed from a @@ -510,7 +511,7 @@ numerical analysis (gsl). %package bam-MonetDB5 Summary: MonetDB5 SQL interface to the bam library Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %description bam-MonetDB5 MonetDB is a database management system that is developed from a @@ -533,7 +534,7 @@ version of Sequence Alignment/Map) data. %package R Summary: Integration of MonetDB and R, allowing use of R from within SQL Group: Applications/Databases -Requires: MonetDB-SQL-server5 = %{version}-%{release} +Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release} %description R MonetDB is a database management system that is developed from a @@ -559,7 +560,7 @@ install it. %package cfitsio Summary: MonetDB: Add on module that provides support for FITS files Group: Applications/Databases -Requires: MonetDB-SQL-server5 = %{version}-%{release} +Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release} %description cfitsio MonetDB is a database management system that is developed from a @@ -582,7 +583,7 @@ format. Summary: MonetDB - Monet Database Management System Group: Applications/Databases Requires(pre): shadow-utils -Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-client%{?_isa} = %{version}-%{release} Obsoletes: MonetDB5-server-rdf %description -n MonetDB5-server @@ -667,7 +668,7 @@ fi %package -n MonetDB5-server-hugeint Summary: MonetDB - 128-bit integer support for MonetDB5-server Group: Application/Databases -Requires: MonetDB5-server +Requires: MonetDB5-server%{?_isa} %description -n MonetDB5-server-hugeint MonetDB is a database management system that is developed from a @@ -687,7 +688,8 @@ MonetDB5-server component. %package -n MonetDB5-server-devel Summary: MonetDB development files Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description -n MonetDB5-server-devel MonetDB is a database management system that is developed from a @@ -708,7 +710,7 @@ used from the MAL level. %package SQL-server5 Summary: MonetDB5 SQL server modules Group: Applications/Databases -Requires: MonetDB5-server = %{version}-%{release} +Requires: MonetDB5-server%{?_isa} = %{version}-%{release} %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 # RHEL >= 7, and all current Fedora Requires: %{_bindir}/systemd-tmpfiles @@ -774,8 +776,8 @@ systemd-tmpfiles --create %{_sysconfdir} %package SQL-server5-hugeint Summary: MonetDB5 128 bit integer (hugeint) support for SQL Group: Applications/Databases -Requires: MonetDB5-server-hugeint = %{version}-%{release} -Requires: MonetDB-SQL-server5 = %{version}-%{release} +Requires: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release} +Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release} %description SQL-server5-hugeint MonetDB is a database management system that is developed from a @@ -968,6 +970,18 @@ mv %{buildroot}%{_datadir}/doc/MonetDB-S %postun -p /sbin/ldconfig %changelog +* Tue May 19 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.13-20150519 +- Rebuilt. +- BZ#3712: Concurrency issue on querying the SQL catalog +- BZ#3713: Long startup cost for simple session +- BZ#3715: Crash with two ALTER TABLE statements in a transaction +- BZ#3718: Adding and dropping a non existing tablename to/from a merge + table is accepted without an error +- BZ#3719: Assertion failure in /MonetDB-11.19.11/gdk/gdk_bat.c:2841: + BATassertHeadProps: Assertion `!b->H->key || cmp != 0' failed. +- BZ#3723: Assertion failure in rel_bin.c:2548: rel2bin_groupby: Assertion + `0' failed. + * Thu Apr 23 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.11-20150423 - Rebuilt. - BZ#3466: UPDATE statements fails with "GDKerror: MT_mremap() failed" 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: 0.9.8 +Version: 0.9.9 Title: Connect MonetDB to R Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email = "han...@cwi.nl"), person("Thomas Lumley", role = "ctb"), diff --git a/clients/R/MonetDB.R/NEWS b/clients/R/MonetDB.R/NEWS --- a/clients/R/MonetDB.R/NEWS +++ b/clients/R/MonetDB.R/NEWS @@ -1,3 +1,6 @@ +0.9.9 +- dbWriteTable now quotes column names + 0.9.8 - Added support for esoteric data types such as MONTH_INTERVAL (Thanks, Roman) - Cleaned up SQL to R type mapping (we had this twice) 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 @@ -319,7 +319,7 @@ setMethod("dbWriteTable", "MonetDBConnec } if (!dbExistsTable(conn, qname)) { fts <- sapply(value, dbDataType, dbObj=conn) - fdef <- paste(make.db.names(conn, names(value)), fts, collapse=', ') + fdef <- paste('"', make.db.names(conn, names(value)), '"', fts, collapse=', ') ct <- paste("CREATE TABLE ", qname, " (", fdef, ")", sep= '') dbSendUpdate(conn, ct) } diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R --- a/clients/R/Tests/dbi.R +++ b/clients/R/Tests/dbi.R @@ -180,6 +180,12 @@ stopifnot(!dbIsValid(conn)) stopifnot(identical(dbDisconnect(con),TRUE)) stopifnot(identical(dbDisconnect(con),TRUE)) +# reserved words in data frame column names +stopifnot(dbIsValid(conn)) +dbBegin(conn) +dbWriteTable(conn, "evilt", data.frame(year=42,month=12, day=24), transaction=F) +stopifnot(dbExistsTable(conn, "evilt")) +dbRollback(conn) #test merovingian control code 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 @@ -98,10 +98,39 @@ print(nrow(head(anti_join(player_info, h })) # TODO: set ops + # sample functions print(nrow(sample_n(player_info, 24L))) print(nrow(head(sample_frac(player_info, .5), n=25L))) + +dbWriteTable(dps$con, "mtcars", mtcars) +my_tbl <- tbl(dps, "mtcars") + +# https://github.com/hadley/dplyr/issues/1165 +my_tbl %>% + group_by( cyl , gear ) %>% + summarise( n = n() ) + +# this works fin +my_tbl %>% + group_by( cyl , gear ) %>% + summarise( n = n() ) + +my_tbl %>% + group_by( cyl , gear ) %>% + tally %>% + group_by( cyl ) %>% + mutate( pct = ( 100 * n ) / sum( n ) ) + +my_tbl %>% + group_by( cyl , gear ) %>% + summarise( n = n() ) %>% + mutate( pct = 100 * n / sum( n ) ) + +dbRemoveTable(dps$con, "mtcars") + + # Arbitrary SQL ------------------------------------------------------------- # You can also provide sql as is, using the sql function: batting2008 <- tbl(dps, diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
