libtransport.git Changeset - 319a4d349e74

Changeset - 319a4d349e74

Parent rev.

Child rev.

[Not reviewed]

Merge

0 4 0

HanzZ - 12 years ago 2013-01-11 23:26:54
hanzz.k@gmail.com

Merge remote-tracking branch 'jadestorm/master'

1 file changed with 4 insertions and 4 deletions:

src/pqxxbackend.cpp

0 comments (0 inline, 0 general)

src/pqxxbackend.cpp

➞

Show inline comments

@@ @@ -49,10 +49,10 @@ void PQXXBackend::disconnect() { @@
 bool PQXXBackend::connect() {
 	std::string connection_str;
-	connection_str = CONFIG_STRING(m_config, "database.connectionstring");
+	connection_str = CONFIG_STRING_DEFAULTED(m_config, "database.connectionstring", "");
 	if (connection_str.empty()) {
 		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") <<
+			CONFIG_STRING(m_config, "database.user") << ", dbname " << CONFIG_STRING(m_config, "database.database") <<
 			", port " << CONFIG_INT(m_config, "database.port")
 		);
 		connection_str = "dbname=";
@@ @@ -66,8 +66,8 @@ bool PQXXBackend::connect() { @@
 		if (!CONFIG_STRING(m_config, "database.password").empty()) {
 			connection_str += " password=" + CONFIG_STRING(m_config, "database.password");
+		}
 		if (!CONFIG_STRING(m_config, "database.port").empty()) {
 			connection_str += " port=" + CONFIG_STRING(m_config, "database.password");
 		if (CONFIG_INT(m_config, "database.port") != 0) {
 			connection_str += " port=" + boost:lexical_cast<std::string>(CONFIG_INT(m_config, "database.port"));
+		}
+	}
 	else {

0 comments (0 inline, 0 general)