chore: refactoring pg sql queries to be fully qualified (#1561)

sergiyvamz · web-flow · commit b62183b851fa · 2025-10-15T22:31:45.000-07:00
diff --git a/examples/AWSDriverExample/src/main/java/software/amazon/AwsCredentialsManagerExample.java b/examples/AWSDriverExample/src/main/java/software/amazon/AwsCredentialsManagerExample.java
@@ -61,7 +61,7 @@ public static void main(String[] args) throws SQLException {
     // Connect to Postgres
     try (Connection conn = DriverManager.getConnection(POSTGRESQL_CONNECTION_STRING, postgresProps);
          Statement statement = conn.createStatement();
-         ResultSet result = statement.executeQuery("SELECT aurora_db_instance_identifier()")) {
+         ResultSet result = statement.executeQuery("SELECT pg_catalog.aurora_db_instance_identifier()")) {
 
       System.out.println(Util.getResult(result));
     }
diff --git a/examples/AWSDriverExample/src/main/java/software/amazon/AwsIamAuthenticationDatasourceExample.java b/examples/AWSDriverExample/src/main/java/software/amazon/AwsIamAuthenticationDatasourceExample.java
@@ -65,7 +65,7 @@ public static void main(String[] args) throws SQLException {
       // Attempt a connection:
       try (final Connection conn = ds.getConnection();
           final Statement statement = conn.createStatement();
-          final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {
+          final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {
         System.out.println(Util.getResult(rs));
       }
     }
diff --git a/examples/AWSDriverExample/src/main/java/software/amazon/AwsIamAuthenticationPostgresqlExample.java b/examples/AWSDriverExample/src/main/java/software/amazon/AwsIamAuthenticationPostgresqlExample.java
@@ -40,7 +40,7 @@ public static void main(String[] args) throws SQLException {
     // Attempt a connection
     try (Connection conn = DriverManager.getConnection(POSTGRESQL_CONNECTION_STRING, properties);
         Statement statement = conn.createStatement();
-        ResultSet result = statement.executeQuery("select aurora_db_instance_identifier()")) {
+        ResultSet result = statement.executeQuery("select pg_catalog.aurora_db_instance_identifier()")) {
 
       System.out.println(Util.getResult(result));
     }
diff --git a/examples/AWSDriverExample/src/main/java/software/amazon/LimitlessPostgresqlExample.java b/examples/AWSDriverExample/src/main/java/software/amazon/LimitlessPostgresqlExample.java
@@ -62,7 +62,7 @@ public static void main(String[] args) throws SQLException, InterruptedException
     try (final Connection conn = ds.getConnection(USER, PASSWORD);
          final Statement statement = conn.createStatement();
     ) {
-      final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()");
+      final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()");
       System.out.println(Util.getResult(rs));
     } catch (Exception e) {
       System.out.println(e);
diff --git a/examples/AWSDriverExample/src/main/java/software/amazon/TelemetryMetricsOTLPExample.java b/examples/AWSDriverExample/src/main/java/software/amazon/TelemetryMetricsOTLPExample.java
@@ -43,8 +43,8 @@ public class TelemetryMetricsOTLPExample {
   private static final String USERNAME = "username";
   private static final String PASSWORD = "password";
 
-  private static final String SQL_DBLIST = "select datname from pg_database;";
-  private static final String SQL_SLEEP = "select pg_sleep(20);";
+  private static final String SQL_DBLIST = "select datname from pg_catalog.pg_database;";
+  private static final String SQL_SLEEP = "select pg_catalog.pg_sleep(20);";
 
   public TelemetryMetricsOTLPExample() {
   }
diff --git a/examples/AWSDriverExample/src/main/java/software/amazon/TelemetryTracingXRayExample.java b/examples/AWSDriverExample/src/main/java/software/amazon/TelemetryTracingXRayExample.java
@@ -35,8 +35,8 @@ public class TelemetryTracingXRayExample {
   private static final String USERNAME = "username";
   private static final String PASSWORD = "password";
 
-  private static final String SQL_DBLIST = "select datname from pg_database;";
-  private static final String SQL_SLEEP = "select pg_sleep(20);";
+  private static final String SQL_DBLIST = "select datname from pg_catalog.pg_database;";
+  private static final String SQL_SLEEP = "select pg_catalog.pg_sleep(20);";
 
   public static void main(String[] args) throws SQLException {
     // Initiating an XRay recorder in the code
diff --git a/examples/DBCPExample/src/main/java/software/amazon/DBCPIamExample.java b/examples/DBCPExample/src/main/java/software/amazon/DBCPIamExample.java
@@ -38,7 +38,7 @@ public static void main(String[] args) throws SQLException {
       // Attempt a connection:
       try (final Connection conn = ds.getConnection();
           final Statement statement = conn.createStatement();
-          final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {
+          final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {
         if (rs.next()) {
           System.out.println(rs.getString(1));
         }
diff --git a/examples/DBCPExample/src/main/java/software/amazon/DBCPSimpleExample.java b/examples/DBCPExample/src/main/java/software/amazon/DBCPSimpleExample.java
@@ -39,7 +39,7 @@ public static void main(String[] args) throws SQLException {
 
       try (final Connection conn = ds.getConnection();
           final Statement statement = conn.createStatement();
-          final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {
+          final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {
         if (rs.next()) {
           System.out.println(rs.getString(1));
         }
diff --git a/examples/HikariExample/src/main/java/software/amazon/HikariExample.java b/examples/HikariExample/src/main/java/software/amazon/HikariExample.java
@@ -63,7 +63,7 @@ public static void main(String[] args) throws SQLException {
       // Attempt a connection:
       try (final Connection conn = ds.getConnection();
           final Statement statement = conn.createStatement();
-          final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {
+          final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {
         while (rs.next()) {
           System.out.println(rs.getString(1));
         }
diff --git a/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java b/examples/HikariExample/src/main/java/software/amazon/HikariFailoverExample.java
@@ -77,7 +77,7 @@ public static void main(String[] args) throws SQLException {
       // Attempt a connection:
       try (final Connection conn = ds.getConnection();
           final Statement statement = conn.createStatement();
-          final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {
+          final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {
         while (rs.next()) {
           System.out.println(rs.getString(1));
         }
diff --git a/examples/SpringHibernateBalancedReaderOneDataSourceExample/src/main/java/example/data/BookRepository.java b/examples/SpringHibernateBalancedReaderOneDataSourceExample/src/main/java/example/data/BookRepository.java
@@ -23,12 +23,12 @@
 @Repository
 public interface BookRepository extends JpaRepository<Book, Integer> {
 
-  @Query(value = "select aurora_db_instance_identifier()", nativeQuery = true)
+  @Query(value = "select pg_catalog.aurora_db_instance_identifier()", nativeQuery = true)
   String getNodeId();
 
-  @Query(value = "select pg_backend_pid()", nativeQuery = true)
+  @Query(value = "select pg_catalog.pg_backend_pid()", nativeQuery = true)
   long getNodeSessionId();
 
-  @Query(value = "select cast(pg_sleep(120) as text)", nativeQuery = true)
+  @Query(value = "select cast(pg_catalog.pg_sleep(120) as text)", nativeQuery = true)
   void sleepQuery();
 }
diff --git a/examples/SpringHibernateBalancedReaderTwoDataSourceExample/src/main/java/example/data/BookRepository.java b/examples/SpringHibernateBalancedReaderTwoDataSourceExample/src/main/java/example/data/BookRepository.java
@@ -23,12 +23,12 @@
 @Repository
 public interface BookRepository extends JpaRepository<Book, Integer> {
 
-  @Query(value = "select aurora_db_instance_identifier()", nativeQuery = true)
+  @Query(value = "select pg_catalog.aurora_db_instance_identifier()", nativeQuery = true)
   String getNodeId();
 
-  @Query(value = "select pg_backend_pid()", nativeQuery = true)
+  @Query(value = "select pg_catalog.pg_backend_pid()", nativeQuery = true)
   long getNodeSessionId();
 
-  @Query(value = "select cast(pg_sleep(120) as text)", nativeQuery = true)
+  @Query(value = "select cast(pg_catalog.pg_sleep(120) as text)", nativeQuery = true)
   void sleepQuery();
 }
diff --git a/examples/VertxExample/README.md b/examples/VertxExample/README.md
@@ -101,7 +101,7 @@ This will map requests to certain paths to methods you will define. This particu
 
 ```java
 private void getCurrentInstance(RoutingContext routingContext) {
-    write.query("select aurora_db_instance_identifier() as id, case when pg_is_in_recovery() then 'reader' else 'writer' end as role")
+    write.query("select pg_catalog.aurora_db_instance_identifier() as id, case when pg_catalog.pg_is_in_recovery() then 'reader' else 'writer' end as role")
     .execute()
     .onSuccess(
         rows -> {
diff --git a/examples/VertxExample/src/main/java/com/example/starter/MainVerticle.java b/examples/VertxExample/src/main/java/com/example/starter/MainVerticle.java
@@ -88,7 +88,7 @@ public void start(Promise<Void> startPromise) throws Exception {
   }
 
   private void getCurrentInstance(RoutingContext routingContext) {
-    write.query("select aurora_db_instance_identifier() as id, case when pg_is_in_recovery() then 'reader' else 'writer' end as role").execute().onSuccess(
+    write.query("select pg_catalog.aurora_db_instance_identifier() as id, case when pg_catalog.pg_is_in_recovery() then 'reader' else 'writer' end as role").execute().onSuccess(
       rows -> {
         for (Row row : rows) {
           Instance instance = new Instance(
@@ -107,7 +107,7 @@ private void getCurrentInstance(RoutingContext routingContext) {
   }
 
   private void getTopology(RoutingContext routingContext) {
-    write.query("select server_id from aurora_replica_status()").execute().onSuccess(
+    write.query("select server_id from pg_catalog.aurora_replica_status()").execute().onSuccess(
       rows -> {
         ArrayList<String> arr = new ArrayList<>();
         for (Row row : rows) {
diff --git a/wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java b/wrapper/src/main/java/software/amazon/jdbc/dialect/AuroraPgDialect.java
@@ -36,33 +36,37 @@ public class AuroraPgDialect extends PgDialect implements AuroraLimitlessDialect
 
   private static final String extensionsSql =
       "SELECT (setting LIKE '%aurora_stat_utils%') AS aurora_stat_utils "
-          + "FROM pg_settings "
-          + "WHERE name='rds.extensions'";
+          + "FROM pg_catalog.pg_settings "
+          + "WHERE name OPERATOR(pg_catalog.=) 'rds.extensions'";
 
-  private static final String topologySql = "SELECT 1 FROM aurora_replica_status() LIMIT 1";
+  private static final String topologySql = "SELECT 1 FROM pg_catalog.aurora_replica_status() LIMIT 1";
 
   private static final String TOPOLOGY_QUERY =
-      "SELECT SERVER_ID, CASE WHEN SESSION_ID = 'MASTER_SESSION_ID' THEN TRUE ELSE FALSE END, "
+      "SELECT SERVER_ID, CASE WHEN SESSION_ID OPERATOR(pg_catalog.=) 'MASTER_SESSION_ID' THEN TRUE ELSE FALSE END, "
           + "CPU, COALESCE(REPLICA_LAG_IN_MSEC, 0), LAST_UPDATE_TIMESTAMP "
-          + "FROM aurora_replica_status() "
+          + "FROM pg_catalog.aurora_replica_status() "
           // filter out nodes that haven't been updated in the last 5 minutes
-          + "WHERE EXTRACT(EPOCH FROM(NOW() - LAST_UPDATE_TIMESTAMP)) <= 300 OR SESSION_ID = 'MASTER_SESSION_ID' "
+          + "WHERE EXTRACT("
+          + "EPOCH FROM(pg_catalog.NOW() OPERATOR(pg_catalog.-) LAST_UPDATE_TIMESTAMP)) OPERATOR(pg_catalog.<=) 300 "
+          + "OR SESSION_ID OPERATOR(pg_catalog.=) 'MASTER_SESSION_ID' "
           + "OR LAST_UPDATE_TIMESTAMP IS NULL";
 
   private static final String IS_WRITER_QUERY =
-      "SELECT SERVER_ID FROM aurora_replica_status() "
-          + "WHERE SESSION_ID = 'MASTER_SESSION_ID' AND SERVER_ID = aurora_db_instance_identifier()";
+      "SELECT SERVER_ID FROM pg_catalog.aurora_replica_status() "
+          + "WHERE SESSION_ID OPERATOR(pg_catalog.=) 'MASTER_SESSION_ID' "
+          + "AND SERVER_ID OPERATOR(pg_catalog.=) pg_catalog.aurora_db_instance_identifier()";
 
-  private static final String NODE_ID_QUERY = "SELECT aurora_db_instance_identifier()";
-  private static final String IS_READER_QUERY = "SELECT pg_is_in_recovery()";
+  private static final String NODE_ID_QUERY = "SELECT pg_catalog.aurora_db_instance_identifier()";
+  private static final String IS_READER_QUERY = "SELECT pg_catalog.pg_is_in_recovery()";
   protected static final String LIMITLESS_ROUTER_ENDPOINT_QUERY =
-      "select router_endpoint, load from aurora_limitless_router_endpoints()";
+      "select router_endpoint, load from pg_catalog.aurora_limitless_router_endpoints()";
 
   private static final String BG_STATUS_QUERY =
-      "SELECT * FROM get_blue_green_fast_switchover_metadata('aws_jdbc_driver-" + DriverInfo.DRIVER_VERSION + "')";
+      "SELECT * FROM "
+        + "pg_catalog.get_blue_green_fast_switchover_metadata('aws_jdbc_driver-" + DriverInfo.DRIVER_VERSION + "')";
 
   private static final String TOPOLOGY_TABLE_EXIST_QUERY =
-      "SELECT 'get_blue_green_fast_switchover_metadata'::regproc";
+      "SELECT 'pg_catalog.get_blue_green_fast_switchover_metadata'::regproc";
 
   @Override
   public boolean isDialect(final Connection connection) {
diff --git a/wrapper/src/main/java/software/amazon/jdbc/dialect/PgDialect.java b/wrapper/src/main/java/software/amazon/jdbc/dialect/PgDialect.java
@@ -60,12 +60,12 @@ public ExceptionHandler getExceptionHandler() {
 
   @Override
   public String getHostAliasQuery() {
-    return "SELECT CONCAT(inet_server_addr(), ':', inet_server_port())";
+    return "SELECT pg_catalog.CONCAT(pg_catalog.inet_server_addr(), ':', pg_catalog.inet_server_port())";
   }
 
   @Override
   public String getServerVersionQuery() {
-    return "SELECT 'version', VERSION()";
+    return "SELECT 'version', pg_catalog.VERSION()";
   }
 
   @Override
@@ -74,7 +74,7 @@ public boolean isDialect(final Connection connection) {
     ResultSet rs = null;
     try {
       stmt = connection.createStatement();
-      rs = stmt.executeQuery("SELECT 1 FROM pg_proc LIMIT 1");
+      rs = stmt.executeQuery("SELECT 1 FROM pg_catalog.pg_proc LIMIT 1");
       if (rs.next()) {
         return true;
       }
diff --git a/wrapper/src/main/java/software/amazon/jdbc/dialect/RdsMultiAzDbClusterPgDialect.java b/wrapper/src/main/java/software/amazon/jdbc/dialect/RdsMultiAzDbClusterPgDialect.java
@@ -42,7 +42,7 @@ public class RdsMultiAzDbClusterPgDialect extends PgDialect {
   // For reader nodes, the query should return a writer node ID. For a writer node, the query should return no data.
   private static final String FETCH_WRITER_NODE_QUERY =
       "SELECT multi_az_db_cluster_source_dbi_resource_id FROM rds_tools.multi_az_db_cluster_source_dbi_resource_id()"
-          + " WHERE multi_az_db_cluster_source_dbi_resource_id !="
+          + " WHERE multi_az_db_cluster_source_dbi_resource_id OPERATOR(pg_catalog.!=)"
           + " (SELECT dbi_resource_id FROM rds_tools.dbi_resource_id())";
 
   private static final String IS_RDS_CLUSTER_QUERY =
@@ -52,7 +52,7 @@ public class RdsMultiAzDbClusterPgDialect extends PgDialect {
 
   private static final String NODE_ID_QUERY = "SELECT dbi_resource_id FROM rds_tools.dbi_resource_id()";
 
-  private static final String IS_READER_QUERY = "SELECT pg_is_in_recovery()";
+  private static final String IS_READER_QUERY = "SELECT pg_catalog.pg_is_in_recovery()";
 
   @Override
   public ExceptionHandler getExceptionHandler() {
diff --git a/wrapper/src/main/java/software/amazon/jdbc/dialect/RdsPgDialect.java b/wrapper/src/main/java/software/amazon/jdbc/dialect/RdsPgDialect.java
@@ -41,8 +41,8 @@ public class RdsPgDialect extends PgDialect implements BlueGreenDialect {
 
   private static final String extensionsSql = "SELECT (setting LIKE '%rds_tools%') AS rds_tools, "
       + "(setting LIKE '%aurora_stat_utils%') AS aurora_stat_utils "
-      + "FROM pg_settings "
-      + "WHERE name='rds.extensions'";
+      + "FROM pg_catalog.pg_settings "
+      + "WHERE name OPERATOR(pg_catalog.=) 'rds.extensions'";
 
   private static final String BG_STATUS_QUERY =
       "SELECT * FROM rds_tools.show_topology('aws_jdbc_driver-" + DriverInfo.DRIVER_VERSION + "')";
diff --git a/wrapper/src/main/resources/aws_advanced_jdbc_wrapper_messages.properties b/wrapper/src/main/resources/aws_advanced_jdbc_wrapper_messages.properties
@@ -210,7 +210,7 @@ LimitlessQueryHelper.unsupportedDialectOrDatabase=Unsupported dialect ''{0}'' en
 LimitlessRouterMonitor.exceptionDuringMonitoringStop=Stopping monitoring after unhandled exception was thrown in Limitless Router Monitoring thread for node {0}.
 LimitlessRouterMonitor.interruptedExceptionDuringMonitoring=Limitless Router Monitoring thread for node {0} was interrupted.
 LimitlessRouterMonitor.invalidQuery=Limitless Connection Plugin has encountered an error obtaining Limitless Router endpoints. Please ensure that you are connecting to an Aurora Limitless Database Shard Group Endpoint URL.
-LimitlessRouterMonitor.invalidRouterLoad=Invalid load metric value of ''{1}''from the transaction router query aurora_limitless_router_endpoints() for transaction router ''{0}''. The load metric value must be a decimal value between 0 and 1. Host weight be assigned a default weight of 1.
+LimitlessRouterMonitor.invalidRouterLoad=Invalid load metric value of ''{1}''from the transaction router query pg_catalog.aurora_limitless_router_endpoints() for transaction router ''{0}''. The load metric value must be a decimal value between 0 and 1. Host weight be assigned a default weight of 1.
 LimitlessRouterMonitor.getNetworkTimeoutError=An error occurred while getting the connection network timeout: {0}
 LimitlessRouterMonitor.openingConnection=Opening Limitless Router Monitor connection to ''{0}''.
 LimitlessRouterMonitor.openedConnection=Opened Limitless Router Monitor connection: {0}.
diff --git a/wrapper/src/test/java/integration/DriverHelper.java b/wrapper/src/test/java/integration/DriverHelper.java
@@ -196,7 +196,7 @@ public static String getHostnameSql(DatabaseEngine databaseEngine) {
       case MARIADB:
         return "SELECT @@hostname";
       case PG:
-        return "SELECT inet_server_addr()";
+        return "SELECT pg_catalog.inet_server_addr()";
       default:
         throw new NotImplementedException(databaseEngine.toString());
     }
diff --git a/wrapper/src/test/java/integration/container/tests/AdvancedPerformanceTest.java b/wrapper/src/test/java/integration/container/tests/AdvancedPerformanceTest.java
@@ -97,7 +97,7 @@ public class AdvancedPerformanceTest {
   private static final int EFM_FAILURE_DETECTION_TIME_MS = 30000;
   private static final int EFM_FAILURE_DETECTION_INTERVAL_MS = 5000;
   private static final int EFM_FAILURE_DETECTION_COUNT = 3;
-  private static final String QUERY = "SELECT pg_sleep(600)"; // 600s -> 10min
+  private static final String QUERY = "SELECT pg_catalog.pg_sleep(600)"; // 600s -> 10min
 
   private static final ConcurrentLinkedQueue<PerfStat> perfDataList = new ConcurrentLinkedQueue<>();
 
diff --git a/wrapper/src/test/java/integration/container/tests/BlueGreenDeploymentTests.java b/wrapper/src/test/java/integration/container/tests/BlueGreenDeploymentTests.java
@@ -108,7 +108,7 @@ public class BlueGreenDeploymentTests {
 
   private static final String PG_AURORA_BG_STATUS_QUERY =
       "SELECT id, SPLIT_PART(endpoint, '.', 1) as hostId, endpoint, port, role, status, version"
-      + " FROM get_blue_green_fast_switchover_metadata('aws_jdbc_driver')";
+      + " FROM pg_catalog.get_blue_green_fast_switchover_metadata('aws_jdbc_driver')";
 
   private static final String PG_RDS_BG_STATUS_QUERY =
       "SELECT * FROM rds_tools.show_topology('aws_jdbc_driver-" + DriverInfo.DRIVER_VERSION + "')";
@@ -558,7 +558,7 @@ private Thread getWrapperBlueExecutingConnectivityMonitoringThread(
           query = "SELECT sleep(5)";
           break;
         case PG:
-          query = "SELECT pg_sleep(5)";
+          query = "SELECT pg_catalog.pg_sleep(5)";
           break;
         default:
           throw new UnsupportedOperationException(
diff --git a/wrapper/src/test/java/integration/container/tests/EFM2Test.java b/wrapper/src/test/java/integration/container/tests/EFM2Test.java
@@ -132,7 +132,7 @@ private String getSleepSql(final long seconds) {
     final DatabaseEngine databaseEngine = TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngine();
     switch (databaseEngine) {
       case PG:
-        return String.format("SELECT pg_sleep(%d)", seconds);
+        return String.format("SELECT pg_catalog.pg_sleep(%d)", seconds);
       case MYSQL:
       case MARIADB:
         return String.format("SELECT sleep(%d)", seconds);
diff --git a/wrapper/src/test/java/integration/container/tests/PerformanceTest.java b/wrapper/src/test/java/integration/container/tests/PerformanceTest.java
@@ -502,7 +502,7 @@ private String getQuerySql(final int seconds) {
         TestEnvironment.getCurrent().getInfo().getRequest().getDatabaseEngine();
     switch (databaseEngine) {
       case PG:
-        return String.format("SELECT pg_sleep(%d)", seconds);
+        return String.format("SELECT pg_catalog.pg_sleep(%d)", seconds);
       case MYSQL:
       case MARIADB:
         return String.format("SELECT sleep(%d)", seconds);
diff --git a/wrapper/src/test/java/integration/container/tests/metrics/DatabasePerformanceMetricTest.java b/wrapper/src/test/java/integration/container/tests/metrics/DatabasePerformanceMetricTest.java
@@ -545,7 +545,7 @@ private String getLongRunningQuery(
 
     switch (databaseEngine) {
       case PG:
-        return "SELECT 9999, pg_sleep(600)"; // 10 min
+        return "SELECT 9999, pg_catalog.pg_sleep(600)"; // 10 min
       case MYSQL:
       case MARIADB:
         //return "SELECT sleep(600)"; // 10 min
@@ -649,9 +649,10 @@ public List<ClusterInstanceInfo> getClusterInstances(
             break;
           case PG:
             retrieveTopologySql =
-                "SELECT SERVER_ID, CASE WHEN SESSION_ID = 'MASTER_SESSION_ID' THEN 1 ELSE 0 END "
-                    + "FROM aurora_replica_status() "
-                    + "ORDER BY CASE WHEN SESSION_ID = 'MASTER_SESSION_ID' THEN 0 ELSE 1 END, SERVER_ID";
+                "SELECT SERVER_ID, CASE WHEN SESSION_ID OPERATOR(pg_catalog.=) 'MASTER_SESSION_ID' THEN 1 ELSE 0 END "
+                    + "FROM pg_catalog.aurora_replica_status() "
+                    + "ORDER BY "
+                    + "CASE WHEN SESSION_ID OPERATOR(pg_catalog.=) 'MASTER_SESSION_ID' THEN 0 ELSE 1 END, SERVER_ID";
             break;
           default:
             throw new UnsupportedOperationException(databaseEngine.toString());
@@ -720,7 +721,7 @@ public Boolean getReadOnly(
             break;
           case PG:
             retrieveReadOnlySql =
-                "SELECT CASE WHEN pg_is_in_recovery() THEN 1 ELSE 0 END";
+                "SELECT CASE WHEN pg_catalog.pg_is_in_recovery() THEN 1 ELSE 0 END";
             break;
           default:
             throw new UnsupportedOperationException(databaseEngine.toString());
diff --git a/wrapper/src/test/java/integration/util/AuroraTestUtility.java b/wrapper/src/test/java/integration/util/AuroraTestUtility.java
diff --git a/wrapper/src/test/java/integration/util/ContainerHelper.java b/wrapper/src/test/java/integration/util/ContainerHelper.java

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static void main(String[] args) throws SQLException {`
`61`	`61`	`// Connect to Postgres`
`62`	`62`	`try (Connection conn = DriverManager.getConnection(POSTGRESQL_CONNECTION_STRING, postgresProps);`
`63`	`63`	`Statement statement = conn.createStatement();`
`64`		`- ResultSet result = statement.executeQuery("SELECT aurora_db_instance_identifier()")) {`
	`64`	`+ ResultSet result = statement.executeQuery("SELECT pg_catalog.aurora_db_instance_identifier()")) {`
`65`	`65`
`66`	`66`	`System.out.println(Util.getResult(result));`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public static void main(String[] args) throws SQLException {`
`65`	`65`	`// Attempt a connection:`
`66`	`66`	`try (final Connection conn = ds.getConnection();`
`67`	`67`	`final Statement statement = conn.createStatement();`
`68`		`- final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {`
	`68`	`+ final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {`
`69`	`69`	`System.out.println(Util.getResult(rs));`
`70`	`70`	`}`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static void main(String[] args) throws SQLException {`
`40`	`40`	`// Attempt a connection`
`41`	`41`	`try (Connection conn = DriverManager.getConnection(POSTGRESQL_CONNECTION_STRING, properties);`
`42`	`42`	`Statement statement = conn.createStatement();`
`43`		`- ResultSet result = statement.executeQuery("select aurora_db_instance_identifier()")) {`
	`43`	`+ ResultSet result = statement.executeQuery("select pg_catalog.aurora_db_instance_identifier()")) {`
`44`	`44`
`45`	`45`	`System.out.println(Util.getResult(result));`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@ public class TelemetryMetricsOTLPExample {`
`43`	`43`	`private static final String USERNAME = "username";`
`44`	`44`	`private static final String PASSWORD = "password";`
`45`	`45`
`46`		`- private static final String SQL_DBLIST = "select datname from pg_database;";`
`47`		`- private static final String SQL_SLEEP = "select pg_sleep(20);";`
	`46`	`+ private static final String SQL_DBLIST = "select datname from pg_catalog.pg_database;";`
	`47`	`+ private static final String SQL_SLEEP = "select pg_catalog.pg_sleep(20);";`
`48`	`48`
`49`	`49`	`public TelemetryMetricsOTLPExample() {`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static void main(String[] args) throws SQLException {`
`38`	`38`	`// Attempt a connection:`
`39`	`39`	`try (final Connection conn = ds.getConnection();`
`40`	`40`	`final Statement statement = conn.createStatement();`
`41`		`- final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {`
	`41`	`+ final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {`
`42`	`42`	`if (rs.next()) {`
`43`	`43`	`System.out.println(rs.getString(1));`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static void main(String[] args) throws SQLException {`
`39`	`39`
`40`	`40`	`try (final Connection conn = ds.getConnection();`
`41`	`41`	`final Statement statement = conn.createStatement();`
`42`		`- final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {`
	`42`	`+ final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {`
`43`	`43`	`if (rs.next()) {`
`44`	`44`	`System.out.println(rs.getString(1));`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public static void main(String[] args) throws SQLException {`
`63`	`63`	`// Attempt a connection:`
`64`	`64`	`try (final Connection conn = ds.getConnection();`
`65`	`65`	`final Statement statement = conn.createStatement();`
`66`		`- final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {`
	`66`	`+ final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {`
`67`	`67`	`while (rs.next()) {`
`68`	`68`	`System.out.println(rs.getString(1));`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public static void main(String[] args) throws SQLException {`
`77`	`77`	`// Attempt a connection:`
`78`	`78`	`try (final Connection conn = ds.getConnection();`
`79`	`79`	`final Statement statement = conn.createStatement();`
`80`		`- final ResultSet rs = statement.executeQuery("SELECT * from aurora_db_instance_identifier()")) {`
	`80`	`+ final ResultSet rs = statement.executeQuery("SELECT * from pg_catalog.aurora_db_instance_identifier()")) {`
`81`	`81`	`while (rs.next()) {`
`82`	`82`	`System.out.println(rs.getString(1));`
`83`	`83`	`}`