Changeset: 210bd31dc718 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=210bd31dc718
Added Files:
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.csv
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql.in
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.err
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.out
Removed Files:
sql/Changelog.Feb2013
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/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
gdk/libbat.rc
libversions
monetdb5/tools/libmonetdb5.rc
sql/ChangeLog-Archive
sql/ChangeLog.Feb2013
sql/test/BugTracker-2013/Tests/All
vertoo.data
Branch: default
Log Message:
merging
diffs (truncated from 593 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -520,3 +520,6 @@ fc0c9b319d2275215c283a7ece1d389e55b43217
0ee398b5025f7bc3c0320d70eb5c0a3707b69c67 mutation_root
7daa66a6db1c0404dbf7ed935437b59b7bf54d4b Feb2013_5
df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release
+cb55e859a50e0d06a50cc9e4f6e377ddea7cc3aa Feb2013_7
+df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release
+e0139450d66e4fc02c7f5d1d9e6f92fc22d862df Feb2013_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -722,6 +722,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Apr 26 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.7-20130426
+- Rebuilt.
+
+* Sat Apr 13 2013 Niels Nes <ni...@cwi.nl> - 11.15.7-20130426
+- sql: Added TEMPORARY to the non-reserved keywords, ie no need for double
+ quotes when used as identifier.
+
* Fri Apr 12 2013 Sjoerd Mullender <sjo...@acm.org> - 11.15.5-20130412
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.15.7-20130426) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 26 Apr 2013 13:09:55 +0200
+
+monetdb (11.15.7-20130426) unstable; urgency=low
+
+ * sql: Added TEMPORARY to the non-reserved keywords, ie no need for double
+ quotes when used as identifier.
+
+ -- Niels Nes <ni...@cwi.nl> Sat, 13 Apr 2013 13:09:54 +0200
+
monetdb (11.15.5-20130412) unstable; urgency=low
* Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-GDK_VERSION=9:2:0
+GDK_VERSION=9:3:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=6:5:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=14:2:0
+MONETDB5_VERSION=14:3:0
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=4:5:1
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Sat Apr 13 2013 Niels Nes <ni...@cwi.nl> - 11.15.7-20130426
+- Added TEMPORARY to the non-reserved keywords, ie no need for double
+ quotes when used as identifier.
+
* Wed Nov 21 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.7-20121212
- Fixed crash when performing an INSERT on a table with string-like column
defaulting to NULL and omitting that column from VALUES, bug #3168
diff --git a/sql/Changelog.Feb2013 b/sql/Changelog.Feb2013
deleted file mode 100644
--- a/sql/Changelog.Feb2013
+++ /dev/null
@@ -1,7 +0,0 @@
-# ChangeLog file for sql
-# This file is updated with Maddlog
-
-* Sat Apr 13 2013 Niels Nes <ni...@cwi.nl>
-- Added TEMPORARY to the non-reserved keywords, ie no need for double
- quotes when used as identifier.
-
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -10,3 +10,4 @@ oid_handling
between.Bug-3259
correlated_select.Bug-3250
groupby_on_value_view.Bug-3264
+aggregates-typing-issues.Bug-3277
diff --git
a/sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.csv
b/sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.csv
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.csv
@@ -0,0 +1,33 @@
+"","mpg","cyl","disp","hp","drat","wt","qsec","vs","am","gear","carb"
+"Mazda RX4",21,6,160,110,3.9,2.62,16.46,0,1,4,4
+"Mazda RX4 Wag",21,6,160,110,3.9,2.875,17.02,0,1,4,4
+"Datsun 710",22.8,4,108,93,3.85,2.32,18.61,1,1,4,1
+"Hornet 4 Drive",21.4,6,258,110,3.08,3.215,19.44,1,0,3,1
+"Hornet Sportabout",18.7,8,360,175,3.15,3.44,17.02,0,0,3,2
+"Valiant",18.1,6,225,105,2.76,3.46,20.22,1,0,3,1
+"Duster 360",14.3,8,360,245,3.21,3.57,15.84,0,0,3,4
+"Merc 240D",24.4,4,146.7,62,3.69,3.19,20,1,0,4,2
+"Merc 230",22.8,4,140.8,95,3.92,3.15,22.9,1,0,4,2
+"Merc 280",19.2,6,167.6,123,3.92,3.44,18.3,1,0,4,4
+"Merc 280C",17.8,6,167.6,123,3.92,3.44,18.9,1,0,4,4
+"Merc 450SE",16.4,8,275.8,180,3.07,4.07,17.4,0,0,3,3
+"Merc 450SL",17.3,8,275.8,180,3.07,3.73,17.6,0,0,3,3
+"Merc 450SLC",15.2,8,275.8,180,3.07,3.78,18,0,0,3,3
+"Cadillac Fleetwood",10.4,8,472,205,2.93,5.25,17.98,0,0,3,4
+"Lincoln Continental",10.4,8,460,215,3,5.424,17.82,0,0,3,4
+"Chrysler Imperial",14.7,8,440,230,3.23,5.345,17.42,0,0,3,4
+"Fiat 128",32.4,4,78.7,66,4.08,2.2,19.47,1,1,4,1
+"Honda Civic",30.4,4,75.7,52,4.93,1.615,18.52,1,1,4,2
+"Toyota Corolla",33.9,4,71.1,65,4.22,1.835,19.9,1,1,4,1
+"Toyota Corona",21.5,4,120.1,97,3.7,2.465,20.01,1,0,3,1
+"Dodge Challenger",15.5,8,318,150,2.76,3.52,16.87,0,0,3,2
+"AMC Javelin",15.2,8,304,150,3.15,3.435,17.3,0,0,3,2
+"Camaro Z28",13.3,8,350,245,3.73,3.84,15.41,0,0,3,4
+"Pontiac Firebird",19.2,8,400,175,3.08,3.845,17.05,0,0,3,2
+"Fiat X1-9",27.3,4,79,66,4.08,1.935,18.9,1,1,4,1
+"Porsche 914-2",26,4,120.3,91,4.43,2.14,16.7,0,1,5,2
+"Lotus Europa",30.4,4,95.1,113,3.77,1.513,16.9,1,1,5,2
+"Ford Pantera L",15.8,8,351,264,4.22,3.17,14.5,0,1,5,4
+"Ferrari Dino",19.7,6,145,175,3.62,2.77,15.5,0,1,5,6
+"Maserati Bora",15,8,301,335,3.54,3.57,14.6,0,1,5,8
+"Volvo 142E",21.4,4,121,109,4.11,2.78,18.6,1,1,4,2
diff --git
a/sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql.in
b/sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql.in
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql.in
@@ -0,0 +1,102 @@
+CREATE TABLE mtcars ( rownames VARCHAR(255) , mpg DOUBLE PRECISION , cyl
DOUBLE PRECISION , disp DOUBLE PRECISION , hp DOUBLE PRECISION , drat DOUBLE
PRECISION , wt DOUBLE PRECISION , qsec DOUBLE PRECISION , vs DOUBLE PRECISION ,
am DOUBLE PRECISION , gear DOUBLE PRECISION , carb DOUBLE PRECISION ) ;
+
+COPY 33 offset 2 records into mtcars from
'$TSTSRCDIR/aggregates-typing-issues.Bug-3277.csv' USING DELIMITERS
',','\n','\"' NULL as '' ;
+select * from mtcars;
+
+
+-- plain count()
+create table mtcars2 as select carb , count( distinct case when gear in ( 3 ,
4 ) then mpg end ) as prob1 from mtcars group by carb with data ;
+select * from mtcars2;
+
+--THESE WORK;
+select median( prob1 ) from mtcars2;
+select prod( prob1 ) from mtcars2;
+
+--THESE BREAK;
+select stddev_pop( prob1 ) from mtcars2;
+select stddev_samp( prob1 ) from mtcars2;
+select sign( prob1 ) from mtcars2;
+
+-- stddev() has been replaced by stddev_pop() & stddev_samp()
+select stddev( prob1 ) from mtcars2;
+
+drop table mtcars2;
+
+
+-- cast(count() as tinyint)
+create table mtcars2 as select carb , cast(count( distinct case when gear in (
3 , 4 ) then mpg end ) as tinyint) as prob1 from mtcars group by carb with data
;
+select * from mtcars2;
+
+--THESE WORK;
+select median( prob1 ) from mtcars2;
+select prod( prob1 ) from mtcars2;
+select stddev_pop( prob1 ) from mtcars2;
+
+--THESE BREAK;
+select stddev_samp( prob1 ) from mtcars2;
+select sign( prob1 ) from mtcars2;
+
+-- stddev() has been replaced by stddev_pop() & stddev_samp()
+select stddev( prob1 ) from mtcars2;
+
+drop table mtcars2;
+
+
+-- cast(count() as smallint)
+create table mtcars2 as select carb , cast(count( distinct case when gear in (
3 , 4 ) then mpg end ) as smallint) as prob1 from mtcars group by carb with
data ;
+select * from mtcars2;
+
+--THESE WORK;
+select median( prob1 ) from mtcars2;
+select prod( prob1 ) from mtcars2;
+select stddev_pop( prob1 ) from mtcars2;
+
+--THESE BREAK;
+select stddev_samp( prob1 ) from mtcars2;
+select sign( prob1 ) from mtcars2;
+
+-- stddev() has been replaced by stddev_pop() & stddev_samp()
+select stddev( prob1 ) from mtcars2;
+
+drop table mtcars2;
+
+
+-- cast(count() as integer)
+create table mtcars2 as select carb , cast(count( distinct case when gear in (
3 , 4 ) then mpg end ) as integer) as prob1 from mtcars group by carb with data
;
+select * from mtcars2;
+
+--THESE WORK;
+select median( prob1 ) from mtcars2;
+select prod( prob1 ) from mtcars2;
+select stddev_pop( prob1 ) from mtcars2;
+
+--THESE BREAK;
+select stddev_samp( prob1 ) from mtcars2;
+select sign( prob1 ) from mtcars2;
+
+-- stddev() has been replaced by stddev_pop() & stddev_samp()
+select stddev( prob1 ) from mtcars2;
+
+drop table mtcars2;
+
+
+-- cast(count() as bigint)
+create table mtcars2 as select carb , cast(count( distinct case when gear in (
3 , 4 ) then mpg end ) as bigint) as prob1 from mtcars group by carb with data ;
+select * from mtcars2;
+
+--THESE WORK;
+select median( prob1 ) from mtcars2;
+select prod( prob1 ) from mtcars2;
+select stddev_pop( prob1 ) from mtcars2;
+
+--THESE BREAK;
+select stddev_samp( prob1 ) from mtcars2;
+select sign( prob1 ) from mtcars2;
+
+-- stddev() has been replaced by stddev_pop() & stddev_samp()
+select stddev( prob1 ) from mtcars2;
+
+drop table mtcars2;
+
+
+drop table mtcars;
diff --git
a/sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.err
b/sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.stable.err
@@ -0,0 +1,50 @@
+stderr of test 'aggregates-typing-issues.Bug-3277` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 10:46:44 >
+# 10:46:44 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38855" "--set"
"mapi_usock=/var/tmp/mtest-24209/.s.monetdb.38855" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 10:46:44 >
+
+# builtin opt gdk_dbpath =
/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 38855
+# cmdline opt mapi_usock = /var/tmp/mtest-24209/.s.monetdb.38855
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 10:46:44 >
+# 10:46:44 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-24209" "--port=38855"
+# 10:46:44 >
+
+MAPI = (monetdb) /var/tmp/mtest-29812/.s.monetdb.32950
+QUERY = select stddev( prob1 ) from mtcars2;
+ERROR = !SELECT: no such unary operator 'stddev(wrd)'
+MAPI = (monetdb) /var/tmp/mtest-29812/.s.monetdb.32950
+QUERY = select stddev( prob1 ) from mtcars2;
+ERROR = !SELECT: no such unary operator 'stddev(tinyint)'
+MAPI = (monetdb) /var/tmp/mtest-29812/.s.monetdb.32950
+QUERY = select stddev( prob1 ) from mtcars2;
+ERROR = !SELECT: no such unary operator 'stddev(smallint)'
+MAPI = (monetdb) /var/tmp/mtest-29812/.s.monetdb.32950
+QUERY = select stddev( prob1 ) from mtcars2;
+ERROR = !SELECT: no such unary operator 'stddev(int)'
+MAPI = (monetdb) /var/tmp/mtest-29812/.s.monetdb.32950
+QUERY = select stddev( prob1 ) from mtcars2;
+ERROR = !SELECT: no such unary operator 'stddev(bigint)'
+
+# 10:46:44 >
+# 10:46:44 > "Done."
+# 10:46:44 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
