Do not use AddGeometryColumn, to avoid having to write an explicit unknown SRID value.

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

diff --git a/regress/sql-mm-circularstring.sql b/regress/sql-mm-circularstring.sql
index 543f93638f6bd375db65e8c6d3bc3b18a8722bea..f20e9bb0afd5b2d465c08064c18f852116129f19 100644 (file)
--- a/regress/sql-mm-circularstring.sql
+++ b/regress/sql-mm-circularstring.sql
@@ -82,11 +82,11 @@ SELECT 'isRing02', ST_isRing(ST_geomfromewkt('CIRCULARSTRING(
                 -2 0,\r
                 0 -2)'));\r
 \r
-CREATE TABLE public.circularstring (id INTEGER, description VARCHAR);\r
-SELECT AddGeometryColumn('public', 'circularstring', 'the_geom_2d', -1, 'CIRCULARSTRING', 2);\r
-SELECT AddGeometryColumn('public', 'circularstring', 'the_geom_3dm', -1, 'CIRCULARSTRINGM', 3);\r
-SELECT AddGeometryColumn('public', 'circularstring', 'the_geom_3dz', -1, 'CIRCULARSTRING', 3);\r
-SELECT AddGeometryColumn('public', 'circularstring', 'the_geom_4d', -1, 'CIRCULARSTRING', 4);\r
+CREATE TABLE public.circularstring (id INTEGER, description VARCHAR,\r
+the_geom_2d GEOMETRY('CIRCULARSTRING'),\r
+the_geom_3dm GEOMETRY('CIRCULARSTRINGM'),\r
+the_geom_3dz GEOMETRY('CIRCULARSTRINGZ'),\r
+the_geom_4d GEOMETRY('CIRCULARSTRINGZM'));\r
 \r
 INSERT INTO public.circularstring (\r
         id, \r

diff --git a/regress/sql-mm-circularstring_expected b/regress/sql-mm-circularstring_expected
index eb21bea5af58f85a3381e880a1d9693cb80c7fdb..b95f123fce897332c10536f4be4ab7bd8f8dcd02 100644 (file)
--- a/regress/sql-mm-circularstring_expected
+++ b/regress/sql-mm-circularstring_expected
@@ -12,10 +12,6 @@ ERROR:  isring() should only be called on a LINE
 isClosed02|t
 ERROR:  Exception in LWGEOM2GEOS: curved geometry not supported.
 ERROR:  isring() should only be called on a LINE
-public.circularstring.the_geom_2d SRID:-1 TYPE:CIRCULARSTRING DIMS:2 
-public.circularstring.the_geom_3dm SRID:-1 TYPE:CIRCULARSTRINGM DIMS:3 
-public.circularstring.the_geom_3dz SRID:-1 TYPE:CIRCULARSTRING DIMS:3 
-public.circularstring.the_geom_4d SRID:-1 TYPE:CIRCULARSTRING DIMS:4 
 astext01|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)
 astext01|CIRCULARSTRING(-5 0,0 5,5 0,10 -5,15 0)
 astext02|CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731)

diff --git a/regress/sql-mm-compoundcurve.sql b/regress/sql-mm-compoundcurve.sql
index c37ebbd8943f08bcdde560aeea268c32810f2097..a4efbcc86474bb5be41e7dff43849382568453d6 100644 (file)
--- a/regress/sql-mm-compoundcurve.sql
+++ b/regress/sql-mm-compoundcurve.sql
@@ -113,11 +113,12 @@ SELECT 'geometrytype04', geometrytype(ST_geomfromewkt('COMPOUNDCURVE(CIRCULARSTR
                 2 0,\r
                 0 0))'));\r
 \r
