Changeset: ed99956281fd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed99956281fd Modified Files: sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/strings_cast.stable.err sql/test/pg_regress/Tests/strings_cast.stable.out sql/test/pg_regress/Tests/varchar.sql Branch: default Log Message:
Fixed a problem with CREATE TABLE VARCHAR_TBL() which produced errors on different machines in the testweb diffs (84 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 @@ -11,14 +11,6 @@ char # 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 - int2 int4 int8 @@ -28,6 +20,10 @@ float8 # bit NOT supported in MonetDB. BIT is also not standard SQL so exclude this test numeric strings +strings_concat +strings_cast +strings_like + numerology HAVE_GEOM?point #HAVE_GEOM?lseg # lseg is NOT supported in MonetDB. lseg (Line Segment) is also not part of OpenGIS standard so exclude this test diff --git a/sql/test/pg_regress/Tests/strings_cast.stable.err b/sql/test/pg_regress/Tests/strings_cast.stable.err --- a/sql/test/pg_regress/Tests/strings_cast.stable.err +++ b/sql/test/pg_regress/Tests/strings_cast.stable.err @@ -65,16 +65,9 @@ stderr of test 'strings_cast` in directo # cmdline opt embedded_r = yes # cmdline opt gdk_debug = 536870922 -# 12:37:08 > -# 12:37:08 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-8489" "--port=38828" -# 12:37:08 > - -MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487 -QUERY = CREATE TABLE VARCHAR_TBL(f1 varchar(4)); -ERROR = !CREATE TABLE: name 'varchar_tbl' already in use - - - +# 15:15:43 > +# 15:15:43 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23924" "--port=35312" +# 15:15:43 > # 22:34:06 > diff --git a/sql/test/pg_regress/Tests/strings_cast.stable.out b/sql/test/pg_regress/Tests/strings_cast.stable.out --- a/sql/test/pg_regress/Tests/strings_cast.stable.out +++ b/sql/test/pg_regress/Tests/strings_cast.stable.out @@ -87,9 +87,6 @@ Ready. [ "a" ] [ "ab" ] [ "abcd" ] -[ "a" ] -[ "ab" ] -[ "abcd" ] #SELECT CAST('namefield' AS text) AS "text(name)"; % .L1 # table_name % text(name) # name @@ -118,9 +115,6 @@ Ready. [ "a" ] [ "ab" ] [ "abcd" ] -[ "a" ] -[ "ab" ] -[ "abcd" ] #SELECT CAST('namefield' AS char(10)) AS "char(name)"; % .L1 # table_name % char(name) # name diff --git a/sql/test/pg_regress/Tests/varchar.sql b/sql/test/pg_regress/Tests/varchar.sql --- a/sql/test/pg_regress/Tests/varchar.sql +++ b/sql/test/pg_regress/Tests/varchar.sql @@ -65,4 +65,4 @@ INSERT INTO VARCHAR_TBL (f1) VALUES ('ab SELECT '' AS four, VARCHAR_TBL.* FROM VARCHAR_TBL; --- DROP TABLE VARCHAR_TBL; +DROP TABLE VARCHAR_TBL; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
