From 6334c256f4fde314db168b4a88d1634da6a5a291 Mon Sep 17 00:00:00 2001
From: Daniel Henninger <daniel@vorpalcloud.org>
Date: Fri, 11 Jan 2013 10:16:32 -0500
Subject: [PATCH] Fixed up postgres support, needs testing both for compiling
 and functionality.

---
 docs/guide/postgresql.textile | 21 ++++++++++++++++++--
 spectrum/src/sample2.cfg      |  4 ++++
 src/pqxxbackend.cpp           | 36 +++++++++++++++++++++++++----------
 3 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/docs/guide/postgresql.textile b/docs/guide/postgresql.textile
index 85d27c0c..a8f5aa1a 100644
--- a/docs/guide/postgresql.textile
+++ b/docs/guide/postgresql.textile
@@ -1,16 +1,33 @@
 
 h2. 1. Editing the configuration file
 
-To configure Spectrum 2 to use PostgreSQL database, you have to edit following options in database section:
+To configure Spectrum 2 to use PostgreSQL database, you have to edit some or more of the following options in database section.  Please note that connectionstring overrides everything else (aside from type).
 
 |_. Section |_. Key |_. Type |_. Change to value |_. Description |
 | database| type | string | pqxx | Database type - "none", "mysql", "sqlite3", "pqxx". |
 | database| database | string | Name of the already create empty database | Database used to store data. |
 | database| server | string | Database server | Database server. |
+| database| port | string | Database port | Database port. |
 | database| user | string | PostgreSQL user. | PostgreSQL user. |
 | database| password | string | PostgreSQL Password. | PostgreSQL Password. |
 | database| prefix | string | | Prefix of tables in database. |
+| database| connectionstring | string | Postgres connection string | If you set this, it will ignore all other options above aside from type and prefix.  This allows you to set any typical postgres connection string option, separated by spaces (no semicolons). |
 
 h2. 2. Creating the database
 
-Spectrum 2 will create the database on the first execution. Once the database is created, you can remove the CREATE TABLE permissions to the PostgreSQL database user you use to connect the SQL.
\ No newline at end of file
+Spectrum 2 will create the database on the first execution. Once the database is created, you can remove the CREATE TABLE permissions to the PostgreSQL database user you use to connect the SQL.
+
+h2. 3. Some examples
+
+Using connectionstring:
+[database]
+type=pqxx
+connectionstring=host=localhost database=spectrum2 user=myuser password=whatever
+
+Using traditional options:
+[database]
+type=pqxx
+server=localhost
+database=spectrum2
+user=myuser
+password=whatever
diff --git a/spectrum/src/sample2.cfg b/spectrum/src/sample2.cfg
index 0da3b1ec..cc0a7aef 100644
--- a/spectrum/src/sample2.cfg
+++ b/spectrum/src/sample2.cfg
@@ -96,6 +96,10 @@ type = none
 # Prefix used for tables
 #prefix = jabber_
 
+# Connection string (for pqxx only!)
+# If you set this, it ignores every other database option except for type and prefix.
+#connectionstring = host=localhost user=specturm password=secret
+
 [registration]
 # Enable public registrations
 enable_public_registration=1
diff --git a/src/pqxxbackend.cpp b/src/pqxxbackend.cpp
index 90fffb87..f8345bb7 100644
--- a/src/pqxxbackend.cpp
+++ b/src/pqxxbackend.cpp
@@ -48,18 +48,34 @@ void PQXXBackend::disconnect() {
 }
 
 bool PQXXBackend::connect() {
-	LOG4CXX_INFO(logger, "Connecting PostgreSQL server " << CONFIG_STRING(m_config, "database.server") << ", user " <<
-		CONFIG_STRING(m_config, "database.user") << ", database " << CONFIG_STRING(m_config, "database.database") <<
-		", port " << CONFIG_INT(m_config, "database.port")
-	);
 	
-	std::string str = "dbname=";
-	str += CONFIG_STRING(m_config, "database.database") + " ";
-
-	str += "user=" + CONFIG_STRING(m_config, "database.user") + " ";
-
+	std::string connection_str;
+	connection_str = CONFIG_STRING(m_config, "database.connectionstring");
+	if (!connection_str) {
+		LOG4CXX_INFO(logger, "Connecting PostgreSQL server " << CONFIG_STRING(m_config, "database.server") << ", user " <<
+			CONFIG_STRING(m_config, "database.user") << ", database " << CONFIG_STRING(m_config, "database.database") <<
+			", port " << CONFIG_INT(m_config, "database.port")
+		);
+		connection_str = "dbname=";
+		connection_str += CONFIG_STRING(m_config, "database.database");
+		if (CONFIG_STRING(m_config, "database.server")) {
+			connection_str += " host=" + CONFIG_STRING(m_config, "database.server");
+		}
+		if (CONFIG_STRING(m_config, "database.user")) {
+			connection_str += " user=" + CONFIG_STRING(m_config, "database.user");
+		}
+		if (CONFIG_STRING(m_config, "database.password")) {
+			connection_str += " password=" + CONFIG_STRING(m_config, "database.password");
+		}
+		if (CONFIG_STRING(m_config, "database.port")) {
+			connection_str += " port=" + CONFIG_STRING(m_config, "database.password");
+		}
+	}
+	else {
+		LOG4CXX_INFO(logger, "Connecting PostgreSQL server via provided connection string.");
+	}
 	try {
-		m_conn = new pqxx::connection(str);
+		m_conn = new pqxx::connection(connection_str);
 	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());