[Geotools-commits] svn - r38624 - trunk/modules/plugin/jdbc/jdbc-teradata/src/main/java/org/geotools/data/teradata

[<svn...@os...>]

Author: ischneider
Date: 2012-03-09 08:35:53 -0800 (Fri, 09 Mar 2012)
New Revision: 38624

Modified:
   trunk/modules/plugin/jdbc/jdbc-teradata/src/main/java/org/geotools/data/teradata/TeradataDataStoreFactory.java
Log:
[GEOT-4068] teradata 'LOB Workaround' parameter poorly named

Modified: trunk/modules/plugin/jdbc/jdbc-teradata/src/main/java/org/geotools/data/teradata/TeradataDataStoreFactory.java
===================================================================
--- trunk/modules/plugin/jdbc/jdbc-teradata/src/main/java/org/geotools/data/teradata/TeradataDataStoreFactory.java	2012-03-09 16:35:47 UTC (rev 38623)
+++ trunk/modules/plugin/jdbc/jdbc-teradata/src/main/java/org/geotools/data/teradata/TeradataDataStoreFactory.java	2012-03-09 16:35:53 UTC (rev 38624)
@@ -50,7 +50,7 @@
      */
     public static final Param DBTYPE = new Param("dbtype", String.class, "Type", true, "teradata");
     
-    public static final Param LOBWORKAROUND = new Param("LOB Workaround",Boolean.class,
+    public static final Param LOBWORKAROUND = new Param("Disable LOB Workaround",Boolean.class,
             "Disable LOB workaround", false, Boolean.FALSE);
 
     /**
@@ -131,6 +131,12 @@
         TeradataDialect dialect = (TeradataDialect) dataStore.getSQLDialect();
         
         Boolean lobWorkaround = (Boolean) LOBWORKAROUND.lookUp(params);
+        // check for old name and respect setting if provided and new name is not
+        // NOTE: this will not appear updated in geoserver's UI however
+        if (lobWorkaround == null && params.containsKey("LOB Workaround")) {
+            lobWorkaround = (Boolean) LOBWORKAROUND.handle((String)params.get("LOB Workaround"));
+            params.put(LOBWORKAROUND.key, lobWorkaround.toString());
+        }
         dialect.setLobWorkaroundEnabled(lobWorkaround == null || !lobWorkaround);
 
         Boolean loose = (Boolean) LOOSEBBOX.lookUp(params);