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

modify CreateTrigStmt for copy and equal funcs

Browse Source
This commit is contained in:
mentoswang
2023-04-04 11:42:02 +08:00
committed by totaj
parent f2993f9291
commit 1c3261652b
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/backend/nodes/copyfuncs.cpp
View File

@ -6271,6 +6271,8 @@ static CreateTrigStmt* _copyCreateTrigStmt(const CreateTrigStmt* from)
COPY_SCALAR_FIELD(if_not_exists);
COPY_STRING_FIELD(trgordername);
COPY_SCALAR_FIELD(is_follows);
COPY_STRING_FIELD(schemaname);
return newnode;
}

1
src/common/backend/nodes/equalfuncs.cpp
View File

@ -2280,6 +2280,7 @@ static bool _equalCreateTrigStmt(const CreateTrigStmt* a, const CreateTrigStmt*
COMPARE_SCALAR_FIELD(if_not_exists);
COMPARE_STRING_FIELD(trgordername);
COMPARE_SCALAR_FIELD(is_follows);
COMPARE_STRING_FIELD(schemaname);
return true;
}

5
src/gausskernel/optimizer/commands/trigger.cpp
View File

@ -1454,9 +1454,10 @@ ObjectAddress renametrig(RenameStmt* stmt)
/* Have lock already, so just need to build relcache entry. */
targetrel = relation_open(relid, NoLock);
if (PointerIsValid(stmt->renameTargetList) && PointerIsValid(stmt->renameTargetList->head)) {
if (u_sess->attr.attr_sql.sql_compatibility == B_FORMAT &&
PointerIsValid(stmt->renameTargetList) && PointerIsValid(stmt->renameTargetList->head)) {
RangeVar* trigname = (RangeVar*)lfirst(list_head(stmt->renameTargetList));
if (u_sess->attr.attr_sql.sql_compatibility == B_FORMAT && trigname->schemaname != NULL) {
if (trigname->schemaname != NULL) {
Oid relNamespaceId = RelationGetNamespace(targetrel);
if (relNamespaceId != get_namespace_oid(trigname->schemaname, false)) {
ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),

2
src/test/regress/expected/mysql_trigger.out
View File

@ -980,7 +980,7 @@ ERROR: trigger "animals_trigger2_2" for relation "animals_scm" already exists
alter trigger testscm_no.animals_trigger2_2 on testscm.animals_scm rename to animals_trigger2_3;
ERROR: schema "testscm_no" does not exist
drop trigger testscm.animals_trigger2_2 on testscm.animals_scm;
-- 1.6 set search_path to schema
-- 1.4 set search_path to schema
set search_path to testscm;
create trigger animals_trigger2
after insert on animals_scm

3
src/test/regress/sql/mysql_trigger.sql
View File

@ -91,7 +91,6 @@ delete from testscm.food_scm;
drop trigger animals_trigger3;
drop trigger animals_trigger3;
select tgname from pg_trigger;
-- 1.1.1.2 trigger with right schema
create trigger testscm.animals_trigger2
after insert on testscm.animals_scm
@ -547,7 +546,7 @@ select tgname from pg_trigger;
alter trigger testscm.animals_trigger2_1 on testscm.animals_scm rename to animals_trigger2_2;
alter trigger testscm_no.animals_trigger2_2 on testscm.animals_scm rename to animals_trigger2_3;
drop trigger testscm.animals_trigger2_2 on testscm.animals_scm;
-- 1.6 set search_path to schema
-- 1.4 set search_path to schema
set search_path to testscm;
create trigger animals_trigger2
after insert on animals_scm