Changeset: 2403e572ee55 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2403e572ee55
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/mal/Tests/tst913.stable.out
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql_statement.c
sql/test/pg_regress/Tests/date.sql
sql/test/pg_regress/Tests/point.sql
sql/test/pg_regress/Tests/point.stable.out
sql/test/pg_regress/Tests/strings.sql
sql/test/pg_regress/Tests/strings.stable.err
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/postgresql2sql99.sh
vertoo.data
Branch: bamloader
Log Message:
Merge with default branch.
diffs (truncated from 2073 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -569,3 +569,6 @@ 13e1b24f442791f5ab790fa77453d3bd4e88a9c8
389f5f0d4c43ab689e31c28e01b43c8b7ba8de9c Jan2014_SP2_release
dc158ade928d0305f3f0e7ef9613dd81329f613d Jan2014_19
0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release
+6830d0b9c31fe23954c75014a581f145c7a551ff Jan2014_21
+0218c4ec31068bd1b9be7d2bb1ccad31e17e8d5f Jan2014_SP3_release
+6c7d5f562fcb044b745c871344c25b1c6bab7cf4 Jan2014_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -841,6 +841,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
rm -fr $RPM_BUILD_ROOT
%changelog
+* Fri Jul 25 2014 Sjoerd Mullender <[email protected]> - 11.17.21-20140725
+- Rebuilt.
+- BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean
+ values
+
* Tue Jul 22 2014 Sjoerd Mullender <[email protected]> - 11.17.19-20140722
- Rebuilt.
- BZ#3487: dead link to "Professional services"
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.17.21-20140725) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Fri, 25 Jul 2014 15:09:55 +0200
+
+monetdb (11.17.21-20140725) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#3519: Uppercase TRUE/FALSE strings cannot be converted to boolean
+ values
+
+ -- Sjoerd Mullender <[email protected]> Fri, 25 Jul 2014 15:09:53 +0200
+
monetdb (11.17.19-20140722) unstable; urgency=low
* Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,7 +36,7 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-GDK_VERSION=10:8:0
+GDK_VERSION=10:9:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=6:5:0
@@ -45,4 +45,4 @@ MAPI_VERSION=6:5:0
MONETDB5_VERSION=16:9:0
# version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=5:5:0
+STREAM_VERSION=5:6:0
diff --git a/monetdb5/mal/Tests/tst913.stable.out
b/monetdb5/mal/Tests/tst913.stable.out
--- a/monetdb5/mal/Tests/tst913.stable.out
+++ b/monetdb5/mal/Tests/tst913.stable.out
@@ -56,8 +56,8 @@ end main;
# int bit # type
#-----------------#
[ 0@0, true ]
-[ 1@0, nil ]
-[ 2@0, nil ]
+[ 1@0, true ]
+[ 2@0, false ]
[ 3@0, false ]
[ 4@0, nil ]
[ 5@0, nil ]
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -1756,12 +1756,13 @@ stack_push_children(sql_stack *stk, stmt
default:
if ((s->type == st_uselect2 || s->type == st_unique || s->type
== st_group) && s->op4.stval)
stack_push_stmt(stk, s->op4.stval, 1);
- if (s->op3)
- stack_push_stmt(stk, s->op3, 1);
- if (s->op3)
- stack_push_stmt(stk, s->op3, 1);
- if (s->op2)
+ if (s->op2) {
+ if (s->op3)
+ stack_push_stmt(stk, s->op3, 1);
+ if (s->op3)
+ stack_push_stmt(stk, s->op3, 1);
stack_push_stmt(stk, s->op2, 1);
+ }
if (s->op1)
stack_push_stmt(stk, s->op1, 1);
}
diff --git a/sql/test/pg_regress/Tests/date.sql
b/sql/test/pg_regress/Tests/date.sql
--- a/sql/test/pg_regress/Tests/date.sql
+++ b/sql/test/pg_regress/Tests/date.sql
@@ -197,17 +197,27 @@ SELECT f1 - date '2000-01-01' AS "Days F
SELECT f1 - date 'epoch' AS "Days From Epoch" FROM DATE_TBL;
-SELECT date 'yesterday' - date 'today' AS "One day";
+SELECT current_date AS "today";
+SELECT sql_sub(current_date, 24*60*60.0) AS "yesterday";
+SELECT sql_add(current_date, 24*60*60.0) AS "tomorrow";
-SELECT date 'today' - date 'tomorrow' AS "One day";
+-- SELECT date 'yesterday' - date 'today' AS "One day";
+SELECT sql_sub(current_date, 24*60*60.0) - current_date AS "One day";
-SELECT date 'yesterday' - date 'tomorrow' AS "Two days";
+-- SELECT date 'today' - date 'tomorrow' AS "One day";
+SELECT current_date - sql_add(current_date, 24*60*60.0) AS "One day";
-SELECT date 'tomorrow' - date 'today' AS "One day";
+-- SELECT date 'yesterday' - date 'tomorrow' AS "Two days";
+SELECT sql_sub(current_date, 24*60*60.0) - sql_add(current_date, 24*60*60.0)
AS "Two days";
-SELECT date 'today' - date 'yesterday' AS "One day";
+-- SELECT date 'tomorrow' - date 'today' AS "One day";
+SELECT sql_add(current_date, 24*60*60.0) - current_date AS "One day";
-SELECT date 'tomorrow' - date 'yesterday' AS "Two days";
+-- SELECT date 'today' - date 'yesterday' AS "One day";
+SELECT current_date - sql_sub(current_date, 24*60*60.0) AS "One day";
+
+-- SELECT date 'tomorrow' - date 'yesterday' AS "Two days";
+SELECT sql_add(current_date, 24*60*60.0) - sql_sub(current_date, 24*60*60.0)
AS "Two days";
--
-- test extract!
@@ -269,3 +279,5 @@ SELECT DATE_TRUNC('CENTURY', DATE '0055-
SELECT DATE_TRUNC('DECADE', DATE '1993-12-25'); -- 1990-01-01
SELECT DATE_TRUNC('DECADE', DATE '0004-12-25'); -- 0001-01-01 BC
SELECT DATE_TRUNC('DECADE', DATE '0002-12-31 BC'); -- 0011-01-01 BC
+
+DROP TABLE DATE_TBL;
diff --git a/sql/test/pg_regress/Tests/point.sql
b/sql/test/pg_regress/Tests/point.sql
--- a/sql/test/pg_regress/Tests/point.sql
+++ b/sql/test/pg_regress/Tests/point.sql
@@ -24,7 +24,7 @@ INSERT INTO POINT_TBL(f1) VALUES ('(10.0
INSERT INTO POINT_TBL(f1) VALUES ('(10.0,10.0');
-SELECT '' AS six, POINT_TBL.*;
+SELECT '' AS six, POINT_TBL.* FROM POINT_TBL;
-- left of
SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)';
@@ -55,7 +55,7 @@ SELECT '' AS six, p.f1, p.f1 <-> string
FROM POINT_TBL p
ORDER BY dist;
-SET geqo TO 'off';
+/* SET geqo TO 'off'; */
SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS
dist
FROM POINT_TBL p1, POINT_TBL p2
@@ -77,5 +77,4 @@ SELECT '' AS three, p1.f1 AS point1, p2.
WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1
ORDER BY distance;
-RESET geqo;
-
+/* RESET geqo; */
diff --git a/sql/test/pg_regress/Tests/point.stable.out
b/sql/test/pg_regress/Tests/point.stable.out
--- a/sql/test/pg_regress/Tests/point.stable.out
+++ b/sql/test/pg_regress/Tests/point.stable.out
@@ -46,7 +46,7 @@ Ready.
[ 1 ]
#
#
-#SELECT '' AS six, POINT_TBL.*;
+#SELECT '' AS six, POINT_TBL.* FROM POINT_TBL;
% sys.L0, sys.L0 # table_name
% six, f1 # name
% ?, ? # type
@@ -146,7 +146,6 @@ Ready.
[ "", "(10,10)", 14.14213562 ]
[ "", "(5.1,34.5)", 34.87491935 ]
-SET geqo TO 'off';
#SELECT '' AS thirtysix, p1.f1 AS point1, p2.f1 AS point2, p1.f1 <-> p2.f1 AS
dist
# FROM POINT_TBL p1, POINT_TBL p2
# ORDER BY dist, point1 using <<, point2 using <<;
@@ -267,8 +266,6 @@ SET geqo TO 'off';
[ "", "(-10,0)", "(-5,-12)", 13 ]
[ "", "(5.1,34.5)", "(10,10)", 24.98519562 ]
-RESET geqo;
-
= ! Correct / expected output still needs to be provided / verified / approved
! =
# 17:11:19 >
diff --git a/sql/test/pg_regress/Tests/strings.sql
b/sql/test/pg_regress/Tests/strings.sql
--- a/sql/test/pg_regress/Tests/strings.sql
+++ b/sql/test/pg_regress/Tests/strings.sql
@@ -21,11 +21,31 @@ SELECT 'first line'
-- E021-10 implicit casting among the character data types
--
+CREATE TABLE CHAR_TBL(f1 char);
+INSERT INTO CHAR_TBL (f1) VALUES ('a');
+INSERT INTO CHAR_TBL (f1) VALUES ('A');
+INSERT INTO CHAR_TBL (f1) VALUES ('1');
+INSERT INTO CHAR_TBL (f1) VALUES (2);
+INSERT INTO CHAR_TBL (f1) VALUES ('3');
+INSERT INTO CHAR_TBL (f1) VALUES ('');
+
SELECT CAST(f1 AS text) AS "text(char)" FROM CHAR_TBL;
+CREATE TABLE VARCHAR_TBL(f1 varchar(1));
+INSERT INTO VARCHAR_TBL (f1) VALUES ('a');
+INSERT INTO VARCHAR_TBL (f1) VALUES ('A');
+INSERT INTO VARCHAR_TBL (f1) VALUES ('1');
+INSERT INTO VARCHAR_TBL (f1) VALUES (2);
+INSERT INTO VARCHAR_TBL (f1) VALUES ('3');
+INSERT INTO VARCHAR_TBL (f1) VALUES ('');
+
SELECT CAST(f1 AS text) AS "text(varchar)" FROM VARCHAR_TBL;
-SELECT CAST(name 'namefield' AS text) AS "text(name)";
+SELECT CAST('namefield' AS text) AS "text(name)";
+
+CREATE TABLE TEXT_TBL (f1 text);
+INSERT INTO TEXT_TBL VALUES ('doh!');
+INSERT INTO TEXT_TBL VALUES ('hi de ho neighbor');
-- since this is an explicit cast, it should truncate w/o error:
SELECT CAST(f1 AS char(10)) AS "char(text)" FROM TEXT_TBL;
@@ -35,13 +55,17 @@ SELECT CAST(f1 AS char(20)) AS "char(tex
SELECT CAST(f1 AS char(10)) AS "char(varchar)" FROM VARCHAR_TBL;
-SELECT CAST(name 'namefield' AS char(10)) AS "char(name)";
+SELECT CAST('namefield' AS char(10)) AS "char(name)";
-SELECT CAST(f1 AS varchar) AS "varchar(text)" FROM TEXT_TBL;
+SELECT CAST(f1 AS varchar(1)) AS "varchar(text)" FROM TEXT_TBL;
-SELECT CAST(f1 AS varchar) AS "varchar(char)" FROM CHAR_TBL;
+SELECT CAST(f1 AS varchar(1)) AS "varchar(char)" FROM CHAR_TBL;
-SELECT CAST(name 'namefield' AS varchar) AS "varchar(name)";
+SELECT CAST('namefield' AS string) AS "varchar(name)";
+
+DROP TABLE CHAR_TBL;
+DROP TABLE VARCHAR_TBL;
+DROP TABLE TEXT_TBL;
--
-- test SQL92 string functions
@@ -49,13 +73,17 @@ SELECT CAST(name 'namefield' AS varchar)
--
-- E021-09 trim function
-SELECT TRIM(BOTH FROM ' bunch o blanks ') = 'bunch o blanks' AS "bunch o
blanks";
+--SELECT TRIM(BOTH FROM ' bunch o blanks ') = 'bunch o blanks' AS "bunch o
blanks";
+SELECT TRIM(' bunch o blanks ') = 'bunch o blanks' AS "bunch o blanks";
-SELECT TRIM(LEADING FROM ' bunch o blanks ') = 'bunch o blanks ' AS "bunch
o blanks ";
+--SELECT TRIM(LEADING FROM ' bunch o blanks ') = 'bunch o blanks ' AS
"bunch o blanks ";
+SELECT LTRIM(' bunch o blanks ') = 'bunch o blanks ' AS "bunch o blanks ";
-SELECT TRIM(TRAILING FROM ' bunch o blanks ') = ' bunch o blanks' AS "
bunch o blanks";
+--SELECT TRIM(TRAILING FROM ' bunch o blanks ') = ' bunch o blanks' AS "
bunch o blanks";
+SELECT RTRIM(' bunch o blanks ') = ' bunch o blanks' AS " bunch o blanks";
-SELECT TRIM(BOTH 'x' FROM 'xxxxxsome Xsxxxxx') = 'some Xs' AS "some Xs";
+--SELECT TRIM(BOTH 'x' FROM 'xxxxxsome Xsxxxxx') = 'some Xs' AS "some Xs";
+SELECT TRIM(replace('xxxxxsome Xsxxxxx', 'x', ' ')) = 'some Xs' AS "some Xs";
-- E021-06 substring expression
SELECT SUBSTRING('1234567890' FROM 3) = '34567890' AS "34567890";
@@ -197,13 +225,13 @@ SELECT 'Hawkeye' NOT ILIKE 'h%' AS "fals
-- E021-07 character concatenation
SELECT 'unknown' || ' and unknown' AS "Concat unknown types";
-SELECT text 'text' || ' and unknown' AS "Concat text to unknown type";
+SELECT cast('text' as text) || ' and unknown' AS "Concat text to unknown type";
-SELECT char(20) 'characters' || ' and text' AS "Concat char to unknown type";
+SELECT cast('characters' as char(20)) || ' and text' AS "Concat char to
unknown type";
-SELECT text 'text' || char(20) ' and characters' AS "Concat text to char";
+SELECT cast('text' as text) || cast(' and characters' as char(20)) AS "Concat
text to char";
-SELECT text 'text' || varchar ' and varchar' AS "Concat text to varchar";
+SELECT cast('text' as text) || cast(' and varchar' as varchar(20)) AS "Concat
text to varchar";
--
-- test substr with toasted text values
@@ -217,57 +245,59 @@ insert into toasttest values(repeat('123
-- Ensure that some values are uncompressed, to test the faster substring
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
