ActiveRecord and ActiveModel 3.1 #58

haileys · 2014-04-11T10:41:21Z

This pull request upgrades the ActiveRecord and ActiveModel components on 3-0-github to 3.1.

ActiveRecord 3.0 suffers from severe performance regressions, especially relating to attribute methods, which are mostly resolved in 3.1: https://gist.github.com/charliesome/10448555

cc @github/perf @github/rails3

ActiveSupport::Dependencies now raises NameError if it finds an existing constant in load_missing_constant. This better reflects the nature of the error which is usually caused by calling constantize on a nested constant. Closes rails#1423 Conflicts: activesupport/CHANGELOG

rsanheim · 2014-04-11T15:56:28Z

Would it be worth adding a benchmark to Model.find(n) and
Model.find_by_name type calls, to compare those across 3.0 and 3.1?
Especially considering the object allocation differences that Aaron's
graph showed between 3.0 and 3.1...I think 3.1 gets worse before things get
better in 4.x.

On Fri, Apr 11, 2014 at 5:41 AM, Charlie Somerville <
notifications@github.com> wrote:

This pull request upgrades the ActiveRecord and ActiveModel components on
3-0-github to 3.1.

ActiveRecord 3.0 suffers from severe performance regressions, especially
relating to attribute methods, which are mostly resolved in 3.1:
https://gist.github.com/charliesome/10448555

cc @github/perf @github/rails3

You can merge this Pull Request by running

git pull https://github.com/github/rails 3-0-github+ar-3-1

Or view, comment on, or merge it at:

#58
Commit Summary

ActiveRecord 3.1 and ActiveModel 3.1

bump activemodel builder dependency to 3.2

bump arel to 2.2.3

import activesupport/core_ext/object/inclusion from 3-2-github

add bcrypt-ruby to Gemfile

remove 1.8 monkey patches that aren't valid anymore

fix activemodel tests

don't warn or be verbose

only test sqlite3

this doesn't exist in the old version of rack we're testing with

our old ActiveSupport doesn't support passing procs to
assert_difference

Raise NameError instead of ArgumentError in
ActiveSupport::Dependencies

work around ruby 2.0 respond_to? changes

fix xml tests

more respond_to fixes

restore AR 3.0 session store

restore old notifier when we're done here

skip the remaining broken tests we don't care about

File Changes

M Gemfile https://github.com/github/rails/pull/58/files#diff-0(2)

M Gemfile.lockhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-1(10)

D activemodel/CHANGELOGhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-2(121)

A activemodel/CHANGELOG.mdhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-3(48)

M activemodel/MIT-LICENSEhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-4(2)

M activemodel/README.rdochttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-5(37)

A activemodel/Rakefilehttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-6(0)

M activemodel/activemodel.gemspechttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-7(5)

M activemodel/lib/active_model.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-8(4)

M activemodel/lib/active_model/attribute_methods.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-9(107)

M activemodel/lib/active_model/callbacks.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-10(9)

M activemodel/lib/active_model/conversion.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-11(10)

D activemodel/lib/active_model/deprecated_error_methods.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-12(33)

M activemodel/lib/active_model/dirty.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-13(9)

M activemodel/lib/active_model/errors.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-14(126)

M activemodel/lib/active_model/lint.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-15(4)

M activemodel/lib/active_model/mass_assignment_security.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-16(150)

M
activemodel/lib/active_model/mass_assignment_security/permission_set.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-17(2)

M activemodel/lib/active_model/naming.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-18(92)

A activemodel/lib/active_model/observer_array.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-19(147)

M activemodel/lib/active_model/observing.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-20(84)

A activemodel/lib/active_model/secure_password.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-21(74)

M activemodel/lib/active_model/serialization.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-22(17)

M activemodel/lib/active_model/serializers/json.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-23(40)

M activemodel/lib/active_model/serializers/xml.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-24(32)

M activemodel/lib/active_model/translation.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-25(15)

M activemodel/lib/active_model/validations.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-26(46)

M activemodel/lib/active_model/validations/acceptance.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-27(8)

M activemodel/lib/active_model/validations/callbacks.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-28(24)

M activemodel/lib/active_model/validations/confirmation.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-29(11)

