Fixed postgres auto-update, better error logging.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4185 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/database/DbConnectionManager.java

@@ -664,7 +664,7 @@ public class DbConnectionManager {
         }
         // Postgres properties
         else if (dbName.indexOf("postgres") != -1) {
-            databaseType = DatabaseType.postgres;
+            databaseType = DatabaseType.postgresql;
             // Postgres blows, so disable scrolling result sets.
             scrollResultsSupported = false;
             fetchSizeSupported = false;
@@ -781,7 +781,7 @@ public class DbConnectionManager {
 
         oracle,
 
-        postgres,
+        postgresql,
 
         mysql,
 

src/java/org/jivesoftware/wildfire/container/PluginManager.java

@@ -19,6 +19,7 @@ import org.jivesoftware.admin.AdminConsole;
 import org.jivesoftware.database.DbConnectionManager;
 import org.jivesoftware.util.Log;
 import org.jivesoftware.util.Version;
+import org.jivesoftware.util.LocaleUtils;
 import org.jivesoftware.wildfire.XMPPServer;
 
 import java.io.*;
@@ -368,7 +369,11 @@ public class PluginManager {
                 }
 
                 // Check the plugin's database schema (if it requires one).
-                DbConnectionManager.getSchemaManager().checkPluginSchema(plugin);
+                if (!DbConnectionManager.getSchemaManager().checkPluginSchema(plugin)) {
+                    // The schema was not there and auto-upgrade failed.
+                    Log.error(LocaleUtils.getLocalizedString("upgrade.database.failure"));
+                    System.out.println(LocaleUtils.getLocalizedString("upgrade.database.failure"));
+                }
 
                 // Load any JSP's defined by the plugin.
                 File webXML = new File(pluginDir, "web" + File.separator + "WEB-INF" +