Changeset: 1d4f6e70a379 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d4f6e70a379
Added Files:
        sql/test/pg_regress/Tests/case.reqtests
        sql/test/pg_regress/Tests/create_aggregate.reqtests
Modified Files:
        sql/test/pg_regress/Tests/All
        sql/test/pg_regress/Tests/box.test
        sql/test/pg_regress/Tests/create_view.reqtests
        sql/test/pg_regress/Tests/date.test
        sql/test/pg_regress/Tests/numerology.sql
        sql/test/pg_regress/Tests/numerology.stable.out
        sql/test/pg_regress/Tests/numerology.test
        sql/test/pg_regress/Tests/select_views.reqtests
Branch: mtest
Log Message:

approved output, added more reqtests


diffs (truncated from 1654 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
@@ -75,6 +75,10 @@ case         #[MK] interactive behavior is inco
 #ToDo aggregates
 #ToDo transactions
 random #[MK] causes an non-displayed error and lost of information in the 
result
+limit  #[MK] handles
+alter_table
+drop
+
 #portals [MK] MonetDB does not support SQL cursor/fetch operations
 arrays
 #btree_index   [MK]MonetDB does not support construction of btrees
@@ -86,7 +90,6 @@ update
 #ToDo portals_p2 [MK] MonetDB does not support SQL cursor/fetch operations
 #ToDo foreign_key
 #cluster       [MK]MonetDB does not support clustering of tables
-limit  #[MK] handles
 #ToDo plpgsql
 #ToDo copy2
 #ToDo temp
@@ -96,7 +99,6 @@ limit #[MK] handles
 without_oid
 #ToDo conversion
 #truncate [MK] a combination of a DROP TABLE followed by its CREATE table, 
feature request?
-alter_table
 #ToDo sequence
 #ToDo polymorphism
 #rowtypes [MK] MonetDB does not support object type definitions 
@@ -105,7 +107,6 @@ alter_table
 # 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
 #ToDo mule_internal
 numeric_big
 #ToDo sql_ascii
diff --git a/sql/test/pg_regress/Tests/box.test 
b/sql/test/pg_regress/Tests/box.test
--- a/sql/test/pg_regress/Tests/box.test
+++ b/sql/test/pg_regress/Tests/box.test
@@ -2,6 +2,20 @@ statement ok
 set optimizer = 'sequential_pipe'
 
 statement ok
+-- 3     o
+--       |  o|
+-- 2   +-+-+ |
+--     | | | |
+-- 1   | o-+-o
+--     |   |
+-- 0   +---+
+--
+--     0 1 2 3
+--
+-- boxes are specified by two points, given by four floats x1,y1,x2,y2
+-- DROP TABLE BOX_TBL
+
+statement ok
 CREATE TABLE BOX_TBL (f1 mbr)
 
 statement ok
@@ -28,47 +42,134 @@ INSERT INTO BOX_TBL (f1) VALUES (MBR('as
 statement error
 INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(asdfasdf(ad)'))
 
-statement error
+query TT rowsort
 SELECT '' AS four, BOX_TBL.* FROM BOX_TBL
+----
+(empty)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+(empty)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+(empty)
+BOX (2.500000 2.500000, 2.500000 3.500000)
+(empty)
+BOX (3.000000 3.000000, 3.000000 3.000000)
 
-statement error
+query TTT rowsort
 SELECT '' AS four, b.f1, cast(f1 as varchar(44)) as txt FROM BOX_TBL b
+----
+(empty)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+(empty)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+(empty)
+BOX (2.500000 2.500000, 2.500000 3.500000)
+BOX (2.500000 2.500000, 2.500000 3.500000)
+(empty)
+BOX (3.000000 3.000000, 3.000000 3.000000)
+BOX (3.000000 3.000000, 3.000000 3.000000)
 
 statement ok
 CREATE VIEW BOX_TBL_VW AS SELECT f1, cast(f1 as varchar(44)) as txt FROM 
BOX_TBL
 
-statement error
+query TT rowsort
 SELECT * FROM BOX_TBL_VW
-
-statement error
-SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE b.f1 && mbr('linestring(2.5 
2.5, 1.0 1.0)')
+----
+BOX (0.000000 0.000000, 2.000000 2.000000)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+BOX (2.500000 2.500000, 2.500000 3.500000)
+BOX (2.500000 2.500000, 2.500000 3.500000)
+BOX (3.000000 3.000000, 3.000000 3.000000)
+BOX (3.000000 3.000000, 3.000000 3.000000)
 
-statement error
-SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE ST_Overlaps(b.f1, 
mbr('linestring(2.5 2.5, 1.0 1.0)'))
+query TT rowsort
+SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE b.f1 && mbr('linestring(2.5 
2.5, 1.0 1.0)')
+----
+(empty)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+(empty)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+(empty)
+BOX (2.500000 2.500000, 2.500000 3.500000)
 
-statement error
+query TT rowsort
+SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE ST_Overlaps(b.f1, 
mbr('linestring(2.5 2.5, 1.0 1.0)'))
+----
+(empty)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+(empty)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+(empty)
+BOX (2.500000 2.500000, 2.500000 3.500000)
+
+query TTT rowsort
 SELECT '' AS two, b1.* FROM BOX_TBL_VW b1 WHERE b1.f1 &< mbr('linestring(2.0 
2.0, 2.5 2.5)')
+----
+(empty)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+(empty)
+BOX (2.500000 2.500000, 2.500000 3.500000)
+BOX (2.500000 2.500000, 2.500000 3.500000)
 
-statement error
+query TTT rowsort
 SELECT '' AS two, b1.* FROM BOX_TBL_VW b1 WHERE b1.f1 &> mbr('linestring(2.0 
2.0, 2.5 2.5)')
+----
+(empty)
+BOX (2.500000 2.500000, 2.500000 3.500000)
+BOX (2.500000 2.500000, 2.500000 3.500000)
+(empty)
+BOX (3.000000 3.000000, 3.000000 3.000000)
+BOX (3.000000 3.000000, 3.000000 3.000000)
 
-statement error
+query TT rowsort
 SELECT '' AS two, b.f1 FROM BOX_TBL_VW b WHERE b.f1 << mbr('linestring(3.0 
3.0, 5.0 5.0)')
+----
+(empty)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+(empty)
+BOX (2.500000 2.500000, 2.500000 3.500000)
 
-statement error
+query TT rowsort
 SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE b.f1 @ mbr('linestring(0 0, 3 
3)')
+----
+(empty)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+(empty)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+(empty)
+BOX (3.000000 3.000000, 3.000000 3.000000)
 
-statement error
+query TT rowsort
 SELECT '' AS three, b.f1 FROM BOX_TBL_VW b WHERE mbr('linestring(0 0, 3 3)') ~ 
b.f1
+----
+(empty)
+BOX (0.000000 0.000000, 2.000000 2.000000)
+(empty)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+(empty)
+BOX (3.000000 3.000000, 3.000000 3.000000)
 
-statement error
+query TT rowsort
 SELECT '' AS one, b.f1 FROM BOX_TBL_VW b WHERE mbr('linestring(1 1, 3 3)') ~= 
b.f1
+----
+(empty)
+BOX (1.000000 1.000000, 3.000000 3.000000)
 
 statement error
 SELECT '' AS four, @@(b1.f1) AS p FROM BOX_TBL_VW b1
 
-statement error
+query TTTTT rowsort
 SELECT '' AS one, b1.*, b2.* FROM BOX_TBL_VW b1, BOX_TBL_VW b2 WHERE b1.f1 ~ 
b2.f1 and not b1.f1 ~= b2.f1
+----
+(empty)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+BOX (1.000000 1.000000, 3.000000 3.000000)
+BOX (3.000000 3.000000, 3.000000 3.000000)
+BOX (3.000000 3.000000, 3.000000 3.000000)
 
 statement error
 SELECT '' AS four, height(f1), width(f1) FROM BOX_TBL_VW
diff --git a/sql/test/pg_regress/Tests/case.reqtests 
b/sql/test/pg_regress/Tests/case.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/pg_regress/Tests/case.reqtests
@@ -0,0 +1,1 @@
+loadwisconsin
diff --git a/sql/test/pg_regress/Tests/create_aggregate.reqtests 
b/sql/test/pg_regress/Tests/create_aggregate.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/pg_regress/Tests/create_aggregate.reqtests
@@ -0,0 +1,3 @@
+loadwisconsin
+create_table
+create_view
diff --git a/sql/test/pg_regress/Tests/create_view.reqtests 
b/sql/test/pg_regress/Tests/create_view.reqtests
--- a/sql/test/pg_regress/Tests/create_view.reqtests
+++ b/sql/test/pg_regress/Tests/create_view.reqtests
@@ -1,1 +1,2 @@
+loadwisconsin
 create_table
diff --git a/sql/test/pg_regress/Tests/date.test 
b/sql/test/pg_regress/Tests/date.test
--- a/sql/test/pg_regress/Tests/date.test
+++ b/sql/test/pg_regress/Tests/date.test
@@ -52,7 +52,21 @@ INSERT INTO DATE_TBL VALUES ('2040-04-10
 query T rowsort
 SELECT f1 AS "Fifteen" FROM DATE_TBL
 ----
-15 values hashing to 374c022dfae66832cfca664bf971fe76
+1957-04-09
+1957-06-13
+1996-02-28
+1996-02-29
+1996-03-01
+1996-03-02
+1997-02-28
+1997-03-01
+1997-03-02
+2000-04-01
+2000-04-02
+2000-04-03
+2038-04-08
+2039-04-09
+2040-04-10
 
 query T rowsort
 SELECT f1 AS "Nine" FROM DATE_TBL WHERE f1 < '2000-01-01'
@@ -84,7 +98,38 @@ SELECT f1, day(f1) FROM DATE_TBL
 query TI rowsort
 SELECT f1, "day"(f1) FROM DATE_TBL
 ----
-32 values hashing to a322b7c7950855bf240776aae80117d3
+1957-04-09
+9
+1957-06-13
+13
+1996-02-28
+28
+1996-02-29
+29
+1996-03-01
+1
+1996-03-02
+2
+1997-02-28
+28
+1997-03-01
+1
+1997-03-02
+2
+2000-04-01
+1
+2000-04-02
+2
+2000-04-03
+3
+2038-04-08
+8
+2039-04-09
+9
+2040-04-10
+10
+NULL
+NULL
 
 statement error
 SELECT f1, month(f1) FROM DATE_TBL
@@ -92,7 +137,38 @@ SELECT f1, month(f1) FROM DATE_TBL
 query TI rowsort
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to