aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Fix build. It seems that the Mocha's behavior were changed.kennyj2012-04-242-3/+9
|
* Updated other README to point 3-2-stableArun Agrawal2012-04-231-1/+1
|
* Be sure to correctly fetch PK name from MySQL even if the PK has some custom ↵Akira Matsuda2012-04-192-1/+31
| | | | | | | | | | | option Backports #5900 Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
* Removes unneeded caching from ActiveRecord::Base.relationBenedikt Deicke2012-04-191-4/+3
|
* Revert "Revert "Fix #5667. Preloading should ignore scoping.""Benedikt Deicke2012-04-192-2/+9
| | | | | | | | This reverts commit 1166d49f62ccab789be208112163ad13183224e2. Conflicts: activerecord/test/cases/associations/eager_test.rb
* Adds test to check that circular preloading does not modify Model.unscoped ↵Benedikt Deicke2012-04-193-4/+26
| | | | | | | | (as described in #5667) Conflicts: activerecord/test/cases/associations/eager_test.rb
* Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-192-2/+6
| | | | | | | | | | | | | | | The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place. The four places with calls to relations are: activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'" activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'" activerecord/lib/active_record/scoping/named.rb:38:in `scoped'" activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'" Conflicts: activerecord/lib/active_record/core.rb
* Revert "Fix #5667. Preloading should ignore scoping."Jeremy Kemper2012-04-183-20/+2
| | | | | | | | Causes a subtle regression where record.reload includes the default scope. Hard to reproduce in isolation. Seems like the relation is getting infected by some previous usage. This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.
* Check for nil loggerNorman Clarke2012-04-181-1/+1
|
* Merge pull request #5725 from kevmoo/remove_unused_castcodeXavier Noria2012-04-091-2/+0
|\ | | | | Remove unused castcode
| * Remove unused 'cast_code' variableKevin Moore2012-04-031-2/+0
| |
* | Fix tests of benchmark with silence equals to trueRafael Mendonça França2012-04-041-3/+1
| |
* | log which config format AR uses to connect withTerence Lee2012-04-031-0/+4
|/
* DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
|
* Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_selectAaron Patterson2012-03-303-21/+29
|\ | | | | Fixing Identity Map when using find select in rails 3.2
| * refactor instantiate method in base, so we remove nesting if's which make ↵Arturo Pie2012-03-292-12/+19
| | | | | | | | | | | | | | | | the code harder to read. Minor changes to contain_all_columns in IdentityMap. Conflicts: activerecord/lib/active_record/base.rb
| * refactor the checking of the attributes of the record in IdentityMap#add, so ↵Arturo Pie2012-03-292-5/+12
| | | | | | | | it's more readable
| * Do not add record to identity map if the record doesn't have values for all ↵Arturo Pie2012-03-291-1/+1
| | | | | | | | the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
| * Adds a test that breaks IM when using #selectArturo Pie2012-03-291-12/+6
| |
* | Merge branch '3-2-3' into 3-2-stableSantiago Pastorino2012-03-301-1/+1
|\ \
| * | Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
| | |
| * | Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
| | |
* | | Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-303-2/+20
| |/ |/| | | | | | | | | Conflicts: activerecord/test/cases/associations/eager_test.rb
* | Merge pull request #5640 from yahonda/address_ora_00918_with_oracleSantiago Pastorino2012-03-281-1/+1
|\ \ | | | | | | Address an error for test_has_many_through_polymorphic_has_one with Oracle
| * | Change the order argument from ('id') to ('taggings.id')Yasuo Honda2012-03-281-1/+1
| |/ | | | | | | to address ORA-00918 error
* | Fix #5549.Jon Leighton2012-03-282-3/+7
| |
* | Test for #5549.Aaron Patterson2012-03-282-1/+16
| | | | | | | | | | | | | | | | Cherry-picked from e96d04a2e4e244ea5053cb4e8ab97db604d0c796. Conflicts: activerecord/lib/active_record/attribute_methods/read.rb
* | Merge pull request #5616 from cbartlett/migration-indentSantiago Pastorino2012-03-281-2/+2
| | | | | | | | Fix indenting in migration generator
* | Merge pull request #5618 from lest/patch-1Piotr Sarnacki2012-03-272-0/+15
|\ \ | |/ |/| force datetime attributes to be changed
| * force datetime attributes to be changedSergey Nartimov2012-03-272-0/+15
| | | | | | | | backport ddb5d2f756d9d2655a07791a3b62832efd588474 to 3-2-stable
* | Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
| |
* | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
|/ | | | Issue with schema dump
* Merge pull request #5537 from kennyj/fix_4399-32Aaron Patterson2012-03-232-6/+34
|\ | | | | [3-2-stable] migrate(:down) method with table_name_prefix
| * migrate(:down) method with table_name_prefixkennyj2012-03-212-6/+34
| |
* | Fix identity map testsCarlos Antonio da Silva2012-03-231-16/+16
| |
* | Add order to tests that rely on db ordering, to fix failing tests on pgCarlos Antonio da Silva2012-03-2213-46/+45
| | | | | | | | | | | | | | Also skip persistente tests related to UPDATE + ORDER BY for postgresql PostgreSQL does not support updates with order by, and these tests are failing randomly depending on the fixture loading order now.
* | [3-2-stable] Port of #5522 'Fix adding/removing field's index when ↵Marcelo Silveira2012-03-211-0/+3
| | | | | | | | generating migration'
* | [3-2-stable] Remove blank line from generated migrationMarcelo Silveira2012-03-201-1/+1
|/
* Fix GH #5435. db:structure:dump should be re-enable.kennyj2012-03-181-0/+1
|
* Merge pull request #5437 from kennyj/fix_5430Aaron Patterson2012-03-152-1/+8
| | | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA.
* ConnectionPool.checkout takes account of ruby using 'non-blocking condition ↵Jonathan Rochkind2012-03-131-9/+18
| | | | variables' in mutex ConditionVariables
* [3-2-stable] Fix GH #5399. connection_pools's keys are ↵kennyj2012-03-142-2/+8
| | | | ActiveRecord::Base::ConnectionSpecification objects.
* fix activerecord query_method regression with offset into FixnumDenis Jean2012-03-132-1/+5
| | | | | | add test to show offset query_methods on mysql & mysql2 change test to cover public API
* make sure connections returned after close are marked as in_useAaron Patterson2012-03-122-0/+26
|
* Merge pull request #5391 from jrochkind/connection_pool_docAaron Patterson2012-03-121-3/+1
|\ | | | | ConnectionPooll#clear_active_connections! rdoc inaccuracy since 3.2.0
| * inline docs for clear_active_connections! no longer says it cleans dead ↵Jonathan Rochkind2012-03-121-3/+1
| | | | | | | | threads, it doesn't since 3.2.0
* | Add documentation for find_or_create_by_{attribute}! method.Andrew White2012-03-121-0/+3
|/
* Add dynamic find_or_create_by_{attribute}! method.Andrew White2012-03-127-1/+67
| | | | | | | | | (cherry picked from commit 5282485d310d1a6ffcf55e4e7f56ab234e16880d) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/dynamic_finder_match.rb
* Merge pull request #5347 from rafaelfranca/fix-has_many_association-3-2José Valim2012-03-086-8/+43
|\ | | | | [3-2-stable] Fix has many through associations when mass_assignment_sanitizer is :strict
| * Not need to pass join attributes to association buildRafael Mendonça França2012-03-085-16/+21
| |