From: Sandro Santilli <strk@keybit.net>
Date: Sun, 18 Apr 2010 12:13:36 +0000 (+0000)
Subject: Escape fields named xmin (xmax was already escaped). See issue #504.
X-Git-Tag: 2.0.0alpha1~3022
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c3143ec6159fd1266feb18077bc03027b7af961;p=postgis

Escape fields named xmin (xmax was already escaped). See issue #504.


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

diff --git a/loader/shp2pgsql-core.c b/loader/shp2pgsql-core.c
index 85d8113e5..4624a9a33 100644
--- a/loader/shp2pgsql-core.c
+++ b/loader/shp2pgsql-core.c
@@ -1188,8 +1188,11 @@ ShpLoaderOpenShape(SHPLOADERSTATE *state)
 		 */
 		if (name[0] == '_' ||
 		        ! strcmp(name, "gid") || ! strcmp(name, "tableoid") ||
-		        ! strcmp(name, "cmax") || ! strcmp(name, "xmax") ||
-		        ! strcmp(name, "cmin") || ! strcmp(name, "primary") ||
+		        ! strcmp(name, "cmin") ||
+		        ! strcmp(name, "cmax") ||
+		        ! strcmp(name, "xmin") || 
+			! strcmp(name, "xmax") ||
+			! strcmp(name, "primary") ||
 		        ! strcmp(name, "oid") || ! strcmp(name, "ctid"))
 		{
 			strncpy(name2 + 2, name, MAXFIELDNAMELEN - 2);