M activemodel/lib/active_model/validations/exclusion.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-30(30)

M activemodel/lib/active_model/validations/format.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-31(50)

M activemodel/lib/active_model/validations/inclusion.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-32(53)

M activemodel/lib/active_model/validations/length.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-33(14)

M activemodel/lib/active_model/validations/numericality.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-34(10)

M activemodel/lib/active_model/validations/presence.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-35(5)

M activemodel/lib/active_model/validations/validates.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-36(36)

M activemodel/lib/active_model/validations/with.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-37(24)

M activemodel/lib/active_model/validator.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-38(40)

M activemodel/lib/active_model/version.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-39(4)

M activemodel/test/cases/attribute_methods_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-40(17)

M activemodel/test/cases/callbacks_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-41(4)

M activemodel/test/cases/errors_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-42(22)

M activemodel/test/cases/mass_assignment_security/sanitizer_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-43(3)

M activemodel/test/cases/mass_assignment_security_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-44(53)

M activemodel/test/cases/naming_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-45(154)

A activemodel/test/cases/observer_array_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-46(220)

M activemodel/test/cases/observing_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-47(17)

A activemodel/test/cases/secure_password_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-48(58)

A activemodel/test/cases/serialization_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-49(45)

R activemodel/test/cases/serializers/json_serialization_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-50(0)

R activemodel/test/cases/serializers/xml_serialization_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-51(15)

M activemodel/test/cases/translation_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-52(29)

M activemodel/test/cases/validations/conditional_validation_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-53(24)

M activemodel/test/cases/validations/exclusion_validation_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-54(12)

M activemodel/test/cases/validations/format_validation_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-55(26)

M activemodel/test/cases/validations/inclusion_validation_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-56(14)

M activemodel/test/cases/validations/length_validation_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-57(30)

M
activemodel/test/cases/validations/numericality_validation_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-58(2)

M activemodel/test/cases/validations/validates_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-59(45)

M activemodel/test/cases/validations/with_validation_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-60(21)

M activemodel/test/cases/validations_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-61(78)

A activemodel/test/models/administrator.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-62(10)

A activemodel/test/models/blog_post.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-63(13)

M activemodel/test/models/mass_assignment_specific.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-64(21)

A activemodel/test/models/observers.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-65(27)

M activemodel/test/models/person_with_validator.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-66(13)

M activemodel/test/models/topic.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-67(12)

M activemodel/test/models/track_back.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-68(7)

A activemodel/test/models/user.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-69(8)

A activemodel/test/models/visitor.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-70(9)

A activemodel/test/validators/namespace/email_validator.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-71(6)

D activerecord/CHANGELOGhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-72(6242)

A activerecord/CHANGELOG.mdhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-73(521)

M activerecord/MIT-LICENSEhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-74(2)

M activerecord/README.rdochttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-75(30)

M activerecord/Rakefilehttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-76(31)

M activerecord/activerecord.gemspechttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-77(7)

M activerecord/examples/performance.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-78(196)

M activerecord/lib/active_record.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-79(15)

M activerecord/lib/active_record/aggregations.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-80(72)

D activerecord/lib/active_record/association_preload.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-81(431)

M activerecord/lib/active_record/associations.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-82(1309)

A activerecord/lib/active_record/associations/alias_tracker.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-83(79)

A activerecord/lib/active_record/associations/association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-84(279)

D
activerecord/lib/active_record/associations/association_collection.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-85(572)

D activerecord/lib/active_record/associations/association_proxy.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-86(304)

A activerecord/lib/active_record/associations/association_scope.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-87(146)

M
activerecord/lib/active_record/associations/belongs_to_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-88(108)

M
activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-89(78)

A
activerecord/lib/active_record/associations/builder/association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-90(53)

A activerecord/lib/active_record/associations/builder/belongs_to.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-91(85)

A
activerecord/lib/active_record/associations/builder/collection_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-92(75)

A
activerecord/lib/active_record/associations/builder/has_and_belongs_to_many.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-93(57)

A activerecord/lib/active_record/associations/builder/has_many.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-94(71)

A activerecord/lib/active_record/associations/builder/has_one.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-95(63)

A
activerecord/lib/active_record/associations/builder/singular_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-96(45)

