diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/TypeInfoCache.java b/pgjdbc/src/main/java/org/postgresql/jdbc/TypeInfoCache.java
index 5f24171fc2..1cd28f78ff 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/TypeInfoCache.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/TypeInfoCache.java
@@ -219,7 +219,7 @@ private String getSQLTypeQuery(boolean typoidParam) {
     // (keeping old behaviour of finding types, that should not be found without correct search
     // path)
     StringBuilder sql = new StringBuilder();
-    sql.append("SELECT typinput='array_in'::regproc as is_array, typtype, typname, pg_type.oid ");
+    sql.append("SELECT typinput='pg_catalog.array_in'::regproc as is_array, typtype, typname, pg_type.oid ");
     sql.append("  FROM pg_catalog.pg_type ");
     sql.append("  LEFT JOIN (select ns.oid as nspoid, ns.nspname, r.r ");
     sql.append("          from pg_namespace as ns ");
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java
index dc027b7136..c890668f13 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/DatabaseMetaDataTest.java
@@ -473,4 +473,25 @@ public void testSortedDataTypes() throws SQLException {
       lastType = type;
     }
   }
+
+  @Test
+  public void testGetSqlTypes() throws SQLException {
+    if (TestUtil.haveMinimumServerVersion(conn, ServerVersion.v10)) {
+      try (Connection privileged = TestUtil.openPrivilegedDB()) {
+        try (Statement stmt = privileged.createStatement()) {
+          // create a function called array_in
+          stmt.execute("CREATE OR REPLACE FUNCTION public.array_in(anyarray, oid, integer)\n"
+              + " RETURNS anyarray\n"
+              + " LANGUAGE internal\n"
+              + " STABLE PARALLEL SAFE STRICT\n"
+              + "AS $function$array_in$function$");
+        }
+        DatabaseMetaData dbmd = privileged.getMetaData();
+        ResultSet rs = dbmd.getTypeInfo();
+        try (Statement stmt = privileged.createStatement()) {
+          stmt.execute("drop function public.array_in(anyarray, oid, integer)");
+        }
+      }
+    }
+  }
 }
diff --git a/test-gss/build.gradle b/test-gss/build.gradle
index 23561787d8..06590a84da 100644
--- a/test-gss/build.gradle
+++ b/test-gss/build.gradle
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    implementation('org.codehaus.groovy:groovy-all:2.5.12')
+    implementation('org.codehaus.groovy:groovy-all:3.0.11')
     implementation(group: 'org.postgresql', name: 'postgresql', version: '1.0.0-dev-master-SNAPSHOT')
     testImplementation(group: 'junit', name: 'junit', version: '4.12')
 }