-CREATE TABLE public.compoundcurve (id INTEGER, description VARCHAR);\r
-SELECT AddGeometryColumn('public', 'compoundcurve', 'the_geom_2d', -1, 'COMPOUNDCURVE', 2);\r
-SELECT AddGeometryColumn('public', 'compoundcurve', 'the_geom_3dm', -1, 'COMPOUNDCURVEM', 3);\r
-SELECT AddGeometryColumn('public', 'compoundcurve', 'the_geom_3dz', -1, 'COMPOUNDCURVE', 3);\r
-SELECT AddGeometryColumn('public', 'compoundcurve', 'the_geom_4d', -1, 'COMPOUNDCURVE', 4);\r
+CREATE TABLE public.compoundcurve (id INTEGER, description VARCHAR,\r
+the_geom_2d GEOMETRY('COMPOUNDCURVE'),\r
+the_geom_3dm GEOMETRY('COMPOUNDCURVEM'),\r
+the_geom_3dz GEOMETRY('COMPOUNDCURVEZ'),\r
+the_geom_4d GEOMETRY('COMPOUNDCURVEZM')\r
+);\r
 \r
 INSERT INTO public.compoundcurve (\r
                 id,\r

diff --git a/regress/sql-mm-compoundcurve_expected b/regress/sql-mm-compoundcurve_expected
index 11a8205cb19c70e5b850c820776ec6d532a1e5a8..ca3756095e6d3b1f5f7588f63bb8ca14e464ba1d 100644 (file)
--- a/regress/sql-mm-compoundcurve_expected
+++ b/regress/sql-mm-compoundcurve_expected
@@ -14,10 +14,6 @@ ndims03|3
 geometrytype03|COMPOUNDCURVEM
 ndims04|2
 geometrytype04|COMPOUNDCURVE
-public.compoundcurve.the_geom_2d SRID:-1 TYPE:COMPOUNDCURVE DIMS:2 
-public.compoundcurve.the_geom_3dm SRID:-1 TYPE:COMPOUNDCURVEM DIMS:3 
-public.compoundcurve.the_geom_3dz SRID:-1 TYPE:COMPOUNDCURVE DIMS:3 
-public.compoundcurve.the_geom_4d SRID:-1 TYPE:COMPOUNDCURVE DIMS:4 
 astext01|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
 astext02|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))
 astext03|COMPOUNDCURVE(CIRCULARSTRING(0 0,0.267949192431123 1,0.585786437626905 1.4142135623731),(0.585786437626905 1.4142135623731,2 0,0 0))

diff --git a/regress/sql-mm-curvepoly.sql b/regress/sql-mm-curvepoly.sql
index d7504754874e29abd445fbe8c8dbcca53acda13f..6b7e0edeb9e89c86dfa824b65683a44b7ccf57d9 100644 (file)
--- a/regress/sql-mm-curvepoly.sql
+++ b/regress/sql-mm-curvepoly.sql
@@ -113,11 +113,11 @@ SELECT 'ndims05', ST_Ndims(ST_geomfromewkt('CURVEPOLYGON(
                     CIRCULARSTRING(1.5 2 2 0,1 2.5 3 1,3.5 2 2 2),\r
                     (3.5 2 2 2,3.5 4 1 3,1.5 4 1 4,1.5 2 2 0)))'));\r
 \r
