Fix failing test

b63701e2 moved the assignment before the query, but we need to capture
our old id before assignment in case we are assigning the id.

activerecord/lib/active_record/persistence.rb

@@ -471,6 +471,7 @@ def update_columns(attributes)
         verify_readonly_attribute(key.to_s)
       end
 
+      id_in_database = self.id_in_database
       attributes.each do |k, v|
         write_attribute_without_type_cast(k, v)
       end