svn commit: r1057120 - in /incubator/lcf/trunk: CHANGES.txt framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java

[kw...@apache.org]

Author: kwright
Date: Mon Jan 10 08:47:14 2011
New Revision: 1057120

URL: http://svn.apache.org/viewvc?rev=1057120&view=rev
Log:
Fix for CONNECTORS-148.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1057120&r1=1057119&r2=1057120&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Mon Jan 10 08:47:14 2011
@@ -14,6 +14,11 @@ forget the index state for an output con
 ======================= Release 0.1 =======================
 Release Date:  See http://incubator.apache.org/connectors for the official release date.
 
+CONNECTORS-148: Creating the database in PostgreSQL failed intermittently
+when a parameter was used for the encoding; the PostgreSQL documentation
+specifies that it must be a quoted string in that case.
+(Karl Wright)
+
 CONNECTORS-146: Problem with document cleanup logic would cause data corruption
 in carrydown data and in hopcount information.
 (Karl Wright)

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java?rev=1057120&r1=1057119&r2=1057120&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java Mon Jan 10 08:47:14 2011
@@ -531,10 +531,8 @@ public class DBInterfacePostgreSQL exten
         null,null,null,true,-1,null,null);
       if (set.getRowCount() == 0)
       {
-        params.clear();
-        params.add("utf8");
-	masterDatabase.executeQuery("CREATE DATABASE "+databaseName+" OWNER="+
-	  userName+" ENCODING=?",params,null,invalidateKeys,null,false,0,null,null);
+	masterDatabase.executeQuery("CREATE DATABASE "+databaseName+" OWNER "+
+	  userName+" ENCODING 'utf8'",null,null,invalidateKeys,null,false,0,null,null);
       }
     }
     catch (ManifoldCFException e)