Changeset: 1d0c20d39dc0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d0c20d39dc0 Modified Files: sql/test/pg_regress/Tests/box.stable.err sql/test/pg_regress/Tests/box.stable.out Branch: geo Log Message:
approved box test diffs (55 lines): diff --git a/sql/test/pg_regress/Tests/box.stable.err b/sql/test/pg_regress/Tests/box.stable.err --- a/sql/test/pg_regress/Tests/box.stable.err +++ b/sql/test/pg_regress/Tests/box.stable.err @@ -29,22 +29,22 @@ stderr of test 'box` in directory 'sql/t # 19:04:23 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-6949" "--port=31707" # 19:04:23 > -MAPI = (monetdb) /var/tmp/mtest-1007/.s.monetdb.37144 +MAPI = (monetdb) /var/tmp/mtest-1087/.s.monetdb.39430 QUERY = INSERT INTO BOX_TBL (f1) VALUES (MBR('(2.3, 4.5)')); ERROR = !ParseException: Unknown type: '(' -MAPI = (monetdb) /var/tmp/mtest-1007/.s.monetdb.37144 +MAPI = (monetdb) /var/tmp/mtest-1087/.s.monetdb.39430 QUERY = INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(2.3, 4.5)')); ERROR = !ParseException: Expected number but encountered ',' -MAPI = (monetdb) /var/tmp/mtest-1007/.s.monetdb.37144 +MAPI = (monetdb) /var/tmp/mtest-1087/.s.monetdb.39430 QUERY = INSERT INTO BOX_TBL (f1) VALUES (MBR('asdfasdf(ad')); ERROR = !ParseException: Unknown type: 'ASDFASDF' -MAPI = (monetdb) /var/tmp/mtest-1007/.s.monetdb.37144 +MAPI = (monetdb) /var/tmp/mtest-1087/.s.monetdb.39430 QUERY = INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(asdfasdf(ad)')); ERROR = !ParseException: Expected number but encountered word: 'asdfasdf' -MAPI = (monetdb) /var/tmp/mtest-1007/.s.monetdb.37144 +MAPI = (monetdb) /var/tmp/mtest-1087/.s.monetdb.39430 QUERY = SELECT '' AS four, @@(b1.f1) AS p FROM BOX_TBL_VW b1; ERROR = !syntax error, unexpected AT in: "select '' as four, @@" -MAPI = (monetdb) /var/tmp/mtest-1007/.s.monetdb.37144 +MAPI = (monetdb) /var/tmp/mtest-1087/.s.monetdb.39430 QUERY = SELECT '' AS four, height(f1), width(f1) FROM BOX_TBL_VW; ERROR = !SELECT: no such unary operator 'height(mbr)' diff --git a/sql/test/pg_regress/Tests/box.stable.out b/sql/test/pg_regress/Tests/box.stable.out --- a/sql/test/pg_regress/Tests/box.stable.out +++ b/sql/test/pg_regress/Tests/box.stable.out @@ -92,8 +92,8 @@ Ready. % mbr, varchar # type % 0, 44 # length [ "BOX (0 0, 2 2)", "\"BOX (0.000000 0.000000, 2.000000 2.000000)\"" ] -[ "BOX (1 1, 3 3)", "\"BOX (1.000000 1.000000, 3.000000 3.000000)\"" ] -[ "BOX (2.5 2.5, 2.5 3.5)", "\"BOX (2.500000 2.500000, 2.500000 3.500000)\"" ] +[ "BOX (1 1, 3 3)", "\"BOX (1.000000 1.000000, 3.000000 3.500000)\"" ] +[ "BOX (2.5 2.5, 2.5 3.5)", "\"BOX (1.000000 1.000000, 3.000000 3.500000)\"" ] [ "BOX (3 3, 3 3)", "\"BOX (3.000000 3.000000, 3.000000 3.000000)\"" ] #SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE b.f1 && mbr('linestring(2.5 2.5, 1.0 1.0)'); % .L1, sys.b # table_name @@ -159,7 +159,7 @@ Ready. % one, f1, txt, f1, txt # name % char, mbr, varchar, mbr, varchar # type % 0, 0, 44, 0, 44 # length -[ "", "BOX (1 1, 3 3)", "\"BOX (1.000000 1.000000, 3.000000 3.000000)\"", "BOX (3 3, 3 3)", "\"BOX (3.000000 3.000000, 2.000000 2.000000)\"" ] +[ "", "BOX (1 1, 3 3)", "\"BOX (1.000000 1.000000, 3.000000 3.000000)\"", "BOX (3 3, 3 3)", "\"BOX (3.000000 3.000000, 3.000000 3.000000)\"" ] #DROP VIEW BOX_TBL_VW; #DROP TABLE BOX_TBL; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list