fix result type merge error when func contain enum and char
This commit is contained in:
@ -1275,7 +1275,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = {
|
|||||||
ObLongTextType, /* CharType=>ObMediumTextType */
|
ObLongTextType, /* CharType=>ObMediumTextType */
|
||||||
ObLongTextType, /* CharType=>ObLongTextType */
|
ObLongTextType, /* CharType=>ObLongTextType */
|
||||||
ObVarcharType, /* CharType=>ObBitType */
|
ObVarcharType, /* CharType=>ObBitType */
|
||||||
ObCharType, /* CharType=>ObEnumType */
|
ObVarcharType, /* CharType=>ObEnumType */
|
||||||
ObCharType, /* CharType=>ObSetType */
|
ObCharType, /* CharType=>ObSetType */
|
||||||
ObMaxType, /* CharType=>ObEnumInnerType */
|
ObMaxType, /* CharType=>ObEnumInnerType */
|
||||||
ObMaxType, /* CharType=>ObSetInnerType */
|
ObMaxType, /* CharType=>ObSetInnerType */
|
||||||
@ -1747,7 +1747,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = {
|
|||||||
ObVarcharType, /*ObEnumType=>TimeType */
|
ObVarcharType, /*ObEnumType=>TimeType */
|
||||||
ObVarcharType, /*ObEnumType=>YearType */
|
ObVarcharType, /*ObEnumType=>YearType */
|
||||||
ObVarcharType, /*ObEnumType=>VarcharType */
|
ObVarcharType, /*ObEnumType=>VarcharType */
|
||||||
ObCharType, /*ObEnumType=>CharType */
|
ObVarcharType, /*ObEnumType=>CharType */
|
||||||
ObVarcharType, /*ObEnumType=>HexStringType */
|
ObVarcharType, /*ObEnumType=>HexStringType */
|
||||||
ObMaxType, /*ObEnumType=>ExtendType */
|
ObMaxType, /*ObEnumType=>ExtendType */
|
||||||
ObVarcharType, /*ObEnumType=>UnknownType */
|
ObVarcharType, /*ObEnumType=>UnknownType */
|
||||||
@ -3956,7 +3956,7 @@ static ObObjType MERGE_RESULT_TYPE_ORACLE[ObMaxType][ObMaxType] = {
|
|||||||
ObLongTextType, /* CharType=>ObMediumTextType */
|
ObLongTextType, /* CharType=>ObMediumTextType */
|
||||||
ObLongTextType, /* CharType=>ObLongTextType */
|
ObLongTextType, /* CharType=>ObLongTextType */
|
||||||
ObVarcharType, /* CharType=>ObBitType */
|
ObVarcharType, /* CharType=>ObBitType */
|
||||||
ObCharType, /* CharType=>ObEnumType */
|
ObVarcharType, /* CharType=>ObEnumType */
|
||||||
ObCharType, /* CharType=>ObSetType */
|
ObCharType, /* CharType=>ObSetType */
|
||||||
ObMaxType, /* CharType=>ObEnumInnerType */
|
ObMaxType, /* CharType=>ObEnumInnerType */
|
||||||
ObMaxType, /* CharType=>ObSetInnerType */
|
ObMaxType, /* CharType=>ObSetInnerType */
|
||||||
@ -4428,7 +4428,7 @@ static ObObjType MERGE_RESULT_TYPE_ORACLE[ObMaxType][ObMaxType] = {
|
|||||||
ObVarcharType, /*ObEnumType=>TimeType */
|
ObVarcharType, /*ObEnumType=>TimeType */
|
||||||
ObVarcharType, /*ObEnumType=>YearType */
|
ObVarcharType, /*ObEnumType=>YearType */
|
||||||
ObVarcharType, /*ObEnumType=>VarcharType */
|
ObVarcharType, /*ObEnumType=>VarcharType */
|
||||||
ObCharType, /*ObEnumType=>CharType */
|
ObVarcharType, /*ObEnumType=>CharType */
|
||||||
ObVarcharType, /*ObEnumType=>HexStringType */
|
ObVarcharType, /*ObEnumType=>HexStringType */
|
||||||
ObMaxType, /*ObEnumType=>ExtendType */
|
ObMaxType, /*ObEnumType=>ExtendType */
|
||||||
ObVarcharType, /*ObEnumType=>UnknownType */
|
ObVarcharType, /*ObEnumType=>UnknownType */
|
||||||
|
|||||||
Reference in New Issue
Block a user