Changeset: 168495df2f43 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=168495df2f43 Modified Files: sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/aggregates.stable.err sql/test/pg_regress/Tests/aggregates.stable.out sql/test/pg_regress/Tests/alter_table.sql sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/alter_table.stable.out sql/test/pg_regress/Tests/arrays.sql sql/test/pg_regress/Tests/arrays.stable.err sql/test/pg_regress/Tests/arrays.stable.out sql/test/pg_regress/Tests/bit.stable.err sql/test/pg_regress/Tests/bit.stable.out sql/test/pg_regress/Tests/boolean.sql sql/test/pg_regress/Tests/boolean.stable.err sql/test/pg_regress/Tests/boolean.stable.out sql/test/pg_regress/Tests/box.stable.err sql/test/pg_regress/Tests/box.stable.out sql/test/pg_regress/Tests/btree_index.stable.err sql/test/pg_regress/Tests/btree_index.stable.out sql/test/pg_regress/Tests/case.stable.err sql/test/pg_regress/Tests/case.stable.out sql/test/pg_regress/Tests/circle.stable.err sql/test/pg_regress/Tests/circle.stable.out sql/test/pg_regress/Tests/cluster.sql sql/test/pg_regress/Tests/cluster.stable.err sql/test/pg_regress/Tests/cluster.stable.out sql/test/pg_regress/Tests/comments.stable.err sql/test/pg_regress/Tests/comments.stable.out sql/test/pg_regress/Tests/conversion.stable.err sql/test/pg_regress/Tests/conversion.stable.out sql/test/pg_regress/Tests/copy2.stable.err sql/test/pg_regress/Tests/copy2.stable.out sql/test/pg_regress/Tests/create_aggregate.stable.err sql/test/pg_regress/Tests/create_aggregate.stable.out sql/test/pg_regress/Tests/create_index.stable.err sql/test/pg_regress/Tests/create_index.stable.out sql/test/pg_regress/Tests/create_misc.stable.err sql/test/pg_regress/Tests/create_misc.stable.out sql/test/pg_regress/Tests/create_operator.stable.err sql/test/pg_regress/Tests/create_operator.stable.out sql/test/pg_regress/Tests/create_table.sql sql/test/pg_regress/Tests/create_table.stable.err sql/test/pg_regress/Tests/create_table.stable.out sql/test/pg_regress/Tests/create_type.stable.err sql/test/pg_regress/Tests/create_type.stable.out sql/test/pg_regress/Tests/create_view.stable.err sql/test/pg_regress/Tests/create_view.stable.out sql/test/pg_regress/Tests/date.stable.err sql/test/pg_regress/Tests/date.stable.out sql/test/pg_regress/Tests/domain.stable.err sql/test/pg_regress/Tests/domain.stable.out sql/test/pg_regress/Tests/errors.stable.err sql/test/pg_regress/Tests/errors.stable.out sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float4.stable.out sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/float8.stable.out sql/test/pg_regress/Tests/foreign_key.sql sql/test/pg_regress/Tests/foreign_key.stable.err sql/test/pg_regress/Tests/foreign_key.stable.out sql/test/pg_regress/Tests/geometry.stable.err sql/test/pg_regress/Tests/geometry.stable.out sql/test/pg_regress/Tests/hash_index.stable.err sql/test/pg_regress/Tests/hash_index.stable.out sql/test/pg_regress/Tests/horology.stable.err sql/test/pg_regress/Tests/horology.stable.out sql/test/pg_regress/Tests/inet.stable.err sql/test/pg_regress/Tests/inet.stable.out sql/test/pg_regress/Tests/inherit.sql sql/test/pg_regress/Tests/inherit.stable.err sql/test/pg_regress/Tests/inherit.stable.out sql/test/pg_regress/Tests/insert.stable.err sql/test/pg_regress/Tests/insert.stable.out sql/test/pg_regress/Tests/int2.stable.err sql/test/pg_regress/Tests/int2.stable.out sql/test/pg_regress/Tests/int4.stable.err sql/test/pg_regress/Tests/int4.stable.out sql/test/pg_regress/Tests/int8.stable.err sql/test/pg_regress/Tests/int8.stable.out sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/interval.stable.out sql/test/pg_regress/Tests/join.stable.err sql/test/pg_regress/Tests/join.stable.out sql/test/pg_regress/Tests/limit.stable.err sql/test/pg_regress/Tests/limit.stable.out sql/test/pg_regress/Tests/lseg.stable.err sql/test/pg_regress/Tests/lseg.stable.out sql/test/pg_regress/Tests/mule_internal.stable.err sql/test/pg_regress/Tests/mule_internal.stable.out sql/test/pg_regress/Tests/name.stable.err sql/test/pg_regress/Tests/name.stable.out sql/test/pg_regress/Tests/namespace.stable.err sql/test/pg_regress/Tests/namespace.stable.out sql/test/pg_regress/Tests/numeric.stable.err sql/test/pg_regress/Tests/numeric.stable.out sql/test/pg_regress/Tests/numeric_big.stable.err sql/test/pg_regress/Tests/numeric_big.stable.out sql/test/pg_regress/Tests/numerology.stable.err sql/test/pg_regress/Tests/numerology.stable.out sql/test/pg_regress/Tests/oid.stable.err sql/test/pg_regress/Tests/oid.stable.out sql/test/pg_regress/Tests/oidjoins.stable.err sql/test/pg_regress/Tests/oidjoins.stable.out sql/test/pg_regress/Tests/opr_sanity.stable.err sql/test/pg_regress/Tests/opr_sanity.stable.out sql/test/pg_regress/Tests/path.stable.err sql/test/pg_regress/Tests/path.stable.out sql/test/pg_regress/Tests/plpgsql.sql sql/test/pg_regress/Tests/plpgsql.stable.err sql/test/pg_regress/Tests/plpgsql.stable.out sql/test/pg_regress/Tests/point.stable.err sql/test/pg_regress/Tests/point.stable.out sql/test/pg_regress/Tests/polygon.stable.err sql/test/pg_regress/Tests/polygon.stable.out sql/test/pg_regress/Tests/polymorphism.stable.err sql/test/pg_regress/Tests/polymorphism.stable.out sql/test/pg_regress/Tests/portals.stable.err sql/test/pg_regress/Tests/portals.stable.out sql/test/pg_regress/Tests/portals_p2.stable.err sql/test/pg_regress/Tests/portals_p2.stable.out sql/test/pg_regress/Tests/prepare.stable.err sql/test/pg_regress/Tests/prepare.stable.out sql/test/pg_regress/Tests/privileges.stable.err sql/test/pg_regress/Tests/privileges.stable.out sql/test/pg_regress/Tests/random.stable.err sql/test/pg_regress/Tests/random.stable.out sql/test/pg_regress/Tests/rangefuncs.stable.err sql/test/pg_regress/Tests/rangefuncs.stable.out sql/test/pg_regress/Tests/reltime.stable.err sql/test/pg_regress/Tests/reltime.stable.out sql/test/pg_regress/Tests/rowtypes.stable.err sql/test/pg_regress/Tests/rowtypes.stable.out sql/test/pg_regress/Tests/rules.sql sql/test/pg_regress/Tests/rules.stable.err sql/test/pg_regress/Tests/rules.stable.out sql/test/pg_regress/Tests/sanity_check.stable.err sql/test/pg_regress/Tests/sanity_check.stable.out sql/test/pg_regress/Tests/select.stable.err sql/test/pg_regress/Tests/select.stable.out sql/test/pg_regress/Tests/select_distinct.stable.err sql/test/pg_regress/Tests/select_distinct.stable.out sql/test/pg_regress/Tests/select_distinct_on.stable.err sql/test/pg_regress/Tests/select_distinct_on.stable.out sql/test/pg_regress/Tests/select_having.stable.err sql/test/pg_regress/Tests/select_having.stable.out sql/test/pg_regress/Tests/select_implicit.stable.err sql/test/pg_regress/Tests/select_implicit.stable.out sql/test/pg_regress/Tests/select_into.stable.err sql/test/pg_regress/Tests/select_into.stable.out sql/test/pg_regress/Tests/select_views.stable.err sql/test/pg_regress/Tests/select_views.stable.out sql/test/pg_regress/Tests/sequence.stable.err sql/test/pg_regress/Tests/sequence.stable.out sql/test/pg_regress/Tests/sql_ascii.sql sql/test/pg_regress/Tests/sql_ascii.stable.err sql/test/pg_regress/Tests/sql_ascii.stable.out sql/test/pg_regress/Tests/stats.stable.err sql/test/pg_regress/Tests/stats.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/Tests/subselect.stable.err sql/test/pg_regress/Tests/subselect.stable.out sql/test/pg_regress/Tests/temp.stable.err sql/test/pg_regress/Tests/temp.stable.out sql/test/pg_regress/Tests/text.sql sql/test/pg_regress/Tests/text.stable.err sql/test/pg_regress/Tests/text.stable.out sql/test/pg_regress/Tests/time.stable.err sql/test/pg_regress/Tests/time.stable.out sql/test/pg_regress/Tests/timestamp.stable.err sql/test/pg_regress/Tests/timestamp.stable.out sql/test/pg_regress/Tests/timestamptz.stable.err sql/test/pg_regress/Tests/timestamptz.stable.out sql/test/pg_regress/Tests/timetz.stable.err sql/test/pg_regress/Tests/timetz.stable.out sql/test/pg_regress/Tests/tinterval.stable.err sql/test/pg_regress/Tests/tinterval.stable.out sql/test/pg_regress/Tests/transactions.stable.err sql/test/pg_regress/Tests/transactions.stable.out sql/test/pg_regress/Tests/triggers.stable.err sql/test/pg_regress/Tests/triggers.stable.out sql/test/pg_regress/Tests/truncate.stable.err sql/test/pg_regress/Tests/truncate.stable.out sql/test/pg_regress/Tests/type_sanity.stable.err sql/test/pg_regress/Tests/type_sanity.stable.out sql/test/pg_regress/Tests/union.stable.err sql/test/pg_regress/Tests/union.stable.out sql/test/pg_regress/Tests/update.stable.err sql/test/pg_regress/Tests/update.stable.out sql/test/pg_regress/Tests/vacuum.stable.err sql/test/pg_regress/Tests/vacuum.stable.out sql/test/pg_regress/Tests/without_oid.stable.err sql/test/pg_regress/Tests/without_oid.stable.out sql/test/pg_regress/postgresql2sql99.sh Branch: transaction-replication Log Message:
Merge with default branch diffs (truncated from 82527 to 300 lines): diff --git a/sql/test/pg_regress/Tests/All b/sql/test/pg_regress/Tests/All --- a/sql/test/pg_regress/Tests/All +++ b/sql/test/pg_regress/Tests/All @@ -1,109 +1,112 @@ load -# these need to go here, later tests depend on their tables to exist +# pgregress set; in order as given by +# http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob_plain;f=src/test/regress/serial_schedule;hb=HEAD + +boolean char +#name This is a special PostgresSQL datatype NOT supported in MonetDB. +# See also: http://www.postgresql.org/docs/9.3/static/datatype-character.html#DATATYPE-CHARACTER-SPECIAL-TABLE varchar text +# these three are not in the pgregress set; +# no idea where they come from; +# but the need to be executed after the tests above strings_concat strings_cast strings_like -#pgregress set -# abstime NOT supported ABSTIME, deprecated in Postgresql -aggregates -alter_table -arrays -bit -boolean -box -btree_index -case -##char -circle -cluster -comments -conversion -copy2 -create_aggregate -create_index -create_misc -create_operator -create_table -create_type -create_view -date -domain -drop -errors -float4 -float8 -foreign_key -geometry -hash_index -horology -inet -inherit -insert int2 int4 int8 -interval -join -limit +oid +float4 +float8 +# bit NOT supported in MonetDB. BIT is also not standard SQL so exclude this test +numeric +strings +numerology +point lseg -mule_internal -namespace -name -numeric_big -numeric -numerology -oidjoins -oid -opr_sanity +box path -plpgsql -point polygon -polymorphism -portals_p2 -portals -prepare -privileges -random -rangefuncs -reltime -rowtypes -rules -sanity_check -select_distinct_on -select_distinct -select_having -select_implicit -select_into -select -select_views -sequence -sql_ascii -stats -##strings_cast -##strings_concat -##strings_like -strings -subselect -temp -##text +circle +date time +timetz timestamp timestamptz -timetz +interval +# abstime NOT supported ABSTIME, deprecated in Postgresql +reltime tinterval +inet +comments +geometry +horology +oidjoins +type_sanity +opr_sanity +insert +create_type +create_table +create_misc +create_operator +create_index +create_view +create_aggregate +triggers +inherit +vacuum +sanity_check +errors +select +select_into +select_distinct +select_distinct_on +select_implicit +select_having +subselect +union +case +join +aggregates transactions -triggers +random +portals +arrays +btree_index +hash_index +update +namespace +privileges +rules +select_views +portals_p2 +foreign_key +cluster +limit +plpgsql +copy2 +temp +domain +rangefuncs +prepare +without_oid +conversion truncate -type_sanity -union -update -vacuum -##varchar -without_oid +alter_table +sequence +polymorphism +rowtypes +stats + +# these four were in a 2005 pgregress set, but are no longer +# in the 2014 v9.3.4 pgregress set; not sure when/where they +# should be run; keep them for last for now +drop +mule_internal +numeric_big +sql_ascii diff --git a/sql/test/pg_regress/Tests/aggregates.stable.err b/sql/test/pg_regress/Tests/aggregates.stable.err --- a/sql/test/pg_regress/Tests/aggregates.stable.err +++ b/sql/test/pg_regress/Tests/aggregates.stable.err @@ -29,6 +29,29 @@ stderr of test 'aggregates` in directory # 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1142" "--port=38959" # 17:11:19 > +#-- +#-- AGGREGATES +#-- +#-- In 7.1, avg(float) is computed using double arithmetic. +#-- Round the result to 3 digits to avoid platform-specific results. +#-- test for outer-level aggregates +#-- this should work +#-- this should fail because subquery has an agg of its own in WHERE +MAPI = (monetdb) /var/tmp/mtest-12345/.s.monetdb.54321 +QUERY = select ten, sum(distinct four) from onek a +group by ten +having exists (select 1 from onek b + where sum(distinct a.four + b.four) = b.four); +ERROR = aggregates not allowed in WHERE clause +#-- +#-- test for bitwise integer aggregates +#-- +#-- empty case +#-- +#-- test boolean aggregates +#-- +#-- first test all possible transition and final states +#-- empty case # 17:11:19 > # 17:11:19 > "Done." diff --git a/sql/test/pg_regress/Tests/aggregates.stable.out b/sql/test/pg_regress/Tests/aggregates.stable.out --- a/sql/test/pg_regress/Tests/aggregates.stable.out +++ b/sql/test/pg_regress/Tests/aggregates.stable.out @@ -26,300 +26,324 @@ Ready. = ! Correct / expected output still needs to be provided / verified / approved ! = --- --- AGGREGATES --- -SELECT avg(four) AS avg_1 FROM onek; - avg_1 --------------------- - 1.5000000000000000 -(1 row) +#-- +#-- AGGREGATES +#-- +#SELECT avg(four) AS avg_1 FROM onek; +% sys.L0 # table_name +% avg_1 # name +% ? # type +% ? # length +[ 1.5 ] -SELECT avg(a) AS avg_32 FROM aggtest WHERE a < 100; - avg_32 ---------------------- - 32.6666666666666667 -(1 row) +#SELECT avg(a) AS avg_32 FROM aggtest WHERE a < 100; +% sys.L0 # table_name +% avg_32 # name +% ? # type +% ? # length +[ 32.66666667 ] --- In 7.1, avg(float4) is computed using float8 arithmetic. --- Round the result to 3 digits to avoid platform-specific results. -SELECT avg(b)::numeric(10,3) AS avg_107_943 FROM aggtest; - avg_107_943 -------------- - 107.943 -(1 row) +#-- In 7.1, avg(float) is computed using double arithmetic. +#-- Round the result to 3 digits to avoid platform-specific results. +#SELECT cast(avg(b) as numeric(10,3)) AS avg_107_943 FROM aggtest; +% sys.L0 # table_name +% avg_107_943 # name +% ? # type +% ? # length +[ 107.943 ] -SELECT avg(gpa) AS avg_3_4 FROM ONLY student; - avg_3_4 ---------- - 3.4 -(1 row) +#SELECT avg(gpa) AS avg_3_4 FROM student; +% sys.L0 # table_name +% avg_3_4 # name +% ? # type +% ? # length +[ 3.4 ] _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
