database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!6339 复合类型的列名为rownum时，查询报错

Browse Source 
Merge pull request !6339 from 雷紫薇/bug#132188
This commit is contained in:
opengauss_bot
2024-09-19 11:24:53 +00:00
committed by Gitee
parent 0e71d0bbbd 9f3f132608
commit f9a3a0afca
6 changed files with 132 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/backend/parser/gram.y
View File

@ -704,7 +704,7 @@ static char* IdentResolveToChar(char *ident, core_yyscan_t yyscanner);
%type <str> Sconst comment_text notify_payload
%type <str> RoleId TypeOwner opt_granted_by opt_boolean_or_string ColId_or_Sconst definer_user definer_expression UserId
%type <list> var_list guc_value_extension_list
%type <str> ColId ColLabel var_name type_function_name param_name charset_collate_name
%type <str> ColId ColLabel ColLabel_with_rownum var_name type_function_name param_name charset_collate_name
%type <node> var_value zone_value
%type <keyword> unreserved_keyword type_func_name_keyword
@ -29653,7 +29653,7 @@ database_name:
access_method:
ColId { $$ = $1; };
attr_name: ColLabel { $$ = $1; };
attr_name: ColLabel_with_rownum { $$ = $1; };
index_name: ColId { $$ = $1; };
@ -29916,6 +29916,19 @@ ColLabel: IDENT
$$ = pstrdup($1);
}
;
ColLabel_with_rownum: IDENT
{
$$ = IdentResolveToChar($1, yyscanner);
}
| '\''IDENT'\'' { $$ = $2; }
| unreserved_keyword { $$ = pstrdup($1); }
| col_name_keyword { $$ = pstrdup($1); }
| type_func_name_keyword { $$ = pstrdup($1); }
| reserved_keyword
{
$$ = pstrdup($1);
}
;
DelimiterStmt: DELIMITER delimiter_str_names END_OF_INPUT
{

13
src/common/interfaces/ecpg/preproc/ecpg.trailer
View File

@ -1571,6 +1571,19 @@ ColLabel: ECPGColLabel { $$ = $1; }
| ECPGunreserved_interval { $$ = $1; }
;
ColLabel_with_rownum: ECPGColLabel { $$ = $1; }
| ECPGTypeName { $$ = $1; }
| CHAR_P { $$ = mm_strdup("char"); }
| CURRENT_P { $$ = mm_strdup("current"); }
| INPUT_P { $$ = mm_strdup("input"); }
| INT_P { $$ = mm_strdup("int"); }
| TO { $$ = mm_strdup("to"); }
| UNION { $$ = mm_strdup("union"); }
| VALUES { $$ = mm_strdup("values"); }
| ECPGCKeywords { $$ = $1; }
| ECPGunreserved_interval { $$ = $1; }
;
ECPGColLabel: ECPGColLabelCommon { $$ = $1; }
| unreserved_keyword { $$ = $1; }
| reserved_keyword { $$ = $1; }

1
src/common/interfaces/ecpg/preproc/ecpg.type
View File

@ -47,6 +47,7 @@
%type <str> civarind
%type <str> ColId
%type <str> ColLabel
%type <str> ColLabel_with_rownum
%type <str> connect_options
%type <str> connection_object
%type <str> connection_target

1
src/common/interfaces/ecpg/preproc/parse.pl
View File

@ -74,6 +74,7 @@ my %replace_types = (
'type_function_name' => 'ignore',
'AnonyBlockStmt' => 'ignore',
'ColLabel' => 'ignore',
'ColLabel_with_rownum' => 'ignore',
'Sconst' => 'ignore',);
# these replace_line commands excise certain keywords from the core keyword

59
src/test/regress/expected/plpgsql_cursor_rowtype.out
View File

@ -65,6 +65,65 @@ END;
NOTICE: Result: (,,,,,)
drop table test_2 cascade;
set behavior_compat_options='allow_procedure_compile_check,disable_record_type_in_dml';
create table t_CurRowtype_Def_Case0001(col1 int primary key,col2 varchar(100));
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "t_currowtype_def_case0001_pkey" for table "t_currowtype_def_case0001"
insert into t_CurRowtype_Def_Case0001 values(1,'one');
insert into t_CurRowtype_Def_Case0001 values(2,'two');
insert into t_CurRowtype_Def_Case0001 values(3,'three');
insert into t_CurRowtype_Def_Case0001 values(4,NULL);
--创建游标rowtype，select 伪列;expect:成功,输出4行
declare
cursor cur_CurRowtype_Def_Case0001_1 is select col1,col2,rownum from t_CurRowtype_Def_Case0001;
source cur_CurRowtype_Def_Case0001_1%rowtype;
begin
open cur_CurRowtype_Def_Case0001_1;
loop
fetch cur_CurRowtype_Def_Case0001_1 into source;
exit when cur_CurRowtype_Def_Case0001_1%notfound;
raise notice '% , % ,% ',source.col1,source.col2,source.rownum;
end loop;
close cur_CurRowtype_Def_Case0001_1;
end;
/
NOTICE: 1 , one ,1
NOTICE: 2 , two ,2
NOTICE: 3 , three ,3
NOTICE: 4 , <NULL> ,4
drop table t_CurRowtype_Def_Case0001;
create table t_CurRowtype_Def_Case0002(col1 int primary key,rownum varchar(100));
ERROR: syntax error at or near "rownum"
LINE 1: ...le t_CurRowtype_Def_Case0002(col1 int primary key,rownum var...
^
create table t_CurRowtype_Def_Case0002(col1 int primary key);
NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "t_currowtype_def_case0002_pkey" for table "t_currowtype_def_case0002"
insert into t_CurRowtype_Def_Case0002 values(1);
select t_CurRowtype_Def_Case0002.rownum from t_CurRowtype_Def_Case0002;
ERROR: column t_currowtype_def_case0002.rownum does not exist
LINE 1: select t_CurRowtype_Def_Case0002.rownum from t_CurRowtype_De...
^
CONTEXT: referenced column: rownum
select rownum from t_CurRowtype_Def_Case0002;
rownum
--------
1
(1 row)
drop table t_CurRowtype_Def_Case0002;
CREATE TYPE type_record AS (
first text,
rownum int4
) ;
ERROR: syntax error at or near "rownum"
LINE 3: rownum int4
^
DECLARE
type rectype is record(rownum int,row2 text);
source rectype := (2, 'dsaw');
BEGIN
raise notice '% , %',source.row2,source.rownum;
END;
/
NOTICE: dsaw , 2
-- Prohibit virtual column insertion
create table t1(col1 varchar(10),col varchar(10));
create table t2(col1 varchar(10),col varchar(10));

43
src/test/regress/sql/plpgsql_cursor_rowtype.sql
View File

@ -70,6 +70,49 @@ drop table test_2 cascade;
set behavior_compat_options='allow_procedure_compile_check,disable_record_type_in_dml';
create table t_CurRowtype_Def_Case0001(col1 int primary key,col2 varchar(100));
insert into t_CurRowtype_Def_Case0001 values(1,'one');
insert into t_CurRowtype_Def_Case0001 values(2,'two');
insert into t_CurRowtype_Def_Case0001 values(3,'three');
insert into t_CurRowtype_Def_Case0001 values(4,NULL);
--创建游标rowtype，select 伪列;expect:成功,输出4行
declare
cursor cur_CurRowtype_Def_Case0001_1 is select col1,col2,rownum from t_CurRowtype_Def_Case0001;
source cur_CurRowtype_Def_Case0001_1%rowtype;
begin
open cur_CurRowtype_Def_Case0001_1;
loop
fetch cur_CurRowtype_Def_Case0001_1 into source;
exit when cur_CurRowtype_Def_Case0001_1%notfound;
raise notice '% , % ,% ',source.col1,source.col2,source.rownum;
end loop;
close cur_CurRowtype_Def_Case0001_1;
end;
/
drop table t_CurRowtype_Def_Case0001;
create table t_CurRowtype_Def_Case0002(col1 int primary key,rownum varchar(100));
create table t_CurRowtype_Def_Case0002(col1 int primary key);
insert into t_CurRowtype_Def_Case0002 values(1);
select t_CurRowtype_Def_Case0002.rownum from t_CurRowtype_Def_Case0002;
select rownum from t_CurRowtype_Def_Case0002;
drop table t_CurRowtype_Def_Case0002;
CREATE TYPE type_record AS (
first text,
rownum int4
) ;
DECLARE
type rectype is record(rownum int,row2 text);
source rectype := (2, 'dsaw');
BEGIN
raise notice '% , %',source.row2,source.rownum;
END;
/
-- Prohibit virtual column insertion
create table t1(col1 varchar(10),col varchar(10));
create table t2(col1 varchar(10),col varchar(10));