Changeset: 5992196c2e3c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5992196c2e3c
Added Files:
sql/test/pg_regress/Tests/box.SQL.py
Removed Files:
sql/test/pg_regress/Tests/box.test
Branch: default
Log Message:
fix box test
diffs (205 lines):
diff --git a/sql/test/pg_regress/Tests/box.SQL.py
b/sql/test/pg_regress/Tests/box.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/pg_regress/Tests/box.SQL.py
@@ -0,0 +1,9 @@
+from MonetDBtesting.sqltest import SQLTestCase
+
+with SQLTestCase() as tc:
+ # optional or default connection
+ tc.connect()
+ with open('box.sql') as f:
+ tc.execute(query=None, client='mclient', stdin=f)\
+ .assertMatchStableOut(fout='box.stable.out')\
+ .assertMatchStableError(ferr='box.stable.err')
diff --git a/sql/test/pg_regress/Tests/box.test
b/sql/test/pg_regress/Tests/box.test
deleted file mode 100644
--- a/sql/test/pg_regress/Tests/box.test
+++ /dev/null
@@ -1,186 +0,0 @@
-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
-INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(2.0 2.0, 0.0 0.0)'))
-
-statement ok
-INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(1.0 1.0, 3.0 3.0)'))
-
-statement ok
-INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(2.5 2.5, 2.5 3.5)'))
-
-statement ok
-INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(3.0 3.0, 3.0 3.0)'))
-
-statement error
-INSERT INTO BOX_TBL (f1) VALUES (MBR('(2.3, 4.5)'))
-
-statement error
-INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(2.3, 4.5)'))
-
-statement error
-INSERT INTO BOX_TBL (f1) VALUES (MBR('asdfasdf(ad'))
-
-statement error
-INSERT INTO BOX_TBL (f1) VALUES (MBR('linestring(asdfasdf(ad)'))
-
-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)
-
-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
-
-query TT rowsort
-SELECT * FROM BOX_TBL_VW
-----
-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)
-
-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)
-
-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)
-
-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)
-
-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)
-
-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)
-
-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)
-
-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
-
-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
-
-statement ok
-DROP VIEW BOX_TBL_VW
-
-statement ok
-DROP TABLE BOX_TBL
-
-statement ok
-set optimizer = 'default_pipe'
-
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
