From 8556676e5f5134cd374a905cc4bef09b10162fbf Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 22 Feb 2012 15:33:24 +0000 Subject: [PATCH] Parametrize max user SRID in the SQL file too git-svn-id: http://svn.osgeo.org/postgis/trunk@9256 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/postgis.sql.in.c | 6 +++--- postgis/sqldefines.h.in | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c index 0b9cc490d..ec53da5d3 100644 --- a/postgis/postgis.sql.in.c +++ b/postgis/postgis.sql.in.c @@ -1479,7 +1479,7 @@ $$ LANGUAGE SQL STRICT; ------------------------------------------------------------------- CREATE TABLE spatial_ref_sys ( srid integer not null primary key - check (srid > 0 and srid < 999000), + check (srid > 0 and srid <= SRID_USR_MAX), auth_name varchar(256), auth_srid integer, srtext varchar(2048), @@ -1782,8 +1782,8 @@ BEGIN -- Verify SRID IF ( new_srid_in > 0 ) THEN - IF new_srid_in >= 999000 THEN - RAISE EXCEPTION 'AddGeometryColumn() - SRID must be < 999000'; + IF new_srid_in > SRID_USR_MAX THEN + RAISE EXCEPTION 'AddGeometryColumn() - SRID must be <= %', SRID_USR_MAX; END IF; new_srid := new_srid_in; SELECT SRID INTO sr FROM spatial_ref_sys WHERE SRID = new_srid; diff --git a/postgis/sqldefines.h.in b/postgis/sqldefines.h.in index 5b765e87f..a2bb56b59 100644 --- a/postgis/sqldefines.h.in +++ b/postgis/sqldefines.h.in @@ -19,6 +19,8 @@ #define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''@POSTGIS_BUILD_DATE@''::text AS version' #define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION 'SELECT ''@POSTGIS_SCRIPTS_VERSION@''::text AS version' +#define SRID_USR_MAX @SRID_USR_MAX@ + #endif /* _LWPGIS_DEFINES */ -- 2.40.0