[mapserver-commits] r10114 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-04-24 13:22:28 -0400 (Sat, 24 Apr 2010)
New Revision: 10114

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapfile.c
Log:
Write out join CONNECTIONTYPE when saving a mapfile. (#3435)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-04-24 17:07:20 UTC (rev 10113)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-04-24 17:22:28 UTC (rev 10114)
@@ -15,6 +15,8 @@
 Version 5.6.4 (????-??-??):
 ---------------------------
 
+- Write out join CONNECTIONTYPE when saving a mapfile. (#3435)
+
 - Fixed attribute queries to use an extent stored (and cached) as part of the queryObj
   rather than the map->extent. (#3424)
 

Modified: branches/branch-5-6/mapserver/mapfile.c
===================================================================
--- branches/branch-5-6/mapserver/mapfile.c	2010-04-24 17:07:20 UTC (rev 10113)
+++ branches/branch-5-6/mapserver/mapfile.c	2010-04-24 17:22:28 UTC (rev 10114)
@@ -564,6 +564,19 @@
   if(join->name) fprintf(stream, "        NAME \"%s\"\n", join->name);
   if(join->table) fprintf(stream, "        TABLE \"%s\"\n", join->table);
   if(join->to) fprintf(stream, "        TO \"%s\"\n", join->to);
+  switch (join->connectiontype) {
+  case(MS_DB_CSV): 
+    fprintf(stream, "        CONNECTIONTYPE CSV\n");
+    break;
+  case(MS_DB_POSTGRES):
+    fprintf(stream, "        CONNECTIONTYPE POSTGRES\n");
+    break;
+  case(MS_DB_MYSQL):
+    fprintf(stream, "        CONNECTIONTYPE MYSQL\n");
+    break;
+  default:
+    break;
+  };
   fprintf(stream, "        TYPE %s\n", msJoinType[join->type]);
   fprintf(stream, "      END\n");
 }