Align ATTRIBUTE_VALUE_CHOICE with ORA/DB2