From bdef76ed8a2a7262d2d81367d0cde05658316427 Mon Sep 17 00:00:00 2001
From: eelke <eelke@eelkeklein.nl>
Date: Thu, 1 Apr 2021 14:55:20 +0200
Subject: [PATCH] Fix errors on PG 9.5 en 9.6 (maybe other versions to)

Closes #68
---
 pglablib/catalog/PgClassContainer.cpp    | 8 ++++----
 pglablib/catalog/PgDatabaseContainer.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pglablib/catalog/PgClassContainer.cpp b/pglablib/catalog/PgClassContainer.cpp
index 4909a82..493ecb7 100644
--- a/pglablib/catalog/PgClassContainer.cpp
+++ b/pglablib/catalog/PgClassContainer.cpp
@@ -7,15 +7,15 @@
 
 std::string PgClassContainer::getLoadQuery() const
 {
-	std::string q = "SELECT oid, relname, relnamespace, reltype, reloftype, "
+    std::string q = "SELECT pg_class.oid, relname, relnamespace, reltype, reloftype, "
 		"  relowner, relam, relfilenode, reltablespace, relpages, "
 		"  reltuples, reltoastrelid, relisshared, relpersistence, "
 		"  relkind, relispopulated, relfrozenxid, relminmxid, "
         "  reloptions, d.description, "
-        "  pg_total_relation_size(oid) AS total_bytes, "
-        "  CASE WHEN relkind='r' THEN pg_indexes_size(oid) ELSE 0 END AS index_bytes, "
+        "  pg_total_relation_size(pg_class.oid) AS total_bytes, "
+        "  CASE WHEN relkind='r' THEN pg_indexes_size(pg_class.oid) ELSE 0 END AS index_bytes, "
         "  CASE WHEN relkind='r' THEN pg_total_relation_size(reltoastrelid) ELSE 0 END AS toast_bytes, "
-        "  relacl, pg_get_viewdef(oid)";
+        "  relacl, pg_get_viewdef(pg_class.oid)";
 
 	if (lessThenVersion(120000))
 		q += ", relhasoids ";
diff --git a/pglablib/catalog/PgDatabaseContainer.cpp b/pglablib/catalog/PgDatabaseContainer.cpp
index d3ddaa0..5609071 100644
--- a/pglablib/catalog/PgDatabaseContainer.cpp
+++ b/pglablib/catalog/PgDatabaseContainer.cpp
@@ -4,8 +4,8 @@
 std::string PgDatabaseContainer::getLoadQuery() const
 {
     return
-        "SELECT oid, datname, datdba, encoding, pg_encoding_to_char(encoding), datcollate,\n"
-        "  datctype, datistemplate, datallowconn, datconnlimit, dattablespace, pg_database_size(oid),\n"
+        "SELECT pg_database.oid, datname, datdba, encoding, pg_encoding_to_char(encoding), datcollate,\n"
+        "  datctype, datistemplate, datallowconn, datconnlimit, dattablespace, pg_database_size(pg_database.oid),\n"
         "  d.description, datacl\n"
         "FROM pg_database\n"
         "  LEFT JOIN pg_catalog.pg_shdescription AS d ON (objoid=pg_database.oid)";