Fix postgis_valid_typmod to use gserialized* as an input instead of lwgeom* to get...

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

diff --git a/postgis/geography.h b/postgis/geography.h
index c98b7f22110c54987954c94f7986a9d2df7b4c8c..ceea39ea3a36e930e6381320a2304d9bade8d6cb 100644 (file)
--- a/postgis/geography.h
+++ b/postgis/geography.h
@@ -35,7 +35,7 @@
 */
 
 /* Check that the typmod matches the flags on the lwgeom */
-void postgis_valid_typmod(LWGEOM *lwgeom, int32 typmod);
+void postgis_valid_typmod(const GSERIALIZED *gser, int32_t typmod);
 /* Check that the type is legal in geography (no curves please!) */
 void geography_valid_type(uint8_t type);
 

diff --git a/postgis/geography_inout.c b/postgis/geography_inout.c
index bcd80d5a5d6ae6b75785326ff0fc54aa7aebd2b1..ff1e43d096d70dae4bc5366ade06b5de567d179b 100644 (file)
--- a/postgis/geography_inout.c
+++ b/postgis/geography_inout.c
@@ -133,9 +133,18 @@ Datum geography_in(PG_FUNCTION_ARGS)
        if ( (int)lwgeom->srid <= 0 )
                lwgeom->srid = SRID_DEFAULT;
 
+       /*
+       ** Serialize our lwgeom and set the geodetic flag so subsequent
+       ** functions do the right thing.
+       */
+       g_ser = geography_serialize(lwgeom);
+       /* Clean up temporary object */
+       lwgeom_free(lwgeom);
+       
+       /* Check for typmod agreement */
        if ( geog_typmod >= 0 )
        {
-               postgis_valid_typmod(lwgeom, geog_typmod);
+               postgis_valid_typmod(g_ser, geog_typmod);
                POSTGIS_DEBUG(3, "typmod and geometry were consistent");
        }
        else
@@ -143,17 +152,7 @@ Datum geography_in(PG_FUNCTION_ARGS)
                POSTGIS_DEBUG(3, "typmod was -1");
        }
 
-       /*
-       ** Serialize our lwgeom and set the geodetic flag so subsequent
-       ** functions do the right thing.
-       */
-       g_ser = geography_serialize(lwgeom);
-
-       /* Clean up temporary object */
-       lwgeom_free(lwgeom);
-
        PG_RETURN_POINTER(g_ser);
-
 }
 
 /*

diff --git a/postgis/gserialized_typmod.c b/postgis/gserialized_typmod.c
index e143d3171adcc4b29e28302c3113a8c7a27b7a0a..da2acb8c6e9aa58dd585449e4079bb25196e6d58 100644 (file)
--- a/postgis/gserialized_typmod.c
+++ b/postgis/gserialized_typmod.c
@@ -101,57 +101,50 @@ Datum postgis_typmod_out(PG_FUNCTION_ARGS)
 * Check the consistency of the metadata we want to enforce in the typmod:
 * srid, type and dimensionality. If things are inconsistent, shut down the query.
 */
-void postgis_valid_typmod(LWGEOM *lwgeom, int32 typmod)
+void postgis_valid_typmod(const GSERIALIZED *gser, int32_t typmod)
 {
-       int32 lwgeom_srid;
-       int32 lwgeom_type;
-       int32 lwgeom_z;
-       int32 lwgeom_m;
+       int32 geom_srid = gserialized_get_srid(gser);
+       int32 geom_type = gserialized_get_type(gser);
+       int32 geom_z = gserialized_has_z(gser);
+       int32 geom_m = gserialized_has_m(gser);
        int32 typmod_srid = TYPMOD_GET_SRID(typmod);
        int32 typmod_type = TYPMOD_GET_TYPE(typmod);
        int32 typmod_z = TYPMOD_GET_Z(typmod);
        int32 typmod_m = TYPMOD_GET_M(typmod);
 
-       Assert(lwgeom);
-
-       lwgeom_type = lwgeom->type;
-       lwgeom_srid = lwgeom->srid;
-       lwgeom_z = FLAGS_GET_Z(lwgeom->flags);
-       lwgeom_m = FLAGS_GET_M(lwgeom->flags);
-
        POSTGIS_DEBUG(2, "Entered function");
 
        /* No typmod (-1) => no preferences */
        if (typmod < 0) return;
 
-       POSTGIS_DEBUGF(3, "Got lwgeom(type = %d, srid = %d, hasz = %d, hasm = %d)", lwgeom_type, lwgeom_srid, lwgeom_z, lwgeom_m);
+       POSTGIS_DEBUGF(3, "Got geom(type = %d, srid = %d, hasz = %d, hasm = %d)", geom_type, geom_srid, geom_z, geom_m);
        POSTGIS_DEBUGF(3, "Got typmod(type = %d, srid = %d, hasz = %d, hasm = %d)", typmod_type, typmod_srid, typmod_z, typmod_m);
 
-       /* Typmod has a preference for SRID and lwgeom has a non-default SRID? They had better match. */
-       if ( typmod_srid > 0 && typmod_srid != lwgeom_srid )
+       /* Typmod has a preference for SRID and geom has a non-default SRID? They had better match. */
+       if ( typmod_srid > 0 && typmod_srid != geom_srid )
        {
                ereport(ERROR, (
                            errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                           errmsg("Geometry SRID (%d) does not match column SRID (%d)", lwgeom_srid, typmod_srid) ));
+                           errmsg("Geometry SRID (%d) does not match column SRID (%d)", geom_srid, typmod_srid) ));
        }
 
        /* Typmod has a preference for geometry type. */
        if ( typmod_type > 0 &&
                /* GEOMETRYCOLLECTION column can hold any kind of collection */
-               ((typmod_type == COLLECTIONTYPE && ! (lwgeom_type == COLLECTIONTYPE ||
-                                                     lwgeom_type == MULTIPOLYGONTYPE ||
-                                                     lwgeom_type == MULTIPOINTTYPE ||
-                                                     lwgeom_type == MULTILINETYPE )) ||
+               ((typmod_type == COLLECTIONTYPE && ! (geom_type == COLLECTIONTYPE ||
+                                                     geom_type == MULTIPOLYGONTYPE ||
+                                                     geom_type == MULTIPOINTTYPE ||
+                                                     geom_type == MULTILINETYPE )) ||
                 /* Other types must be strictly equal. */
-                (typmod_type != lwgeom_type)) )
+                (typmod_type != geom_type)) )
        {
                ereport(ERROR, (
                            errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                           errmsg("Geometry type (%s) does not match column type (%s)", lwtype_name(lwgeom_type), lwtype_name(typmod_type)) ));
+                           errmsg("Geometry type (%s) does not match column type (%s)", lwtype_name(geom_type), lwtype_name(typmod_type)) ));
        }
 
        /* Mismatched Z dimensionality. */
