Changeset: e656cc7e6507 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e656cc7e6507 Added Files: sql/test/snodgrass/Tests/cast_table.sql sql/test/snodgrass/Tests/cast_table.stable.err sql/test/snodgrass/Tests/cast_table.stable.out sql/test/snodgrass/Tests/date_parsing.sql sql/test/snodgrass/Tests/date_parsing.stable.err sql/test/snodgrass/Tests/date_parsing.stable.out sql/test/snodgrass/Tests/date_select.sql sql/test/snodgrass/Tests/date_select.stable.err sql/test/snodgrass/Tests/date_select.stable.out sql/test/snodgrass/Tests/date_table.sql sql/test/snodgrass/Tests/date_table.stable.err sql/test/snodgrass/Tests/date_table.stable.out sql/test/snodgrass/Tests/extract_select.sql sql/test/snodgrass/Tests/extract_select.stable.err sql/test/snodgrass/Tests/extract_select.stable.out sql/test/snodgrass/Tests/extract_table.sql sql/test/snodgrass/Tests/extract_table.stable.err sql/test/snodgrass/Tests/extract_table.stable.out sql/test/snodgrass/Tests/interval_parsing.sql sql/test/snodgrass/Tests/interval_parsing.stable.err sql/test/snodgrass/Tests/interval_parsing.stable.out sql/test/snodgrass/Tests/interval_select.sql sql/test/snodgrass/Tests/interval_select.stable.err sql/test/snodgrass/Tests/interval_select.stable.out sql/test/snodgrass/Tests/interval_table.sql Removed Files: sql/test/snodgrass/cast_table.sql sql/test/snodgrass/date_parsing.sql sql/test/snodgrass/date_select.sql sql/test/snodgrass/date_table.sql sql/test/snodgrass/extract_select.sql sql/test/snodgrass/extract_table.sql sql/test/snodgrass/interval_parsing.sql sql/test/snodgrass/interval_select.sql sql/test/snodgrass/interval_table.sql Modified Files: sql/test/snodgrass/Tests/All Branch: default Log Message:
Merge with Apr2012 branch. diffs (truncated from 1241 to 300 lines): diff --git a/sql/test/snodgrass/Tests/All b/sql/test/snodgrass/Tests/All --- a/sql/test/snodgrass/Tests/All +++ b/sql/test/snodgrass/Tests/All @@ -1,1 +1,11 @@ cast_select +cast_table +date_parsing +date_select +date_table +extract_select +extract_table +interval_parsing +interval_select +# this one needs proper OVERLAPS +#interval_table diff --git a/sql/test/snodgrass/cast_table.sql b/sql/test/snodgrass/Tests/cast_table.sql rename from sql/test/snodgrass/cast_table.sql rename to sql/test/snodgrass/Tests/cast_table.sql --- a/sql/test/snodgrass/cast_table.sql +++ b/sql/test/snodgrass/Tests/cast_table.sql @@ -3,8 +3,8 @@ CREATE TABLE Employee( Id INTEGER, Birth INSERT INTO Employee VALUES( 77, '1970-01-01'); INSERT INTO Employee VALUES( 88, '1971-12-13'); -SELECT * FROM Employee WHERE CAST( BirthDate AS CHAR ) = '1970-01-01'; -SELECT * FROM Employee WHERE CAST( BirthDate AS CHAR ) LIKE '1970-01-01'; +SELECT * FROM Employee WHERE CAST( BirthDate AS CHAR(10) ) = '1970-01-01'; +SELECT * FROM Employee WHERE CAST( BirthDate AS CHAR(10) ) LIKE '1970-01-01'; SELECT * FROM Employee WHERE CAST( ( DATE '1971-01-01' - BirthDate ) DAY AS INT ) = 365 AND CAST( ( DATE '1971-01-01' - BirthDate ) YEAR AS INT ) = 1; -- fixme DROP TABLE Employee; diff --git a/sql/test/snodgrass/Tests/cast_table.stable.err b/sql/test/snodgrass/Tests/cast_table.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/snodgrass/Tests/cast_table.stable.err @@ -0,0 +1,40 @@ +stderr of test 'cast_table` in directory 'test/snodgrass` itself: + + +# 21:08:54 > +# 21:08:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Apr2012-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=32398" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_snodgrass" "--set" "mal_listing=0" +# 21:08:54 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/fabian/scratch/ssd/monetdb/Apr2012/program-x86_64/var/lib/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# 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 gdk_dbfarm = /net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Apr2012-sofia.ins.cwi.nl/sql/dbfarm +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 32398 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_snodgrass +# cmdline opt mal_listing = 0 + +# 21:08:54 > +# 21:08:54 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia" "--port=32398" +# 21:08:54 > + +MAPI = monetdb@sofia:32398 +QUERY = SELECT * FROM Employee WHERE CAST( ( DATE '1971-01-01' - BirthDate ) DAY AS INT ) = 365 AND CAST( ( DATE '1971-01-01' - BirthDate ) YEAR AS INT ) = 1; -- fixme +ERROR = !syntax error, unexpected DAY, expecting AS in: "select * from employee where cast( ( date '1971-01-01' - birthdate ) day" + +# 21:08:54 > +# 21:08:54 > "Done." +# 21:08:54 > + diff --git a/sql/test/snodgrass/Tests/cast_table.stable.out b/sql/test/snodgrass/Tests/cast_table.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/snodgrass/Tests/cast_table.stable.out @@ -0,0 +1,70 @@ +stdout of test 'cast_table` in directory 'test/snodgrass` itself: + + +# 21:08:54 > +# 21:08:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Apr2012-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=32398" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_snodgrass" "--set" "mal_listing=0" +# 21:08:54 > + +# MonetDB 5 server v11.9.0 "Apr2012-0474aa42f907+" +# Serving database 'mTests_test_snodgrass', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.630 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:32398/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_history.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 39_analytics.sql +# loading sql script: 40_geom.sql +# loading sql script: 50_datacell.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql + +# 21:08:54 > +# 21:08:54 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia" "--port=32398" +# 21:08:54 > + +#CREATE TABLE Employee( Id INTEGER, BirthDate DATE ); +#INSERT INTO Employee VALUES( 77, '1970-01-01'); +[ 1 ] +#INSERT INTO Employee VALUES( 88, '1971-12-13'); +[ 1 ] +#SELECT * FROM Employee WHERE CAST( BirthDate AS CHAR(10) ) = '1970-01-01'; +% sys.employee, sys.employee # table_name +% id, birthdate # name +% int, date # type +% 2, 10 # length +[ 77, 1970-01-01 ] +#SELECT * FROM Employee WHERE CAST( BirthDate AS CHAR(10) ) LIKE '1970-01-01'; +% sys.employee, sys.employee # table_name +% id, birthdate # name +% int, date # type +% 2, 10 # length +[ 77, 1970-01-01 ] +#DROP TABLE Employee; + +# 21:08:54 > +# 21:08:54 > "Done." +# 21:08:54 > + diff --git a/sql/test/snodgrass/date_parsing.sql b/sql/test/snodgrass/Tests/date_parsing.sql rename from sql/test/snodgrass/date_parsing.sql rename to sql/test/snodgrass/Tests/date_parsing.sql diff --git a/sql/test/snodgrass/Tests/date_parsing.stable.err b/sql/test/snodgrass/Tests/date_parsing.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/snodgrass/Tests/date_parsing.stable.err @@ -0,0 +1,37 @@ +stderr of test 'date_parsing` in directory 'test/snodgrass` itself: + + +# 21:11:50 > +# 21:11:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Apr2012-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=34545" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_snodgrass" "--set" "mal_listing=0" +# 21:11:50 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/fabian/scratch/ssd/monetdb/Apr2012/program-x86_64/var/lib/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# 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 gdk_dbfarm = /net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Apr2012-sofia.ins.cwi.nl/sql/dbfarm +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 34545 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_snodgrass +# cmdline opt mal_listing = 0 + +# 21:11:50 > +# 21:11:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia" "--port=34545" +# 21:11:50 > + + +# 21:11:50 > +# 21:11:50 > "Done." +# 21:11:50 > + diff --git a/sql/test/snodgrass/Tests/date_parsing.stable.out b/sql/test/snodgrass/Tests/date_parsing.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/snodgrass/Tests/date_parsing.stable.out @@ -0,0 +1,94 @@ +stdout of test 'date_parsing` in directory 'test/snodgrass` itself: + + +# 21:11:50 > +# 21:11:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Apr2012-sofia.ins.cwi.nl/sql/dbfarm" "--set" "mapi_open=true" "--set" "mapi_port=34545" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_snodgrass" "--set" "mal_listing=0" +# 21:11:50 > + +# MonetDB 5 server v11.9.0 "Apr2012-0474aa42f907+" +# Serving database 'mTests_test_snodgrass', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.630 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:34545/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_history.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 39_analytics.sql +# loading sql script: 40_geom.sql +# loading sql script: 50_datacell.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql + +# 21:11:50 > +# 21:11:50 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=sofia" "--port=34545" +# 21:11:50 > + +#SELECT DATE '1997-01-12'; +% . # table_name +% single_value # name +% date # type +% 10 # length +[ 1997-01-12 ] +#SELECT TIME '11:35:29'; +% . # table_name +% single_value # name +% time # type +% 8 # length +[ 11:35:29 ] +#SELECT TIME '00:00:00'; +% . # table_name +% single_value # name +% time # type +% 8 # length +[ 00:00:00 ] +#SELECT TIME '11:08:27-07:00'; +% . # table_name +% single_value # name +% time # type +% 8 # length +[ 18:08:27 ] +#SELECT TIME '11:08:27.123456-07:00'; +% . # table_name +% single_value # name +% time # type +% 8 # length +[ 18:08:27 ] +#SELECT TIMESTAMP '1997-01-15 11:35:29.123456'; +% . # table_name +% single_value # name +% timestamp # type +% 26 # length +[ 1997-01-15 11:35:29.123000 ] +#SELECT TIMESTAMP '1997-01-15 11:35:29.123456-07:00'; +% . # table_name +% single_value # name +% timestamp # type +% 26 # length +[ 1997-01-15 18:35:29.123000 ] + +# 21:11:50 > +# 21:11:50 > "Done." +# 21:11:50 > + diff --git a/sql/test/snodgrass/date_select.sql b/sql/test/snodgrass/Tests/date_select.sql rename from sql/test/snodgrass/date_select.sql rename to sql/test/snodgrass/Tests/date_select.sql --- a/sql/test/snodgrass/date_select.sql +++ b/sql/test/snodgrass/Tests/date_select.sql _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