A
activerecord/lib/active_record/associations/collection_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-97(547)

A activerecord/lib/active_record/associations/collection_proxy.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-98(166)

M
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-99(153)

M
activerecord/lib/active_record/associations/has_many_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-100(134)

M
activerecord/lib/active_record/associations/has_many_through_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-101(192)

M
activerecord/lib/active_record/associations/has_one_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-102(160)

M
activerecord/lib/active_record/associations/has_one_through_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-103(46)

A activerecord/lib/active_record/associations/join_dependency.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-104(214)

A
activerecord/lib/active_record/associations/join_dependency/join_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-105(154)

A
activerecord/lib/active_record/associations/join_dependency/join_base.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-106(24)

A
activerecord/lib/active_record/associations/join_dependency/join_part.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-107(78)

A activerecord/lib/active_record/associations/join_helper.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-108(55)

A activerecord/lib/active_record/associations/preloader.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-109(177)

A
activerecord/lib/active_record/associations/preloader/association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-110(125)

A
activerecord/lib/active_record/associations/preloader/belongs_to.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-111(17)

A
activerecord/lib/active_record/associations/preloader/collection_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-112(24)

A
activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-113(60)

A activerecord/lib/active_record/associations/preloader/has_many.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-114(17)

A
activerecord/lib/active_record/associations/preloader/has_many_through.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-115(15)

A activerecord/lib/active_record/associations/preloader/has_one.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-116(23)

A
activerecord/lib/active_record/associations/preloader/has_one_through.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-117(9)

A
activerecord/lib/active_record/associations/preloader/singular_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-118(21)

A
activerecord/lib/active_record/associations/preloader/through_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-119(67)

A
activerecord/lib/active_record/associations/singular_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-120(64)

A
activerecord/lib/active_record/associations/through_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-121(83)

D
activerecord/lib/active_record/associations/through_association_scope.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-122(160)

M activerecord/lib/active_record/attribute_methods.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-123(26)

M
activerecord/lib/active_record/attribute_methods/before_type_cast.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-124(17)

M activerecord/lib/active_record/attribute_methods/dirty.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-125(10)

M activerecord/lib/active_record/attribute_methods/primary_key.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-126(47)

M activerecord/lib/active_record/attribute_methods/read.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-127(39)

M
activerecord/lib/active_record/attribute_methods/time_zone_conversion.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-128(11)

M activerecord/lib/active_record/attribute_methods/write.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-129(10)

M activerecord/lib/active_record/autosave_association.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-130(111)

M activerecord/lib/active_record/base.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-131(916)

M activerecord/lib/active_record/callbacks.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-132(57)

A activerecord/lib/active_record/coders/yaml_column.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-133(41)

M
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-134(158)

M
activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-135(28)

M
activerecord/lib/active_record/connection_adapters/abstract/database_limits.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-136(23)

M
activerecord/lib/active_record/connection_adapters/abstract/database_statements.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-137(122)

M
activerecord/lib/active_record/connection_adapters/abstract/query_cache.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-138(33)

M
activerecord/lib/active_record/connection_adapters/abstract/quoting.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-139(83)

M
activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-140(306)

M
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-141(130)

M
activerecord/lib/active_record/connection_adapters/abstract_adapter.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-142(94)

A activerecord/lib/active_record/connection_adapters/column.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-143(270)

A
activerecord/lib/active_record/connection_adapters/mysql2_adapter.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-144(730)

M
activerecord/lib/active_record/connection_adapters/mysql_adapter.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-145(466)

M
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-146(637)

M
activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-147(12)

M
activerecord/lib/active_record/connection_adapters/sqlite_adapter.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-148(205)

A
activerecord/lib/active_record/connection_adapters/statement_pool.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-149(40)

M activerecord/lib/active_record/counter_cache.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-150(11)

M activerecord/lib/active_record/errors.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-151(13)

M activerecord/lib/active_record/fixtures.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-152(1439)

A activerecord/lib/active_record/identity_map.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-153(163)

M activerecord/lib/active_record/locking/optimistic.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-154(68)

M activerecord/lib/active_record/locking/pessimistic.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-155(12)

M activerecord/lib/active_record/log_subscriber.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-156(28)

