aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-122-1/+10
|\ | | | | | | | | | | | | backport runner fixes to 3-2-stable Conflicts: railties/CHANGELOG.md
| * backport runner fixes to 3-2-stablekennyj2012-12-162-0/+9
| | | | | | | | | | | | | | Add a runner hook to Rails::Application and Rails::Engine that requires ActiveRecord::Base to avoid circular constant loading when using observers. This commit backports cc7dd66, c0ba0f0 and 8d01c61.
* | Preserve context for joins while merging relationsAndrew Horner2013-05-115-4/+47
| | | | | | | | | | | | This is a backport of #10164, already merged into master. The issue is described in lengthy detail in issues #3002 and #5494.
* | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-123-1/+12
| | | | | | | | Now with a non-broken test.
* | Revert "Don't try to EXPLAIN select_db calls"Xavier Noria2013-05-112-8/+1
| | | | | | | | | | | | Reason: This was backported, but the test does not pass as is. This reverts commit a33d320cf4b57fabd9c299b09c217ee3955ecc77.
* | Using map. No need to run query againArun Agrawal2013-05-101-1/+1
| |
* | Merge pull request #10555 from dasch/dasch/3-2-stableXavier Noria2013-05-102-1/+8
|\ \ | | | | | | Don't try to EXPLAIN select_db calls
| * | Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-102-1/+8
| | |
* | | Fixed pluck to be working with selects.Arun Agrawal2013-05-102-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #9777 for details. Previously pluck is not returning what we wanted to Added a test also to make sure it's working fine. This will also fix the build for 1.8.7 as we were doing some sort on hash. Thanks @pixeltrix for helping me out. Thanks @linduxed for pairing with me.
* | | Remove useless elseArun Agrawal2013-05-101-3/+0
| | |
* | | Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-083-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb Reason: This caused a regression since it changed the behavior in a stable release. Fixes #9777
* | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-1/+28
|/ / | | | | | | | | | | | | | | | | | | | | Confirm a record has not already been destroyed before decrementing counter cache Conflicts: activerecord/CHANGELOG.md Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/belongs_to.rb
* | adding test for the symbol refsAaron Patterson2013-04-261-0/+7
| |
* | Document nested attributes as hash of hashesAlexey Muranov2013-04-131-17/+41
| | | | | | | | | | | | Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes). Align indentation in comments.
* | Correctly parse bigint defaults in PostgreSQL, Backpost #10098.Erik Peterson2013-04-114-1/+13
| | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb activerecord/test/cases/schema_dumper_test.rb
* | Merge branch '3-2-later' into 3-2-stableAaron Patterson2013-04-091-0/+10
|\ \ | | | | | | | | | | | | * 3-2-later: adding test for CVE
| * | adding test for CVEAaron Patterson2013-02-091-0/+10
| | |
* | | Merge pull request #7792 from seejee/chained_scopes_preload_properlyCarlos Antonio da Silva2013-04-034-2/+22
|\ \ \ | | | | | | | | Fixes Issue #7490: Chained scopes will preload properly
| * | | Chained scopes will be preloaded properly. Fixes #7490Chris Geihsler2013-04-034-2/+22
| | | |
* | | | Removing explain support warning from the RailtieRafael Mendonça França2013-03-282-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is causing a regression since the Active Record Railtie is trying to connect to the development database in the application boot. See https://github.com/rails/rails/pull/6197#issuecomment-15199273
* | | | Added changelog for 55e2954Fred Wu2013-03-271-0/+5
| | | |
* | | | Don't reset inheritance_column when setting explicitly.Fred Wu2013-03-272-1/+13
| | | | | | | | | | | | This is backported from master (cdfcbc4).
* | | | use ruby 1.8 Hash syntax [ci skip]Yves Senn2013-03-221-1/+1
| | | |
* | | | do not reset associations when preloading twice.Yves Senn2013-03-222-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9806. As the `through_options` always contained `{:order=>nil}` the second time, the preloader ran, the association was always reset. This patch only adds the `:order` to the `through_options` if it is set.
* | | | Remove bad changelog entry from AR [ci skip]Carlos Antonio da Silva2013-03-201-3/+0
| | | | | | | | | | | | | | | | Introduced in dc2bc388bc8c6c345337052bf0d60f5243d899d4.
* | | | Wrong exception is occured when raising no translatable exceptionkennyj2013-03-203-0/+16
| | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md
* | | | Don't crash exception translation w/ nil result attribute.Steve Jorgensen2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Exception.result is nil when attempting a query after PostgreSQL disconnect, resulting in new exception: NoMethodError: undefined method `error_field' for nil:NilClass
* | | | Reset postgreSQL search path in db:test:clone_structure.Alexander2013-03-192-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch resets the postgres search path in the structure.sql after the structure is dumped in order to find schema_migrations table when multiples schemas are used. Fixes #945
* | | | Add release dates to documentation [ci skip]claudiob2013-03-181-2/+2
| | | | | | | | | | | | | | | | Set "March 18, 2013" as the release date for 3.2.13
* | | | Bring back test and changelog entry from #pluck method and select clauseCarlos Antonio da Silva2013-03-182-0/+16
| | | |
* | | | Fix changelog conflicts and remove release dates [ci skip]Carlos Antonio da Silva2013-03-181-2/+2
| | | |
* | | | Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-187-28/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-13: bumping to 3.2.13 fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets bumping to rc2 Revert "Merge pull request #8209 from senny/backport_8176" Freeze columns only once per Result Preparing for 3.2.13.rc1 release Update CHANGELOGs for 3.2.13 release. Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md
| * | | | bumping to 3.2.13Aaron Patterson2013-03-181-1/+1
| | | | |
| * | | | stop calling to_sym when building arel nodes [CVE-2013-1854]Aaron Patterson2013-03-154-10/+10
| |/ / /
| * | | bumping to rc2Aaron Patterson2013-03-061-1/+1
| | | |
| * | | Revert "Merge pull request #8209 from senny/backport_8176"Aaron Patterson2013-03-052-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 724020278480855bddfe749c91f1074d4f50f3c6, reversing changes made to e4e2bcce75b85fb8c1c49509a17bd5dfe6034c32. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/relation/calculations.rb activerecord/test/cases/calculations_test.rb
| * | | Freeze columns only once per ResultSantiago Pastorino2013-03-051-3/+9
| | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/result.rb
| * | | Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-271-2/+2
| | | |
| * | | Update CHANGELOGs for 3.2.13 release.Steve Klabnik2013-02-271-0/+5
| | | |
* | | | Fix ar:mysql2 build on Ruby 1.8.7Andrew White2013-03-131-4/+12
| | | | | | | | | | | | | | | | | | | | The `skip` method is a no-op on Ruby 1.8.7 so we still need to force skip by returning early from each test.
* | | | Merge pull request #9613 from arunagw/remove_fixmeCarlos Antonio da Silva2013-03-081-9/+8
|\ \ \ \ | | | | | | | | | | Removing FIXME
| * | | | Removing FIXMEArun Agrawal2013-03-081-9/+8
| | | | | | | | | | | | | | | As we did in master.
* | | | | @target might be nil when Identity Map is enabled.Larry Lv2013-03-081-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * With Identity Map enabled, NameError might be raised and @target is nil. So we should always ensure `@target ||= find_target`. * Only force reload target when it is stale.
* | | | | Merge pull request #9549 from larrylv/reload-stable-target-before-savingRafael Mendonça França2013-03-076-6/+28
|\ \ \ \ \ | | | | | | | | | | | | Fix issue #7526. Reload the association target if it's stale.
| * | | | | Fix issue #7526. Reload the target if it's stale.larrylv2013-03-056-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This has been fixed at master via `365b8b6`, but not at 3-2-stable branch. * @stale_state should be nil when a model isn't saved. via `0f3901e`. * set @stale_state to nil when reset the target.
* | | | | | Use shorter prefix and suffix as in Oracle database identifierYasuo Honda2013-03-071-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | cannot be larger than 30 characters
* | | | | | Update CHANGELOGs for 3.2.13.rc1Steve Klabnik2013-03-051-0/+3
|/ / / / /
* | | | | Freeze columns only once per ResultSantiago Pastorino2013-03-031-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/result.rb
* | | | | Update docs, change_table does not use TableDefinition.Yves Senn2013-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
* | | | | Improve AR changelog [ci skip]Carlos Antonio da Silva2013-02-281-2/+5
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-26 16:11:13 +0000