[FEAT MERGE] Support gb18030_2022

2023-04-26 15:13:03 +00:00
parent ef51ca80f8
commit 3efcefc29e
27 changed files with 32100 additions and 855 deletions
--- a/src/sql/parser/ob_fast_parser.h
+++ b/src/sql/parser/ob_fast_parser.h
@ -214,7 +214,7 @@ protected:
 				byte_len = 3;																															 \
 			}																																						 \
 		} else if (is_oracle_mode_																										 \
-			&& (CHARSET_GBK == charset_type_ || CHARSET_GB18030 == charset_type_)) {		 \
+			&& (ObCharset::is_gb_charset(charset_type_))) {		 													 \
 			if (pos + 2 < len && -1 != is_gbk_multi_byte_##CHARACTER_NAME(str, pos)) {	 \
 				bool_ret = true;																													 \
 				byte_len = 2;																															 \