M activerecord/lib/active_record/migration.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-157(427)

A activerecord/lib/active_record/migration/command_recorder.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-158(105)

M activerecord/lib/active_record/named_scope.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-159(108)

M activerecord/lib/active_record/nested_attributes.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-160(99)

M activerecord/lib/active_record/observer.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-161(16)

M activerecord/lib/active_record/persistence.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-162(81)

M activerecord/lib/active_record/query_cache.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-163(42)

M activerecord/lib/active_record/railtie.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-164(56)

A activerecord/lib/active_record/railties/console_sandbox.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-165(6)

M activerecord/lib/active_record/railties/controller_runtime.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-166(11)

M activerecord/lib/active_record/railties/databases.rakehttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-167(276)

M activerecord/lib/active_record/railties/jdbcmysql_error.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-168(2)

M activerecord/lib/active_record/reflection.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-169(277)

M activerecord/lib/active_record/relation.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-170(215)

M activerecord/lib/active_record/relation/batches.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-171(12)

M activerecord/lib/active_record/relation/calculations.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-172(99)

M activerecord/lib/active_record/relation/finder_methods.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-173(90)

M activerecord/lib/active_record/relation/predicate_builder.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-174(41)

M activerecord/lib/active_record/relation/query_methods.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-175(252)

M activerecord/lib/active_record/relation/spawn_methods.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-176(47)

A activerecord/lib/active_record/result.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-177(34)

M activerecord/lib/active_record/schema.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-178(11)

M activerecord/lib/active_record/schema_dumper.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-179(20)

M activerecord/lib/active_record/serialization.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-180(6)

M activerecord/lib/active_record/serializers/xml_serializer.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-181(20)

M activerecord/lib/active_record/test_case.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-182(27)

M activerecord/lib/active_record/timestamp.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-183(30)

M activerecord/lib/active_record/transactions.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-184(33)

M activerecord/lib/active_record/validations.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-185(49)

M activerecord/lib/active_record/validations/associated.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-186(14)

M activerecord/lib/active_record/validations/uniqueness.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-187(106)

M activerecord/lib/active_record/version.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-188(4)

M activerecord/lib/rails/generators/active_record.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-189(6)

M
activerecord/lib/rails/generators/active_record/migration/templates/migration.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-190(12)

M
activerecord/lib/rails/generators/active_record/model/model_generator.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-191(3)

M
activerecord/lib/rails/generators/active_record/model/templates/migration.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-192(13)

M
activerecord/lib/rails/generators/active_record/model/templates/model.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-193(2)

M
activerecord/lib/rails/generators/active_record/model/templates/module.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-194(2)

M
activerecord/lib/rails/generators/active_record/observer/templates/observer.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-195(2)

M
activerecord/lib/rails/generators/active_record/session_migration/session_migration_generator.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-196(3)

M
activerecord/lib/rails/generators/active_record/session_migration/templates/migration.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-197(4)

A
activerecord/test/active_record/connection_adapters/fake_adapter.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-198(36)

M activerecord/test/cases/adapter_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-199(17)

M activerecord/test/cases/adapters/mysql/connection_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-200(60)

A activerecord/test/cases/adapters/mysql/mysql_adapter_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-201(79)

A activerecord/test/cases/adapters/mysql/quoting_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-202(25)

M activerecord/test/cases/adapters/mysql/reserved_word_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-203(26)

M activerecord/test/cases/adapters/mysql/schema_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-204(18)

A activerecord/test/cases/adapters/mysql/statement_pool_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-205(23)

A activerecord/test/cases/adapters/mysql2/bind_parameter_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-206(50)

M activerecord/test/cases/adapters/mysql2/reserved_word_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-207(24)

A activerecord/test/cases/adapters/mysql2/schema_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-208(51)

A activerecord/test/cases/adapters/postgresql/connection_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-209(14)

M activerecord/test/cases/adapters/postgresql/datatype_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-210(25)

M
activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-211(112)

A activerecord/test/cases/adapters/postgresql/quoting_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-212(25)

M
activerecord/test/cases/adapters/postgresql/schema_authorization_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-213(32)

M activerecord/test/cases/adapters/postgresql/schema_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-214(62)