-CREATE TABLE public.curvepolygon (id INTEGER, description VARCHAR);\r
-SELECT AddGeometryColumn('public', 'curvepolygon', 'the_geom_2d', -1, 'CURVEPOLYGON', 2);\r
-SELECT AddGeometryColumn('public', 'curvepolygon', 'the_geom_3dm', -1, 'CURVEPOLYGONM', 3);\r
-SELECT AddGeometryColumn('public', 'curvepolygon', 'the_geom_3dz', -1, 'CURVEPOLYGON', 3);\r
-SELECT AddGeometryColumn('public', 'curvepolygon', 'the_geom_4d', -1, 'CURVEPOLYGON', 4);\r
+CREATE TABLE public.curvepolygon (id INTEGER, description VARCHAR,\r
+the_geom_2d GEOMETRY('CURVEPOLYGON'),\r
+the_geom_3dm GEOMETRY('CURVEPOLYGONM'),\r
+the_geom_3dz GEOMETRY('CURVEPOLYGONZ'),\r
+the_geom_4d GEOMETRY('CURVEPOLYGONZM'));\r
 \r
 INSERT INTO public.curvepolygon (\r
                 id,\r

diff --git a/regress/sql-mm-curvepoly_expected b/regress/sql-mm-curvepoly_expected
index a8551066c137628da944095ee27b988bb842b77c..2f914cdad35269a21037d2a63ce4942c54a6d187 100644 (file)
--- a/regress/sql-mm-curvepoly_expected
+++ b/regress/sql-mm-curvepoly_expected
@@ -7,10 +7,6 @@ geometrytype03|CURVEPOLYGONM
 ndims04|2
 geometrytype04|CURVEPOLYGON
 ndims05|4
-public.curvepolygon.the_geom_2d SRID:-1 TYPE:CURVEPOLYGON DIMS:2 
-public.curvepolygon.the_geom_3dm SRID:-1 TYPE:CURVEPOLYGONM DIMS:3 
-public.curvepolygon.the_geom_3dz SRID:-1 TYPE:CURVEPOLYGON DIMS:3 
-public.curvepolygon.the_geom_4d SRID:-1 TYPE:CURVEPOLYGON DIMS:4 
 ST_CurveToLine-201|POLYGON((-2 0,-1.70710678 -0.70710678,-1 -1,-0.29289322 -0.70710678,0 0,0.29289322 -0.70710678,1 -1,1.70710678 -0.70710678,2 0,1.41421356 1.41421356,0 2,-1.41421356 1.41421356,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0))
 ST_CurveToLine-202|POLYGONM((-2 0 0,-1.70710678 -0.70710678 1,-1 -1 2,-0.29289322 -0.70710678 3,0 0 4,0.29289322 -0.70710678 5,1 -1 6,1.70710678 -0.70710678 7,2 0 8,1.41421356 1.41421356 6,0 2 4,-1.41421356 1.41421356 2,-2 0 0),(-1 0 2,0 0.5 4,1 0 6,0 1 4,-1 0 2))
 ST_CurveToLine-203|POLYGON((-2 0 0,-1.70710678 -0.70710678 0.5,-1 -1 1,-0.29289322 -0.70710678 1.5,0 0 2,0.29289322 -0.70710678 2.5,1 -1 3,1.70710678 -0.70710678 3.5,2 0 4,1.41421356 1.41421356 3,0 2 2,-1.41421356 1.41421356 1,-2 0 0),(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1))

diff --git a/regress/sql-mm-multicurve.sql b/regress/sql-mm-multicurve.sql
index d6ac49deaf99c29735358154d341e6d91b480519..5d2ff45f2a2fe8297ddf68dfa4d4f4c59d770893 100644 (file)
--- a/regress/sql-mm-multicurve.sql
+++ b/regress/sql-mm-multicurve.sql
@@ -72,11 +72,11 @@ SELECT 'geometrytype04', geometrytype(ST_geomfromewkt('MULTICURVE((
                 0.26794919243112270647255365849413 1, \r
                 0.5857864376269049511983112757903 1.4142135623730950488016887242097))'));\r
 \r
-CREATE TABLE public.multicurve (id INTEGER, description VARCHAR);\r
-SELECT AddGeometryColumn('public', 'multicurve', 'the_geom_2d', -1, 'MULTICURVE', 2);\r
-SELECT AddGeometryColumn('public', 'multicurve', 'the_geom_3dm', -1, 'MULTICURVEM', 3);\r
-SELECT AddGeometryColumn('public', 'multicurve', 'the_geom_3dz', -1, 'MULTICURVE', 3);\r
-SELECT AddGeometryColumn('public', 'multicurve', 'the_geom_4d', -1, 'MULTICURVE', 4);\r
+CREATE TABLE public.multicurve (id INTEGER, description VARCHAR,\r
+the_geom_2d GEOMETRY('MULTICURVE'),\r
+the_geom_3dm GEOMETRY('MULTICURVEM'),\r
+the_geom_3dz GEOMETRY('MULTICURVEZ'),\r
+the_geom_4d GEOMETRY('MULTICURVEZM'));\r
 \r
 INSERT INTO public.multicurve (\r
         id,\r

diff --git a/regress/sql-mm-multicurve_expected b/regress/sql-mm-multicurve_expected
index 227254fbca59a6e69d895e06f5dfe5b18d4212f1..3ccccf2b9eef07170aa321a1a28c4128b16a8845 100644 (file)
--- a/regress/sql-mm-multicurve_expected
+++ b/regress/sql-mm-multicurve_expected
@@ -6,10 +6,6 @@ ndims03|3
 geometrytype03|MULTICURVEM
 ndims04|2
 geometrytype04|MULTICURVE
-public.multicurve.the_geom_2d SRID:-1 TYPE:MULTICURVE DIMS:2 
-public.multicurve.the_geom_3dm SRID:-1 TYPE:MULTICURVEM DIMS:3 
-public.multicurve.the_geom_3dz SRID:-1 TYPE:MULTICURVE DIMS:3 
-public.multicurve.the_geom_4d SRID:-1 TYPE:MULTICURVE DIMS:4 
 ST_CurveToLine-201|MULTILINESTRING((5 5,3 5,3 3,0 3),(0 0,0.58578644 1.41421356))
 ST_CurveToLine-202|MULTILINESTRINGM((5 5 3,3 5 2,3 3 1,0 3 1),(0 0 0,0.58578644 1.41421356 2))
 ST_CurveToLine-203|MULTILINESTRING((5 5 1,3 5 2,3 3 3,0 3 1),(0 0 0,0.58578644 1.41421356 1))

diff --git a/regress/sql-mm-multisurface.sql b/regress/sql-mm-multisurface.sql
index 306f4c646930f0fc1cb05b7ec1e96c4695bc5d57..43b7a9d2f364ca20962b1ab286c55357f04ae49c 100644 (file)
--- a/regress/sql-mm-multisurface.sql
+++ b/regress/sql-mm-multisurface.sql
@@ -160,11 +160,11 @@ SELECT 'geometrytype04', geometrytype(ST_geomfromewkt('MULTISURFACE(CURVEPOLYGON
                 4 11,\r
                 7 8)))'));\r
 \r
-CREATE TABLE public.multisurface (id INTEGER, description VARCHAR);\r
-SELECT AddGeometryColumn('public', 'multisurface', 'the_geom_2d', -1, 'MULTISURFACE', 2);\r
-SELECT AddGeometryColumn('public', 'multisurface', 'the_geom_3dm', -1, 'MULTISURFACEM', 3);\r
-SELECT AddGeometryColumn('public', 'multisurface', 'the_geom_3dz', -1, 'MULTISURFACE', 3);\r
-SELECT AddGeometryColumn('public', 'multisurface', 'the_geom_4d', -1, 'MULTISURFACE', 4);\r
+CREATE TABLE public.multisurface (id INTEGER, description VARCHAR,\r
+the_geom_2d GEOMETRY('MULTISURFACE'),\r
+the_geom_3dm GEOMETRY('MULTISURFACEM'),\r
+the_geom_3dz GEOMETRY('MULTISURFACEZ'),\r
+the_geom_4d GEOMETRY('MULTISURFACEZM'));\r
 \r
 INSERT INTO public.multisurface (\r
         id, description\r

diff --git a/regress/sql-mm-multisurface_expected b/regress/sql-mm-multisurface_expected
index 3cdb3c05e86e9a5729c2c915b1b7509e9815541b..934b3d50266d432d0e7dc065081776b1889a6a51 100644 (file)
--- a/regress/sql-mm-multisurface_expected
+++ b/regress/sql-mm-multisurface_expected
@@ -6,10 +6,6 @@ ndims03|3
 geometrytype03|MULTISURFACEM
 ndims04|2
 geometrytype04|MULTISURFACE
-public.multisurface.the_geom_2d SRID:-1 TYPE:MULTISURFACE DIMS:2 
-public.multisurface.the_geom_3dm SRID:-1 TYPE:MULTISURFACEM DIMS:3 
-public.multisurface.the_geom_3dz SRID:-1 TYPE:MULTISURFACE DIMS:3 
-public.multisurface.the_geom_4d SRID:-1 TYPE:MULTISURFACE DIMS:4 
 ST_CurveToLine-201|MULTIPOLYGON(((-2 0,-1.70710678 -0.70710678,-1 -1,-0.29289322 -0.70710678,0 0,0.29289322 -0.70710678,1 -1,1.70710678 -0.70710678,2 0,1.41421356 1.41421356,0 2,-1.41421356 1.41421356,-2 0),(-1 0,0 0.5,1 0,0 1,-1 0)),((7 8,10 10,6 14,4 11,7 8)))
 ST_CurveToLine-202|MULTIPOLYGONM(((-2 0 0,-1.70710678 -0.70710678 1,-1 -1 2,-0.29289322 -0.70710678 3,0 0 4,0.29289322 -0.70710678 5,1 -1 6,1.70710678 -0.70710678 7,2 0 8,1.41421356 1.41421356 6,0 2 4,-1.41421356 1.41421356 2,-2 0 0),(-1 0 2,0 0.5 4,1 0 6,0 1 4,-1 0 2)),((7 8 8,10 10 5,6 14 1,4 11 6,7 8 8)))
 ST_CurveToLine-203|MULTIPOLYGON(((-2 0 0,-1.70710678 -0.70710678 0.5,-1 -1 1,-0.29289322 -0.70710678 1.5,0 0 2,0.29289322 -0.70710678 2.5,1 -1 3,1.70710678 -0.70710678 3.5,2 0 4,1.41421356 1.41421356 3,0 2 2,-1.41421356 1.41421356 1,-2 0 0),(-1 0 1,0 0.5 2,1 0 3,0 1 3,-1 0 1)),((7 8 7,10 10 5,6 14 3,4 11 4,7 8 7)))