-       if ( typmod_z && ! lwgeom_z )
+       if ( typmod_z && ! geom_z )
        {
                ereport(ERROR, (
                            errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -159,7 +152,7 @@ void postgis_valid_typmod(LWGEOM *lwgeom, int32 typmod)
        }
 
        /* Mismatched Z dimensionality (other way). */
-       if ( lwgeom_z && ! typmod_z )
+       if ( geom_z && ! typmod_z )
        {
                ereport(ERROR, (
                            errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -167,7 +160,7 @@ void postgis_valid_typmod(LWGEOM *lwgeom, int32 typmod)
        }
 
        /* Mismatched M dimensionality. */
-       if ( typmod_m && ! lwgeom_m )
+       if ( typmod_m && ! geom_m )
        {
                ereport(ERROR, (
                            errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -175,7 +168,7 @@ void postgis_valid_typmod(LWGEOM *lwgeom, int32 typmod)
        }
 
        /* Mismatched M dimensionality (other way). */
-       if ( lwgeom_m && ! typmod_m )
+       if ( geom_m && ! typmod_m )
        {
                ereport(ERROR, (
                            errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -316,17 +309,14 @@ PG_FUNCTION_INFO_V1(geography_enforce_typmod);
 Datum geography_enforce_typmod(PG_FUNCTION_ARGS)
 {
        GSERIALIZED *arg = (GSERIALIZED*)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-       LWGEOM *lwgeom = NULL;
        int32 typmod = PG_GETARG_INT32(1);
        /* We don't need to have different behavior based on explicitness. */
        /* bool isExplicit = PG_GETARG_BOOL(2); */
 
-       lwgeom = lwgeom_from_gserialized(arg);
-
        /* Check if geometry typmod is consistent with the supplied one. */
-       postgis_valid_typmod(lwgeom, typmod);
+       postgis_valid_typmod(arg, typmod);
 
-       PG_RETURN_POINTER(geography_serialize(lwgeom));
+       PG_RETURN_POINTER(arg);
 }
 
 /*
@@ -338,17 +328,14 @@ PG_FUNCTION_INFO_V1(geometry_enforce_typmod);
 Datum geometry_enforce_typmod(PG_FUNCTION_ARGS)
 {
        GSERIALIZED *arg = (GSERIALIZED*)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-       LWGEOM *lwgeom = NULL;
        int32 typmod = PG_GETARG_INT32(1);
        /* We don't need to have different behavior based on explicitness. */
        /* bool isExplicit = PG_GETARG_BOOL(2); */
 
-       lwgeom = lwgeom_from_gserialized(arg);
-
        /* Check if geometry typmod is consistent with the supplied one. */
-       postgis_valid_typmod(lwgeom, typmod);
+       postgis_valid_typmod(arg, typmod);
 
-       PG_RETURN_POINTER(geometry_serialize(lwgeom));
+       PG_RETURN_POINTER(arg);
 }
 
 

diff --git a/postgis/lwgeom_inout.c b/postgis/lwgeom_inout.c
index 939c77c079f1306e63b4854748d7388d1d9169ae..4facef95abfbe7e472cc4d6ad90a3c66f7d1a01c 100644 (file)
--- a/postgis/lwgeom_inout.c
+++ b/postgis/lwgeom_inout.c
@@ -117,7 +117,7 @@ Datum LWGEOM_in(PG_FUNCTION_ARGS)
 
        if ( geom_typmod >= 0 )
        {
-               postgis_valid_typmod(lwgeom, geom_typmod);
+               postgis_valid_typmod(ret, geom_typmod);
                POSTGIS_DEBUG(3, "typmod and geometry were consistent");
        }
        else
@@ -125,6 +125,8 @@ Datum LWGEOM_in(PG_FUNCTION_ARGS)
                POSTGIS_DEBUG(3, "typmod was -1");
        }
 
+       /* Don't free the parser result (and hence lwgeom) until we have done */
+       /* the typemod check with lwgeom */
        
        PG_RETURN_POINTER(ret);