[mapserver-commits] r9049 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2009-05-28 13:58:22 -0400 (Thu, 28 May 2009)
New Revision: 9049

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/mappostgresql.c
Log:
Support non-numeric join criteria (#2006)



Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-05-28 17:48:17 UTC (rev 9048)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-05-28 17:58:22 UTC (rev 9049)
@@ -14,6 +14,8 @@
 Current Version:
 ----------------
 
+- Support non-numeric join criteria (#2006)
+
 - Ensure there's enough room in the SQL to hold a long (#1284)
 
 - Fix filter error in multi-clause filters (#2937)

Modified: branches/branch-5-4/mapserver/mappostgresql.c
===================================================================
--- branches/branch-5-4/mapserver/mappostgresql.c	2009-05-28 17:48:17 UTC (rev 9048)
+++ branches/branch-5-4/mapserver/mappostgresql.c	2009-05-28 17:58:22 UTC (rev 9049)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id:$
+ * $Id$
  *
  * Project:  MapServer
  * Purpose:  Postgres CONNECTIONTYPE support.
@@ -328,7 +328,7 @@
                     "msPOSTGRESQLJoinNext()");
             return MS_FAILURE;
         }
-        sprintf(sql, "SELECT %s FROM %s WHERE %s = %s", columns, join->table, join->to, joininfo->from_value);
+        sprintf(sql, "SELECT %s FROM %s WHERE %s = '%s'", columns, join->table, join->to, joininfo->from_value);
         if(joininfo->layer_debug) {
             msDebug("msPOSTGRESQLJoinNext(): executing %s.\n", sql);
         }