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

!4787 修复get_valid_collation中的逻辑错误

Browse Source 
Merge pull request !4787 from cc_db_dev/fix_location_master
This commit is contained in:
opengauss_bot
2024-03-18 03:46:50 +00:00
committed by Gitee
parent 5270561f03 046d5ce64d
commit 8104dac09b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/backend/parser/parse_collate.cpp
View File

@ -143,7 +143,7 @@ FORCE_INLINE static void get_valid_collation(Oid& collation, CollateStrength& st
collation = (context.derivation == DERIVATION_SYSCONST) ?
UTF8_GENERAL_CI_COLLATION_OID : GetCollationConnection();
strength = COLLATE_IMPLICIT;
location = exprCollation(node);
location = exprLocation(node);
derivation = (context.derivation == DERIVATION_IGNORABLE) ? DERIVATION_COERCIBLE : context.derivation;
} else {
/*
@ -154,7 +154,7 @@ FORCE_INLINE static void get_valid_collation(Oid& collation, CollateStrength& st
*/
collation = typcollation;
strength = COLLATE_IMPLICIT;
location = exprCollation(node);
location = exprLocation(node);
derivation = context.derivation;
}
} else {