mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard
MDEV-10134 Add full support for DEFAULT - Added support for using tables with MySQL 5.7 virtual fields, including MySQL 5.7 syntax - Better error messages also for old cases - CREATE ... SELECT now also updates timestamp columns - Blob can now have default values - Added new system variable "check_constraint_checks", to turn of CHECK constraint checking if needed. - Removed some engine independent tests in suite vcol to only test myisam - Moved some tests from 'include' to 't'. Should some day be done for all tests. - FRM version increased to 11 if one uses virtual fields or constraints - Changed to use a bitmap to check if a field has got a value, instead of setting HAS_EXPLICIT_VALUE bit in field flags - Expressions can now be up to 65K in total - Ensure we are not refering to uninitialized fields when handling virtual fields or defaults - Changed check_vcol_func_processor() to return a bitmap of used types - Had to change some functions that calculated cached value in fix_fields to do this in val() or getdate() instead. - store_now_in_TIME() now takes a THD argument - fill_record() now updates default values - Add a lookahead for NOT NULL, to be able to handle DEFAULT 1+1 NOT NULL - Automatically generate a name for constraints that doesn't have a name - Added support for ALTER TABLE DROP CONSTRAINT - Ensure that partition functions register virtual fields used. This fixes some bugs when using virtual fields in a partitioning function
This commit is contained in:
committed by
Sergei Golubchik
parent
23d03a1b1e
commit
db7edfed17
@ -7681,11 +7681,14 @@ err_no_arena:
|
||||
@param fields Item_fields list to be filled
|
||||
@param values values to fill with
|
||||
@param ignore_errors TRUE if we should ignore errors
|
||||
@param update TRUE if update query
|
||||
|
||||
@details
|
||||
fill_record() may set table->auto_increment_field_not_null and a
|
||||
caller should make sure that it is reset after their last call to this
|
||||
function.
|
||||
default functions are executed for inserts.
|
||||
virtual fields are always updated
|
||||
|
||||
@return Status
|
||||
@retval true An error occurred.
|
||||
@ -7694,7 +7697,7 @@ err_no_arena:
|
||||
|
||||
bool
|
||||
fill_record(THD *thd, TABLE *table_arg, List<Item> &fields, List<Item> &values,
|
||||
bool ignore_errors)
|
||||
bool ignore_errors, bool update)
|
||||
{
|
||||
List_iterator_fast<Item> f(fields),v(values);
|
||||
Item *value, *fld;
|
||||
@ -7760,12 +7763,16 @@ fill_record(THD *thd, TABLE *table_arg, List<Item> &fields, List<Item> &values,
|
||||
DBUG_ASSERT(vcol_table == 0 || vcol_table == table);
|
||||
vcol_table= table;
|
||||
}
|
||||
/* Update virtual fields*/
|
||||
|
||||
if (!update && table_arg->default_field &&
|
||||
table_arg->update_default_fields(0, ignore_errors))
|
||||
goto err;
|
||||
/* Update virtual fields */
|
||||
thd->abort_on_warning= FALSE;
|
||||
if (vcol_table && vcol_table->vfield &&
|
||||
update_virtual_fields(thd, vcol_table,
|
||||
vcol_table->triggers ? VCOL_UPDATE_ALL :
|
||||
VCOL_UPDATE_FOR_WRITE))
|
||||
VCOL_UPDATE_FOR_WRITE))
|
||||
goto err;
|
||||
thd->abort_on_warning= save_abort_on_warning;
|
||||
thd->no_errors= save_no_errors;
|
||||
@ -7801,6 +7808,32 @@ void switch_to_nullable_trigger_fields(List<Item> &items, TABLE *table)
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
Prepare Virtual fields and field with default expressions to use
|
||||
trigger fields
|
||||
|
||||
This means redirecting from table->field to
|
||||
table->field_to_fill(), if needed.
|
||||
*/
|
||||
|
||||
void switch_to_nullable_trigger_fields(Field **info, TABLE *table)
|
||||
{
|
||||
Field **trigger_field= table->field_to_fill();
|
||||
|
||||
/* True if we have virtual fields and non_null fields and before triggers */
|
||||
if (info && trigger_field != table->field)
|
||||
{
|
||||
Field **field_ptr;
|
||||
for (field_ptr= info; *field_ptr ; field_ptr++)
|
||||
{
|
||||
Field *field= (*field_ptr);
|
||||
field->default_value->expr_item->walk(&Item::switch_to_nullable_fields_processor, 1, (uchar*) trigger_field);
|
||||
*field_ptr= (trigger_field[field->field_index]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
Test NOT NULL constraint after BEFORE triggers
|
||||
*/
|
||||
@ -7862,7 +7895,8 @@ fill_record_n_invoke_before_triggers(THD *thd, TABLE *table, List<Item> &fields,
|
||||
bool result;
|
||||
Table_triggers_list *triggers= table->triggers;
|
||||
|
||||
result= fill_record(thd, table, fields, values, ignore_errors);
|
||||
result= fill_record(thd, table, fields, values, ignore_errors,
|
||||
event == TRG_EVENT_UPDATE);
|
||||
|
||||
if (!result && triggers)
|
||||
result= triggers->process_triggers(thd, event, TRG_ACTION_BEFORE, TRUE) ||
|
||||
|
Reference in New Issue
Block a user