[shardingsphere] branch master updated: Fix the problem that gsql cannot connect in version 3.1.0 #28482 (#28483)

[jianglongtao]

This is an automated email from the ASF dual-hosted git repository.

jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 1aa588741ed Fix the problem that gsql cannot connect in version 3.1.0 
#28482 (#28483)
1aa588741ed is described below

commit 1aa588741ed25faac7ea52a162a5b39f8d8442d0
Author: jiangML <1060319...@qq.com>
AuthorDate: Thu Sep 21 13:39:12 2023 +0800

    Fix the problem that gsql cannot connect in version 3.1.0 #28482 (#28483)
---
 .../compiler/planner/util/SQLFederationFunctionUtils.java           | 3 +++
 .../opengauss/handler/admin/OpenGaussAdminExecutorCreator.java      | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git 
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/planner/util/SQLFederationFunctionUtils.java
 
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/planner/util/SQLFederationFunctionUtils.java
index 4b81671b7c1..b2eb460b9c6 100644
--- 
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/planner/util/SQLFederationFunctionUtils.java
+++ 
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/compiler/planner/util/SQLFederationFunctionUtils.java
@@ -45,6 +45,9 @@ public final class SQLFederationFunctionUtils {
         schemaPlus.add("gs_password_deadline", 
ScalarFunctionImpl.create(SQLFederationFunctionUtils.class, 
"gsPasswordDeadline"));
         schemaPlus.add("intervaltonum", 
ScalarFunctionImpl.create(SQLFederationFunctionUtils.class, "intervalToNum"));
         schemaPlus.add("gs_password_notifyTime", 
ScalarFunctionImpl.create(SQLFederationFunctionUtils.class, 
"gsPasswordNotifyTime"));
+        schemaPlus.add("pg_catalog.gs_password_deadline", 
ScalarFunctionImpl.create(SQLFederationFunctionUtils.class, 
"gsPasswordDeadline"));
+        schemaPlus.add("pg_catalog.intervaltonum", 
ScalarFunctionImpl.create(SQLFederationFunctionUtils.class, "intervalToNum"));
+        schemaPlus.add("pg_catalog.gs_password_notifyTime", 
ScalarFunctionImpl.create(SQLFederationFunctionUtils.class, 
"gsPasswordNotifyTime"));
         if ("pg_catalog".equalsIgnoreCase(schemaName)) {
             schemaPlus.add("pg_catalog.pg_table_is_visible", 
ScalarFunctionImpl.create(SQLFederationFunctionUtils.class, 
"pgTableIsVisible"));
             schemaPlus.add("pg_catalog.pg_get_userbyid", 
ScalarFunctionImpl.create(SQLFederationFunctionUtils.class, "pgGetUserById"));
diff --git 
a/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreator.java
 
b/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreator.java
index 27f9dd01ff9..4db99904965 100644
--- 
a/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreator.java
+++ 
b/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussAdminExecutorCreator.java
@@ -45,8 +45,14 @@ public final class OpenGaussAdminExecutorCreator implements 
DatabaseAdminExecuto
     static {
         SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("VERSION()");
         SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("opengauss_version()");
+        SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("gs_password_deadline()");
+        SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("intervaltonum()");
         
SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("intervaltonum(gs_password_deadline())");
         SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("gs_password_notifytime()");
+        
SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("pg_catalog.gs_password_deadline()");
+        SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("pg_catalog.intervaltonum()");
+        
SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("pg_catalog.intervaltonum(pg_catalog.gs_password_deadline())");
+        
SYSTEM_CATALOG_QUERY_EXPRESSIONS.add("pg_catalog.gs_password_notifytime()");
         SYSTEM_CATALOG_TABLES.add("pg_class");
         SYSTEM_CATALOG_TABLES.add("pg_namespace");
         SYSTEM_CATALOG_TABLES.add("pg_database");