From 40b6d59d199ef8eb3d3e6ad1bb2744ab0cdde9ad Mon Sep 17 00:00:00 2001
From: Xiaofei Wang <wangxiaofeiit@chinamobile.com>
Date: Fri, 17 Jan 2025 10:58:21 +0800
Subject: [PATCH] Support using timezone_hour and timezone_minute as column
 names

---
 src/common/backend/parser/gram.y                   | 2 ++
 src/common/interfaces/libpq/frontend_parser/gram.y | 2 ++
 src/test/regress/expected/hw_to_timestamp.out      | 9 +++++++++
 src/test/regress/sql/hw_to_timestamp.sql           | 9 +++++++++
 4 files changed, 22 insertions(+)

diff --git a/src/common/backend/parser/gram.y b/src/common/backend/parser/gram.y
index aa18064a9a..7eb91b8f5f 100644
--- a/src/common/backend/parser/gram.y
+++ b/src/common/backend/parser/gram.y
@@ -32097,6 +32097,8 @@ unreserved_keyword:
 			| TIES
 			| TIMESTAMP_FORMAT_P
 			| TIME_FORMAT_P
+			| TIMEZONE_HOUR_P
+			| TIMEZONE_MINUTE_P
 			| TRANSACTION
 			| TRANSFORM
 			| TRIGGER
diff --git a/src/common/interfaces/libpq/frontend_parser/gram.y b/src/common/interfaces/libpq/frontend_parser/gram.y
index 773a4c7f9e..0273ec1b86 100755
--- a/src/common/interfaces/libpq/frontend_parser/gram.y
+++ b/src/common/interfaces/libpq/frontend_parser/gram.y
@@ -12201,6 +12201,8 @@ unreserved_keyword:
             | TIES
 			| TIME_FORMAT_P
 			| TIMESTAMP_FORMAT_P
+			| TIMEZONE_HOUR_P
+			| TIMEZONE_MINUTE_P
 			| TRANSACTION
 			| TRANSFORM
 			| TRIGGER
diff --git a/src/test/regress/expected/hw_to_timestamp.out b/src/test/regress/expected/hw_to_timestamp.out
index e837016fe2..e866aebdaa 100644
--- a/src/test/regress/expected/hw_to_timestamp.out
+++ b/src/test/regress/expected/hw_to_timestamp.out
@@ -1261,6 +1261,15 @@ ERROR:  invalid input syntax for type interval: "invalid_timestamp"
 LINE 1: SELECT EXTRACT(TIMEZONE_ABBR FROM 'invalid_timestamp');
                                           ^
 CONTEXT:  referenced column: timezone_extract
+-- 测试TIMEZONE_XXX作为列名
+DROP TABLE IF EXISTS timezone_as_colname;
+NOTICE:  table "timezone_as_colname" does not exist, skipping
+CREATE TABLE timezone_as_colname (
+    timezone_hour text,
+    timezone_minute text,
+    timezone_region text,
+    timezone_abbr text
+);
 SET TIMEZONE TO '-8:30';
 SELECT EXTRACT(TIMEZONE_ABBR FROM TIMESTAMP WITH TIME ZONE '2024-09-02 10:30:00+320');
  timezone_extract 
diff --git a/src/test/regress/sql/hw_to_timestamp.sql b/src/test/regress/sql/hw_to_timestamp.sql
index 6d4f2865b6..e96d6b35e9 100644
--- a/src/test/regress/sql/hw_to_timestamp.sql
+++ b/src/test/regress/sql/hw_to_timestamp.sql
@@ -329,5 +329,14 @@ SELECT EXTRACT(TIMEZONE_MINUTE FROM 'invalid_timestamp');
 SELECT EXTRACT(TIMEZONE_REGION FROM 'invalid_timestamp');
 SELECT EXTRACT(TIMEZONE_ABBR FROM 'invalid_timestamp');
 
+-- 测试TIMEZONE_XXX作为列名
+DROP TABLE IF EXISTS timezone_as_colname;
+CREATE TABLE timezone_as_colname (
+    timezone_hour text,
+    timezone_minute text,
+    timezone_region text,
+    timezone_abbr text
+);
+
 SET TIMEZONE TO '-8:30';
 SELECT EXTRACT(TIMEZONE_ABBR FROM TIMESTAMP WITH TIME ZONE '2024-09-02 10:30:00+320');
\ No newline at end of file
-- 
Gitee