database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

CASE now aggregates all argument types instead of using the only one argument

Browse Source
This commit is contained in:
bar@bar.mysql.r18.ru
2003-07-17 22:58:05 +05:00
parent 8cffa7b2b4
commit a2f7ef9c8b
2 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
sql/item_cmpfunc.cc
View File

@ -892,13 +892,7 @@ Item *Item_func_case::find_item(String *str)
} }
if ((tmp=args[i]->val_str(str))) // If not null if ((tmp=args[i]->val_str(str))) // If not null
{ {
/* QQ: COERCIBILITY */ if (sortcmp(tmp,first_expr_str,&my_charset_bin)==0)
if (first_expr_is_binary || (args[i]->charset()->state & MY_CS_BINSORT))
{
if (sortcmp(tmp,first_expr_str,&my_charset_bin)==0)
return args[i+1];
}
else if (sortcmp(tmp,first_expr_str,tmp->charset())==0)
return args[i+1]; return args[i+1];
} }
break; break;
@ -988,14 +982,62 @@ double Item_func_case::val()
return res; return res;
} }
static void agg_result_type(Item_result *type, Item **items, uint nitems)
{
uint i;
type[0]= items[0]->result_type();
for (i=1 ; i < nitems ; i++)
type[0]= item_store_type(type[0], items[i]->result_type());
}
static void agg_cmp_type(Item_result *type, Item **items, uint nitems)
{
uint i;
type[0]= items[0]->result_type();
for (i=1 ; i < nitems ; i++)
type[0]= item_cmp_type(type[0], items[i]->result_type());
}
void Item_func_case::fix_length_and_dec() void Item_func_case::fix_length_and_dec()
{ {
Item **agg;
uint nagg;
if (!(agg= (Item**) sql_alloc(sizeof(Item*)*(ncases+1))))
return;
// Aggregate all THEN and ELSE expression types
// and collations when string result
for (nagg= 0 ; nagg < ncases/2 ; nagg++)
agg[nagg]= args[nagg*2+1];
if (else_expr_num != -1)
agg[nagg++]= args[else_expr_num];
agg_result_type(&cached_result_type, agg, nagg);
if ((cached_result_type == STRING_RESULT) &&
agg_arg_collations(collation, agg, nagg))
return;
// Aggregate first expression and all THEN expression types
// and collations when string comparison
if (first_expr_num != -1) if (first_expr_num != -1)
first_expr_is_binary= args[first_expr_num]->charset()->state & MY_CS_BINSORT; {
agg[0]= args[first_expr_num];
for (nagg= 0; nagg < ncases/2 ; nagg++)
agg[nagg+1]= args[nagg];
nagg++;
agg_cmp_type(&cmp_type, agg, nagg);
if ((cmp_type == STRING_RESULT) &&
agg_arg_collations_for_comparison(cmp_collation, agg, nagg))
return;
}
if (!else_expr_num != -1 || args[else_expr_num]->maybe_null) if (!else_expr_num != -1 || args[else_expr_num]->maybe_null)
maybe_null=1; maybe_null=1;
max_length=0; max_length=0;
decimals=0; decimals=0;
cached_result_type = args[1]->result_type(); cached_result_type = args[1]->result_type();

3
sql/item_cmpfunc.h
View File

@ -351,8 +351,9 @@ class Item_func_case :public Item_func
int first_expr_num, else_expr_num; int first_expr_num, else_expr_num;
enum Item_result cached_result_type; enum Item_result cached_result_type;
String tmp_value; String tmp_value;
bool first_expr_is_binary;
uint ncases; uint ncases;
Item_result cmp_type;
DTCollation cmp_collation;
public: public:
Item_func_case(List<Item> &list, Item *first_expr_arg, Item *else_expr_arg) Item_func_case(List<Item> &list, Item *first_expr_arg, Item *else_expr_arg)
:Item_func(), first_expr_num(-1), else_expr_num(-1), :Item_func(), first_expr_num(-1), else_expr_num(-1),