Add test for creating tables with circularstring typmod (#1085)

git-svn-id: http://svn.osgeo.org/postgis/trunk@8804 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/regress/typmod.sql b/regress/typmod.sql
index 3eefba414b5284294fa271504a9ceabacf9c1e93..3ca9b7a99e4d69056566c0e0009fff8137fc8d9e 100644 (file)
--- a/regress/typmod.sql
+++ b/regress/typmod.sql
@@ -4,6 +4,58 @@ CREATE SCHEMA tm;
 
 -- Test construction of typed tables
 
+CREATE TABLE tm.circularstring (a int, g geometry(circularstring) );
+CREATE TABLE tm.circularstring0 (a int, g geometry(circularstring, 0) );
+CREATE TABLE tm.circularstring1 (a int, g geometry(circularstring, 1) );
+CREATE TABLE tm.circularstringm (a int, g geometry(circularstringm) );
+CREATE TABLE tm.circularstringm0 (a int, g geometry(circularstringm, 0) );
+CREATE TABLE tm.circularstringm1 (a int, g geometry(circularstringm, 1) );
+CREATE TABLE tm.circularstringz (a int, g geometry(circularstringz) );
+CREATE TABLE tm.circularstringz0 (a int, g geometry(circularstringz, 0) );
+CREATE TABLE tm.circularstringz1 (a int, g geometry(circularstringz, 1) );
+CREATE TABLE tm.circularstringzm (a int, g geometry(circularstringzm) );
+CREATE TABLE tm.circularstringzm0 (a int, g geometry(circularstringzm, 0) );
+CREATE TABLE tm.circularstringzm1 (a int, g geometry(circularstringzm, 1) );
+
+CREATE TABLE tm.compoundcurve (a int, g geometry(compoundcurve) );
+CREATE TABLE tm.compoundcurve0 (a int, g geometry(compoundcurve, 0) );
+CREATE TABLE tm.compoundcurve1 (a int, g geometry(compoundcurve, 1) );
+CREATE TABLE tm.compoundcurvem (a int, g geometry(compoundcurvem) );
+CREATE TABLE tm.compoundcurvem0 (a int, g geometry(compoundcurvem, 0) );
+CREATE TABLE tm.compoundcurvem1 (a int, g geometry(compoundcurvem, 1) );
+CREATE TABLE tm.compoundcurvez (a int, g geometry(compoundcurvez) );
+CREATE TABLE tm.compoundcurvez0 (a int, g geometry(compoundcurvez, 0) );
+CREATE TABLE tm.compoundcurvez1 (a int, g geometry(compoundcurvez, 1) );
+CREATE TABLE tm.compoundcurvezm (a int, g geometry(compoundcurvezm) );
+CREATE TABLE tm.compoundcurvezm0 (a int, g geometry(compoundcurvezm, 0) );
+CREATE TABLE tm.compoundcurvezm1 (a int, g geometry(compoundcurvezm, 1) );
+
+CREATE TABLE tm.curvepolygon (a int, g geometry(curvepolygon) );
+CREATE TABLE tm.curvepolygon0 (a int, g geometry(curvepolygon, 0) );
+CREATE TABLE tm.curvepolygon1 (a int, g geometry(curvepolygon, 1) );
+CREATE TABLE tm.curvepolygonm (a int, g geometry(curvepolygonm) );
+CREATE TABLE tm.curvepolygonm0 (a int, g geometry(curvepolygonm, 0) );
+CREATE TABLE tm.curvepolygonm1 (a int, g geometry(curvepolygonm, 1) );
+CREATE TABLE tm.curvepolygonz (a int, g geometry(curvepolygonz) );
+CREATE TABLE tm.curvepolygonz0 (a int, g geometry(curvepolygonz, 0) );
+CREATE TABLE tm.curvepolygonz1 (a int, g geometry(curvepolygonz, 1) );
+CREATE TABLE tm.curvepolygonzm (a int, g geometry(curvepolygonzm) );
+CREATE TABLE tm.curvepolygonzm0 (a int, g geometry(curvepolygonzm, 0) );
+CREATE TABLE tm.curvepolygonzm1 (a int, g geometry(curvepolygonzm, 1) );
+
+CREATE TABLE tm.geometry (a int, g geometry(geometry) );
+CREATE TABLE tm.geometry0 (a int, g geometry(geometry, 0) );
+CREATE TABLE tm.geometry1 (a int, g geometry(geometry, 1) );
+CREATE TABLE tm.geometrym (a int, g geometry(geometrym) );
+CREATE TABLE tm.geometrym0 (a int, g geometry(geometrym, 0) );
+CREATE TABLE tm.geometrym1 (a int, g geometry(geometrym, 1) );
+CREATE TABLE tm.geometryz (a int, g geometry(geometryz) );
+CREATE TABLE tm.geometryz0 (a int, g geometry(geometryz, 0) );
+CREATE TABLE tm.geometryz1 (a int, g geometry(geometryz, 1) );
+CREATE TABLE tm.geometryzm (a int, g geometry(geometryzm) );
+CREATE TABLE tm.geometryzm0 (a int, g geometry(geometryzm, 0) );
+CREATE TABLE tm.geometryzm1 (a int, g geometry(geometryzm, 1) );
+
 CREATE TABLE tm.geometrycollection (a int, g geometry(geometrycollection) );
 CREATE TABLE tm.geometrycollection0 (a int, g geometry(geometrycollection, 0) );
 CREATE TABLE tm.geometrycollection1 (a int, g geometry(geometrycollection, 1) );
@@ -30,6 +82,19 @@ CREATE TABLE tm.linestringzm (a int, g geometry(linestringzm) );
 CREATE TABLE tm.linestringzm0 (a int, g geometry(linestringzm, 0) );
 CREATE TABLE tm.linestringzm1 (a int, g geometry(linestringzm, 1) );
 
+CREATE TABLE tm.multicurve (a int, g geometry(multicurve) );
+CREATE TABLE tm.multicurve0 (a int, g geometry(multicurve, 0) );
+CREATE TABLE tm.multicurve1 (a int, g geometry(multicurve, 1) );
+CREATE TABLE tm.multicurvem (a int, g geometry(multicurvem) );
+CREATE TABLE tm.multicurvem0 (a int, g geometry(multicurvem, 0) );
+CREATE TABLE tm.multicurvem1 (a int, g geometry(multicurvem, 1) );
+CREATE TABLE tm.multicurvez (a int, g geometry(multicurvez) );
+CREATE TABLE tm.multicurvez0 (a int, g geometry(multicurvez, 0) );
+CREATE TABLE tm.multicurvez1 (a int, g geometry(multicurvez, 1) );
+CREATE TABLE tm.multicurvezm (a int, g geometry(multicurvezm) );
+CREATE TABLE tm.multicurvezm0 (a int, g geometry(multicurvezm, 0) );
+CREATE TABLE tm.multicurvezm1 (a int, g geometry(multicurvezm, 1) );
+
 CREATE TABLE tm.multilinestring (a int, g geometry(multilinestring) );
 CREATE TABLE tm.multilinestring0 (a int, g geometry(multilinestring, 0) );
 CREATE TABLE tm.multilinestring1 (a int, g geometry(multilinestring, 1) );
@@ -69,6 +134,19 @@ CREATE TABLE tm.multipointzm (a int, g geometry(multipointzm) );
 CREATE TABLE tm.multipointzm0 (a int, g geometry(multipointzm, 0) );
 CREATE TABLE tm.multipointzm1 (a int, g geometry(multipointzm, 1) );
 
+CREATE TABLE tm.multisurface (a int, g geometry(multisurface) );
+CREATE TABLE tm.multisurface0 (a int, g geometry(multisurface, 0) );
+CREATE TABLE tm.multisurface1 (a int, g geometry(multisurface, 1) );
+CREATE TABLE tm.multisurfacem (a int, g geometry(multisurfacem) );
+CREATE TABLE tm.multisurfacem0 (a int, g geometry(multisurfacem, 0) );
+CREATE TABLE tm.multisurfacem1 (a int, g geometry(multisurfacem, 1) );
+CREATE TABLE tm.multisurfacez (a int, g geometry(multisurfacez) );
+CREATE TABLE tm.multisurfacez0 (a int, g geometry(multisurfacez, 0) );
+CREATE TABLE tm.multisurfacez1 (a int, g geometry(multisurfacez, 1) );
+CREATE TABLE tm.multisurfacezm (a int, g geometry(multisurfacezm) );
+CREATE TABLE tm.multisurfacezm0 (a int, g geometry(multisurfacezm, 0) );
+CREATE TABLE tm.multisurfacezm1 (a int, g geometry(multisurfacezm, 1) );
+
 CREATE TABLE tm.point (a int, g geometry(point) );
 CREATE TABLE tm.point0 (a int, g geometry(point, 0) );
 CREATE TABLE tm.point1 (a int, g geometry(point, 1) );
@@ -95,6 +173,45 @@ CREATE TABLE tm.polygonzm (a int, g geometry(polygonzm) );
 CREATE TABLE tm.polygonzm0 (a int, g geometry(polygonzm, 0) );
 CREATE TABLE tm.polygonzm1 (a int, g geometry(polygonzm, 1) );
 
+CREATE TABLE tm.polyhedralsurface (a int, g geometry(polyhedralsurface) );
+CREATE TABLE tm.polyhedralsurface0 (a int, g geometry(polyhedralsurface, 0) );
+CREATE TABLE tm.polyhedralsurface1 (a int, g geometry(polyhedralsurface, 1) );
+CREATE TABLE tm.polyhedralsurfacem (a int, g geometry(polyhedralsurfacem) );
+CREATE TABLE tm.polyhedralsurfacem0 (a int, g geometry(polyhedralsurfacem, 0) );
+CREATE TABLE tm.polyhedralsurfacem1 (a int, g geometry(polyhedralsurfacem, 1) );
+CREATE TABLE tm.polyhedralsurfacez (a int, g geometry(polyhedralsurfacez) );
+CREATE TABLE tm.polyhedralsurfacez0 (a int, g geometry(polyhedralsurfacez, 0) );
+CREATE TABLE tm.polyhedralsurfacez1 (a int, g geometry(polyhedralsurfacez, 1) );
+CREATE TABLE tm.polyhedralsurfacezm (a int, g geometry(polyhedralsurfacezm) );
+CREATE TABLE tm.polyhedralsurfacezm0 (a int, g geometry(polyhedralsurfacezm, 0) );
+CREATE TABLE tm.polyhedralsurfacezm1 (a int, g geometry(polyhedralsurfacezm, 1) );
+
+CREATE TABLE tm.tin (a int, g geometry(tin) );
+CREATE TABLE tm.tin0 (a int, g geometry(tin, 0) );
+CREATE TABLE tm.tin1 (a int, g geometry(tin, 1) );
+CREATE TABLE tm.tinm (a int, g geometry(tinm) );
+CREATE TABLE tm.tinm0 (a int, g geometry(tinm, 0) );
+CREATE TABLE tm.tinm1 (a int, g geometry(tinm, 1) );
+CREATE TABLE tm.tinz (a int, g geometry(tinz) );
+CREATE TABLE tm.tinz0 (a int, g geometry(tinz, 0) );
+CREATE TABLE tm.tinz1 (a int, g geometry(tinz, 1) );
+CREATE TABLE tm.tinzm (a int, g geometry(tinzm) );
+CREATE TABLE tm.tinzm0 (a int, g geometry(tinzm, 0) );
+CREATE TABLE tm.tinzm1 (a int, g geometry(tinzm, 1) );
+
+CREATE TABLE tm.triangle (a int, g geometry(triangle) );
+CREATE TABLE tm.triangle0 (a int, g geometry(triangle, 0) );
+CREATE TABLE tm.triangle1 (a int, g geometry(triangle, 1) );
+CREATE TABLE tm.trianglem (a int, g geometry(trianglem) );
+CREATE TABLE tm.trianglem0 (a int, g geometry(trianglem, 0) );
+CREATE TABLE tm.trianglem1 (a int, g geometry(trianglem, 1) );
+CREATE TABLE tm.trianglez (a int, g geometry(trianglez) );
+CREATE TABLE tm.trianglez0 (a int, g geometry(trianglez, 0) );
+CREATE TABLE tm.trianglez1 (a int, g geometry(trianglez, 1) );
+CREATE TABLE tm.trianglezm (a int, g geometry(trianglezm) );
+CREATE TABLE tm.trianglezm0 (a int, g geometry(trianglezm, 0) );
+CREATE TABLE tm.trianglezm1 (a int, g geometry(trianglezm, 1) );
+
 SELECT * from geometry_columns ORDER BY 3;
 
 -- TODO: test that you can only insert compatible types

diff --git a/regress/typmod_expected b/regress/typmod_expected
index af868cd906fc4db619291a764c43da6c1d31bc86..19ce667d3f9901556f8e4b8e75f33fbe9c68414f 100644 (file)
--- a/regress/typmod_expected
+++ b/regress/typmod_expected
@@ -1,3 +1,42 @@
+postgis_reg|tm|circularstring|g|2|0|CIRCULARSTRING
+postgis_reg|tm|circularstring0|g|2|0|CIRCULARSTRING
+postgis_reg|tm|circularstring1|g|2|1|CIRCULARSTRING
+postgis_reg|tm|circularstringm|g|3|0|CIRCULARSTRINGM
+postgis_reg|tm|circularstringm0|g|3|0|CIRCULARSTRINGM
+postgis_reg|tm|circularstringm1|g|3|1|CIRCULARSTRINGM
+postgis_reg|tm|circularstringz|g|3|0|CIRCULARSTRING
+postgis_reg|tm|circularstringz0|g|3|0|CIRCULARSTRING
+postgis_reg|tm|circularstringz1|g|3|1|CIRCULARSTRING
+postgis_reg|tm|circularstringzm|g|4|0|CIRCULARSTRING
+postgis_reg|tm|circularstringzm0|g|4|0|CIRCULARSTRING
+postgis_reg|tm|circularstringzm1|g|4|1|CIRCULARSTRING
+postgis_reg|tm|compoundcurve|g|2|0|COMPOUNDCURVE
+postgis_reg|tm|compoundcurve0|g|2|0|COMPOUNDCURVE
+postgis_reg|tm|compoundcurve1|g|2|1|COMPOUNDCURVE
+postgis_reg|tm|compoundcurvem|g|3|0|COMPOUNDCURVEM
+postgis_reg|tm|compoundcurvem0|g|3|0|COMPOUNDCURVEM
+postgis_reg|tm|compoundcurvem1|g|3|1|COMPOUNDCURVEM
+postgis_reg|tm|compoundcurvez|g|3|0|COMPOUNDCURVE
+postgis_reg|tm|compoundcurvez0|g|3|0|COMPOUNDCURVE
+postgis_reg|tm|compoundcurvez1|g|3|1|COMPOUNDCURVE
+postgis_reg|tm|compoundcurvezm|g|4|0|COMPOUNDCURVE
+postgis_reg|tm|compoundcurvezm0|g|4|0|COMPOUNDCURVE
+postgis_reg|tm|compoundcurvezm1|g|4|1|COMPOUNDCURVE
+postgis_reg|tm|curvepolygon|g|2|0|CURVEPOLYGON
+postgis_reg|tm|curvepolygon0|g|2|0|CURVEPOLYGON
+postgis_reg|tm|curvepolygon1|g|2|1|CURVEPOLYGON
+postgis_reg|tm|curvepolygonm|g|3|0|CURVEPOLYGONM
+postgis_reg|tm|curvepolygonm0|g|3|0|CURVEPOLYGONM
+postgis_reg|tm|curvepolygonm1|g|3|1|CURVEPOLYGONM
+postgis_reg|tm|curvepolygonz|g|3|0|CURVEPOLYGON
+postgis_reg|tm|curvepolygonz0|g|3|0|CURVEPOLYGON
+postgis_reg|tm|curvepolygonz1|g|3|1|CURVEPOLYGON
+postgis_reg|tm|curvepolygonzm|g|4|0|CURVEPOLYGON
+postgis_reg|tm|curvepolygonzm0|g|4|0|CURVEPOLYGON
+postgis_reg|tm|curvepolygonzm1|g|4|1|CURVEPOLYGON
+postgis_reg|tm|geometry|g|2|0|GEOMETRY
+postgis_reg|tm|geometry0|g|2|0|GEOMETRY
+postgis_reg|tm|geometry1|g|2|1|GEOMETRY
 postgis_reg|tm|geometrycollection|g|2|0|GEOMETRYCOLLECTION
 postgis_reg|tm|geometrycollection0|g|2|0|GEOMETRYCOLLECTION
 postgis_reg|tm|geometrycollection1|g|2|1|GEOMETRYCOLLECTION
@@ -10,6 +49,15 @@ postgis_reg|tm|geometrycollectionz1|g|3|1|GEOMETRYCOLLECTION
 postgis_reg|tm|geometrycollectionzm|g|4|0|GEOMETRYCOLLECTION
 postgis_reg|tm|geometrycollectionzm0|g|4|0|GEOMETRYCOLLECTION
 postgis_reg|tm|geometrycollectionzm1|g|4|1|GEOMETRYCOLLECTION
+postgis_reg|tm|geometrym|g|3|0|GEOMETRYM
+postgis_reg|tm|geometrym0|g|3|0|GEOMETRYM
+postgis_reg|tm|geometrym1|g|3|1|GEOMETRYM
+postgis_reg|tm|geometryz|g|3|0|GEOMETRY
+postgis_reg|tm|geometryz0|g|3|0|GEOMETRY
+postgis_reg|tm|geometryz1|g|3|1|GEOMETRY
+postgis_reg|tm|geometryzm|g|4|0|GEOMETRY
+postgis_reg|tm|geometryzm0|g|4|0|GEOMETRY
+postgis_reg|tm|geometryzm1|g|4|1|GEOMETRY
 postgis_reg|tm|linestring|g|2|0|LINESTRING
 postgis_reg|tm|linestring0|g|2|0|LINESTRING
 postgis_reg|tm|linestring1|g|2|1|LINESTRING
@@ -22,6 +70,18 @@ postgis_reg|tm|linestringz1|g|3|1|LINESTRING
 postgis_reg|tm|linestringzm|g|4|0|LINESTRING
 postgis_reg|tm|linestringzm0|g|4|0|LINESTRING
 postgis_reg|tm|linestringzm1|g|4|1|LINESTRING
+postgis_reg|tm|multicurve|g|2|0|MULTICURVE
+postgis_reg|tm|multicurve0|g|2|0|MULTICURVE
+postgis_reg|tm|multicurve1|g|2|1|MULTICURVE
+postgis_reg|tm|multicurvem|g|3|0|MULTICURVEM
+postgis_reg|tm|multicurvem0|g|3|0|MULTICURVEM
+postgis_reg|tm|multicurvem1|g|3|1|MULTICURVEM
+postgis_reg|tm|multicurvez|g|3|0|MULTICURVE
+postgis_reg|tm|multicurvez0|g|3|0|MULTICURVE
+postgis_reg|tm|multicurvez1|g|3|1|MULTICURVE
+postgis_reg|tm|multicurvezm|g|4|0|MULTICURVE
+postgis_reg|tm|multicurvezm0|g|4|0|MULTICURVE
+postgis_reg|tm|multicurvezm1|g|4|1|MULTICURVE
 postgis_reg|tm|multilinestring|g|2|0|MULTILINESTRING
 postgis_reg|tm|multilinestring0|g|2|0|MULTILINESTRING
 postgis_reg|tm|multilinestring1|g|2|1|MULTILINESTRING
@@ -58,6 +118,18 @@ postgis_reg|tm|multipolygonz1|g|3|1|MULTIPOLYGON
 postgis_reg|tm|multipolygonzm|g|4|0|MULTIPOLYGON
 postgis_reg|tm|multipolygonzm0|g|4|0|MULTIPOLYGON
 postgis_reg|tm|multipolygonzm1|g|4|1|MULTIPOLYGON
+postgis_reg|tm|multisurface|g|2|0|MULTISURFACE
+postgis_reg|tm|multisurface0|g|2|0|MULTISURFACE
+postgis_reg|tm|multisurface1|g|2|1|MULTISURFACE
+postgis_reg|tm|multisurfacem|g|3|0|MULTISURFACEM
+postgis_reg|tm|multisurfacem0|g|3|0|MULTISURFACEM
+postgis_reg|tm|multisurfacem1|g|3|1|MULTISURFACEM
+postgis_reg|tm|multisurfacez|g|3|0|MULTISURFACE
+postgis_reg|tm|multisurfacez0|g|3|0|MULTISURFACE
+postgis_reg|tm|multisurfacez1|g|3|1|MULTISURFACE
+postgis_reg|tm|multisurfacezm|g|4|0|MULTISURFACE
+postgis_reg|tm|multisurfacezm0|g|4|0|MULTISURFACE
+postgis_reg|tm|multisurfacezm1|g|4|1|MULTISURFACE
 postgis_reg|tm|point|g|2|0|POINT
 postgis_reg|tm|point0|g|2|0|POINT
 postgis_reg|tm|point1|g|2|1|POINT
@@ -82,3 +154,39 @@ postgis_reg|tm|polygonz1|g|3|1|POLYGON
 postgis_reg|tm|polygonzm|g|4|0|POLYGON
 postgis_reg|tm|polygonzm0|g|4|0|POLYGON
 postgis_reg|tm|polygonzm1|g|4|1|POLYGON
+postgis_reg|tm|polyhedralsurface|g|2|0|POLYHEDRALSURFACE
+postgis_reg|tm|polyhedralsurface0|g|2|0|POLYHEDRALSURFACE
+postgis_reg|tm|polyhedralsurface1|g|2|1|POLYHEDRALSURFACE
+postgis_reg|tm|polyhedralsurfacem|g|3|0|POLYHEDRALSURFACEM
+postgis_reg|tm|polyhedralsurfacem0|g|3|0|POLYHEDRALSURFACEM
+postgis_reg|tm|polyhedralsurfacem1|g|3|1|POLYHEDRALSURFACEM
+postgis_reg|tm|polyhedralsurfacez|g|3|0|POLYHEDRALSURFACE
+postgis_reg|tm|polyhedralsurfacez0|g|3|0|POLYHEDRALSURFACE
+postgis_reg|tm|polyhedralsurfacez1|g|3|1|POLYHEDRALSURFACE
+postgis_reg|tm|polyhedralsurfacezm|g|4|0|POLYHEDRALSURFACE
+postgis_reg|tm|polyhedralsurfacezm0|g|4|0|POLYHEDRALSURFACE
+postgis_reg|tm|polyhedralsurfacezm1|g|4|1|POLYHEDRALSURFACE
+postgis_reg|tm|tin|g|2|0|TIN
+postgis_reg|tm|tin0|g|2|0|TIN
+postgis_reg|tm|tin1|g|2|1|TIN
+postgis_reg|tm|tinm|g|3|0|TINM
+postgis_reg|tm|tinm0|g|3|0|TINM
+postgis_reg|tm|tinm1|g|3|1|TINM
+postgis_reg|tm|tinz|g|3|0|TIN
+postgis_reg|tm|tinz0|g|3|0|TIN
+postgis_reg|tm|tinz1|g|3|1|TIN
+postgis_reg|tm|tinzm|g|4|0|TIN
+postgis_reg|tm|tinzm0|g|4|0|TIN
+postgis_reg|tm|tinzm1|g|4|1|TIN
+postgis_reg|tm|triangle|g|2|0|TRIANGLE
+postgis_reg|tm|triangle0|g|2|0|TRIANGLE
+postgis_reg|tm|triangle1|g|2|1|TRIANGLE
+postgis_reg|tm|trianglem|g|3|0|TRIANGLEM
+postgis_reg|tm|trianglem0|g|3|0|TRIANGLEM
+postgis_reg|tm|trianglem1|g|3|1|TRIANGLEM
+postgis_reg|tm|trianglez|g|3|0|TRIANGLE
+postgis_reg|tm|trianglez0|g|3|0|TRIANGLE
+postgis_reg|tm|trianglez1|g|3|1|TRIANGLE
+postgis_reg|tm|trianglezm|g|4|0|TRIANGLE
+postgis_reg|tm|trianglezm0|g|4|0|TRIANGLE
+postgis_reg|tm|trianglezm1|g|4|1|TRIANGLE