From e31dd5661f8090e572df46970f4f2c68e7dd300f Mon Sep 17 00:00:00 2001
From: Rahim Kanji <rahim.kanji@outlook.com>
Date: Wed, 21 Aug 2024 22:49:17 +0500
Subject: [PATCH] Moved few methods from PgSQL_Connection.h to
 PgSQL_Connection.cpp

---
 include/PgSQL_Connection.h | 56 ++------------------------------------
 lib/PgSQL_Connection.cpp   | 56 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/include/PgSQL_Connection.h b/include/PgSQL_Connection.h
index 34be4e3a7..a6cfcdd21 100644
--- a/include/PgSQL_Connection.h
+++ b/include/PgSQL_Connection.h
@@ -598,11 +598,6 @@ public:
 
 	inline const PGconn* get_pg_connection() const { return pgsql_conn; }
 	inline int get_pg_server_version() { return PQserverVersion(pgsql_conn); }
-	inline const char* get_pg_server_version_str(char* buff, int buff_size) {
-		const int postgresql_version = get_pg_server_version();
-		snprintf(buff, buff_size, "%d.%d.%d", postgresql_version / 10000, (postgresql_version / 100) % 100, postgresql_version % 100);
-		return buff;
-	}
 	inline int get_pg_protocol_version() { return PQprotocolVersion(pgsql_conn); }
 	inline const char* get_pg_host() { return PQhost(pgsql_conn); }
 	inline const char* get_pg_hostaddr() { return PQhostaddr(pgsql_conn); }
@@ -619,58 +614,13 @@ public:
 	inline int get_pg_client_encoding() { return PQclientEncoding(pgsql_conn); }
 	inline int get_pg_ssl_in_use() { return PQsslInUse(pgsql_conn); }
 	inline ConnStatusType get_pg_connection_status() { return PQstatus(pgsql_conn); }
-	inline const char* get_pg_connection_status_str() {
-		switch (get_pg_connection_status()) {
-		case CONNECTION_OK:
-			return "OK";
-		case CONNECTION_BAD:
-			return "BAD";
-		case CONNECTION_STARTED:
-			return "STARTED";
-		case CONNECTION_MADE:
-			return "MADE";
-		case CONNECTION_AWAITING_RESPONSE:
-			return "AWAITING_RESPONSE";
-		case CONNECTION_AUTH_OK:
-			return "AUTH_OK";
-		case CONNECTION_SETENV:
-			return "SETENV";
-		case CONNECTION_SSL_STARTUP:
-			return "SSL_STARTUP";
-		case CONNECTION_NEEDED:
-			return "NEEDED";
-		case CONNECTION_CHECK_WRITABLE:
-			return "CHECK_WRITABLE";
-		case CONNECTION_CONSUME:
-			return "CONSUME";
-		case CONNECTION_GSS_STARTUP:
-			return "GSS_STARTUP";
-		case CONNECTION_CHECK_TARGET:
-			return "CHECK_TARGET";
-		case CONNECTION_CHECK_STANDBY:
-			return "CHECK_STANDBY";
-		}
-		return "UNKNOWN";
-	}
 	inline PGTransactionStatusType get_pg_transaction_status() { return PQtransactionStatus(pgsql_conn); }
-	inline const char* get_pg_transaction_status_str() {
-		switch (get_pg_transaction_status()) {
-		case PQTRANS_IDLE:
-			return "IDLE";
-		case PQTRANS_ACTIVE:
-			return "ACTIVE";
-		case PQTRANS_INTRANS:
-			return "IN-TRANSACTION";
-		case PQTRANS_INERROR:
-			return "IN-ERROR-TRANSACTION";
-		case PQTRANS_UNKNOWN:
-			return "UNKNOWN";
-		}
-		return "INVALID";
-	}
 	inline int get_pg_is_nonblocking() { return PQisnonblocking(pgsql_conn); }
 	inline int get_pg_is_threadsafe() { return PQisthreadsafe(); }
 	inline const char* get_pg_error_message() { return PQerrorMessage(pgsql_conn); }
+	const char* get_pg_server_version_str(char* buff, int buff_size);
+	const char* get_pg_connection_status_str();
+	const char* get_pg_transaction_status_str();
 
 	//PgSQL_Conn_Param conn_params;
 	PgSQL_ErrorInfo error_info;
diff --git a/lib/PgSQL_Connection.cpp b/lib/PgSQL_Connection.cpp
index d93bd15c1..bf070dbb6 100644
--- a/lib/PgSQL_Connection.cpp
+++ b/lib/PgSQL_Connection.cpp
@@ -2817,3 +2817,59 @@ bool PgSQL_Connection::has_same_connection_options(const PgSQL_Connection* clien
 	}
 	return true;
 }
+
+const char* PgSQL_Connection::get_pg_server_version_str(char* buff, int buff_size) {
+	const int postgresql_version = get_pg_server_version();
+	snprintf(buff, buff_size, "%d.%d.%d", postgresql_version / 10000, (postgresql_version / 100) % 100, postgresql_version % 100);
+	return buff;
+}
+
+const char* PgSQL_Connection::get_pg_connection_status_str() {
+	switch (get_pg_connection_status()) {
+	case CONNECTION_OK:
+		return "OK";
+	case CONNECTION_BAD:
+		return "BAD";
+	case CONNECTION_STARTED:
+		return "STARTED";
+	case CONNECTION_MADE:
+		return "MADE";
+	case CONNECTION_AWAITING_RESPONSE:
+		return "AWAITING_RESPONSE";
+	case CONNECTION_AUTH_OK:
+		return "AUTH_OK";
+	case CONNECTION_SETENV:
+		return "SETENV";
+	case CONNECTION_SSL_STARTUP:
+		return "SSL_STARTUP";
+	case CONNECTION_NEEDED:
+		return "NEEDED";
+	case CONNECTION_CHECK_WRITABLE:
+		return "CHECK_WRITABLE";
+	case CONNECTION_CONSUME:
+		return "CONSUME";
+	case CONNECTION_GSS_STARTUP:
+		return "GSS_STARTUP";
+	case CONNECTION_CHECK_TARGET:
+		return "CHECK_TARGET";
+	case CONNECTION_CHECK_STANDBY:
+		return "CHECK_STANDBY";
+	}
+	return "UNKNOWN";
+}
+
+const char* PgSQL_Connection::get_pg_transaction_status_str() {
+	switch (get_pg_transaction_status()) {
+	case PQTRANS_IDLE:
+		return "IDLE";
+	case PQTRANS_ACTIVE:
+		return "ACTIVE";
+	case PQTRANS_INTRANS:
+		return "IN-TRANSACTION";
+	case PQTRANS_INERROR:
+		return "IN-ERROR-TRANSACTION";
+	case PQTRANS_UNKNOWN:
+		return "UNKNOWN";
+	}
+	return "INVALID";
+}