A
activerecord/test/cases/adapters/postgresql/statement_pool_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-215(39)

D activerecord/test/cases/adapters/sqlite/sqlite_adapter_test.rbhttps://github.com/ActiveRecord and ActiveModel 3.1 #58/files#diff-216(0)

Patch Links:

https://github.com/github/rails/pull/58.patch

https://github.com/github/rails/pull/58.diff

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/58
.

Engineer @ GitHub
http://github.com/rsanheim

…oses rails#2508 Change CollectionProxy#method_missing to use scoped.public_send, to avoid a problem described in issue rails#2508 when trying to use class methods with names like "open", that clash with private kernel methods. Also changed the dynamic matcher instantiator to send straight to scoped, to avoid another roundtrip to method_missing.

haileys · 2014-04-14T02:11:35Z

@rsanheim I've updated my benchmark with numbers for Foo.find and Foo.find_by_x. Looks like there's small regressions all the way through to 4.1 (4.1 is still slower than 3.0 in this benchmark).

I'm keen to get some numbers in production though.

This will make possible to do a frameworkless initialization since the the default middleware stack is self contained.

This will allow the new mysql 2.9.0 to be used, fixing our test issues.

…tra parameters

protection Fixes: CVE-2013-0276

…-behaviour [3.0+AR3.1] Backport broken where merge fix

Charlie Somerville added 20 commits April 11, 2014 18:13

ActiveRecord 3.1 and ActiveModel 3.1

a010486

bump activemodel builder dependency to 3.2

ab72872

bump arel to 2.2.3

c796ff3

import activesupport/core_ext/object/inclusion from 3-2-github

b6723d9

add bcrypt-ruby to Gemfile

af6b19d

remove 1.8 monkey patches that aren't valid anymore

d545a11

fix activemodel tests

9f7240d

don't warn or be verbose

098de9d

only test sqlite3

abafb2c

this doesn't exist in the old version of rack we're testing with

aa55907

our old ActiveSupport doesn't support passing procs to assert_difference

900b1d0

work around ruby 2.0 respond_to? changes

62b7eee

fix xml tests

406173e

more respond_to fixes

1e4d1c3

restore AR 3.0 session store

7d530b1

restore old notifier when we're done here

e8898d2

skip the remaining broken tests we don't care about

d0c0866

ActionDispatch::Callbacks.to_prepare in 3.0

755b025

it's after, not to_cleanup

5a23d78

Charlie Somerville added 3 commits April 12, 2014 11:49

backport pluck to 3-0-github

7addec5

delegate pluck to scoped

a1ceb40

rafaelfranca and others added 5 commits April 14, 2014 13:27

Require ActionController::Railtie in the default middleware stack.

505fa63

This will make possible to do a frameworkless initialization since the the default middleware stack is self contained.

Be a bit less conservative with mysql in adapter

4747940

This will allow the new mysql 2.9.0 to be used, fixing our test issues.

CVE-2012-5664 options hashes should only be extracted if there are ex…

b43374f

…tra parameters

Fix issue with attr_protected where malformed input could circumvent

f4991a2

protection Fixes: CVE-2013-0276

adding test for CVE

ccf7615

tenderlove and others added 5 commits April 14, 2014 13:37

stop calling to_sym when building arel nodes [CVE-2013-1854]

9b9c097

fix the tests so they're not asserting wrong behaviour

02a5abd

fix activerecord's completely broken where clause merge semantics

75e8494

fix tests that were relying on AR's ridiculous behaviour

f557a19

Merge pull request #61 from github/3-0-github+ar-3-1+fix-broken-where…

3f8ef01

…-behaviour [3.0+AR3.1] Backport broken where merge fix

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ActiveRecord and ActiveModel 3.1 #58

ActiveRecord and ActiveModel 3.1 #58

haileys commented Apr 11, 2014

rsanheim commented Apr 11, 2014

cc @github/perf @github/rails3

haileys commented Apr 14, 2014

ActiveRecord and ActiveModel 3.1 #58

Are you sure you want to change the base?

ActiveRecord and ActiveModel 3.1 #58

Conversation

haileys commented Apr 11, 2014

rsanheim commented Apr 11, 2014

cc @github/perf @github/rails3

haileys commented Apr 14, 2014