Added field.attname to Options.name_map

The change also removed allow_explicit_fk from sql/query.py.
Fixed #11521 -- usage of field.attname in .update()

Fixed already by previous patch, only test added.