aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #10901 from ↵Yves Senn2013-06-221-6/+0
| | | | | | | | | armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader" This reverts commit 6675d713186c270de1c4684bc1e56742ea2e19e1, reversing changes made to 919d1a19d5e7871d50c1531351fc3f736bad5d07. I missed to check the target branch and wrongly merged it into 3-2-stable directly.
* Merge pull request #10901 from ↵Yves Senn2013-06-221-0/+6
|\ | | | | | | | | armstrjare/fix_query_null_foreign_key_on_new_record_collection_ids_reader Fixes CollectionAssociation#ids_reader returning incorrect ids for new records
| * Fixes CollectionAssociation#ids_reader returning incorrect ids for new recordsJared Armstrong2013-06-211-0/+6
| |
* | Merge pull request #10925 from senny/10917_test_to_prevent_regressionYves Senn2013-06-151-0/+4
|/ | | | | | | regression test + mysql2 adapter raises correct error if conn is closed. Conflicts: activerecord/CHANGELOG.md
* Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-231-0/+5
| | | | | | | Fix the `:primary_key` option for `has_many` associations. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/has_many_association.rb
* destroys association records before saving/inserting new association recordsJohnny Holton2013-05-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | This is a backport of #10417 fixes bug introduced by #3329 These are the conditions necessary to reproduce the bug: - For an association, autosave => true. - An association record is being destroyed - A new association record is being created. - There is a unique index one of the association's fields. - The record being created has the same value as the record being destroyed on the indexed field. Before, the deletion of records was postponed until after all insertions/saves. Therefore the new record with the identical value in the indexed field caused a non-unique value error to be thrown at the database level. With this fix, the deletions happen first, before the insertions/saves. Therefore the record with the duplicate value is gone from the database before the new record is created, thereby avoiding the non-uniuqe value error.
* Backport a super-simplified version of #6792, fixingBen Woosley2013-05-141-0/+7
| | | | | | | | | | | | | that #exists? and others can produce invalid SQL: "SELECT DISTINCT DISTINCT" The combination of a :uniq => true association and the #distinct call in #construct_limited_ids_condition combine to create invalid SQL, because we're explicitly selecting DISTINCT, and also sending #distinct on to AREL, via the relation#distinct_value. Where #6792 was the forever fix, this is the minimal fix. Instead of properly indicating the distinctness of the query through #uniq_value alone, we use a literal select statement and set #uniq_value to always be falsey
* Improve CHANGELOG entriesRafael Mendonça França2013-05-121-2/+8
| | | | [ci skip]
* Merge pull request #7695 from benolee/backport_cc7dd66_and_c0ba0f0Rafael Mendonça França2013-05-121-1/+4
|\ | | | | | | | | | | | | backport runner fixes to 3-2-stable Conflicts: railties/CHANGELOG.md
| * backport runner fixes to 3-2-stablekennyj2012-12-161-0/+3
| | | | | | | | | | | | | | 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-111-0/+5
| | | | | | | | | | | | 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-121-0/+4
| | | | | | | | Now with a non-broken test.
* | Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | 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
* | Correctly parse bigint defaults in PostgreSQL, Backpost #10098.Erik Peterson2013-04-111-0/+6
| | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb activerecord/test/cases/schema_dumper_test.rb
* | Merge pull request #7792 from seejee/chained_scopes_preload_properlyCarlos Antonio da Silva2013-04-031-0/+5
|\ \ | | | | | | Fixes Issue #7490: Chained scopes will preload properly
| * | Chained scopes will be preloaded properly. Fixes #7490Chris Geihsler2013-04-031-0/+5
| | |
* | | Removing explain support warning from the RailtieRafael Mendonça França2013-03-281-0/+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
| | |
* | | 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-201-0/+8
| | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md
* | | Reset postgreSQL search path in db:test:clone_structure.Alexander2013-03-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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-181-0/+10
| | |
* | | 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-181-11/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Revert "Merge pull request #8209 from senny/backport_8176"Aaron Patterson2013-03-051-15/+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
| * | Update CHANGELOGs for 3.2.13 release.Steve Klabnik2013-02-271-0/+5
| | |
* | | Merge pull request #9549 from larrylv/reload-stable-target-before-savingRafael Mendonça França2013-03-071-0/+6
|\ \ \ | | | | | | | | Fix issue #7526. Reload the association target if it's stale.
| * | | Fix issue #7526. Reload the target if it's stale.larrylv2013-03-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | | | Update CHANGELOGs for 3.2.13.rc1Steve Klabnik2013-03-051-0/+3
|/ / /
* | | Improve AR changelog [ci skip]Carlos Antonio da Silva2013-02-281-2/+5
| | |
* | | Backported #6755 to 3-2-stable. Don't read csv file during executing ↵Narihiro Nakamura2013-02-281-0/+3
|/ / | | | | | | db:fixtures:load.
* | CHANGELOG entry for ee291b9.Steve Klabnik2013-02-261-0/+5
| | | | | | | | Since we released it, it should go in the CHANGELOG.
* | Do not override attributes on `dup` by default scopesHiroshige Umino2013-02-261-0/+4
| |
* | Improve changelog entry [ci skip]Carlos Antonio da Silva2013-02-261-4/+4
| |
* | Backported #7072 to 3-2-stable. Use database value for uniqueness validation ↵Narihiro Nakamura2013-02-261-0/+6
| | | | | | | | scope.
* | Sqlite preserves primary keys when copying/altering tables.Yves Senn2013-02-231-0/+6
| | | | | | | | | | | | | | | | Backport #2312. Fixes #9367. I also added a test-case to make sure that renaming or removing a column preserves the primary key.
* | don't cache invalid subsets when preloading hmt associations.Yves Senn2013-02-191-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | Backport #9252. Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/eager_test.rb The preloader code on 3-2-stable is not based on relations but on option hashes. I had to modify the original patch and comparing the option hashes could be more fuzzy than comparing the relations. All the tests passed though.
* | Fix handling of dirty time zone aware attributesLilibeth De La Cruz2013-02-171-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when `time_zone_aware_attributes` were enabled, after changing a datetime or timestamp attribute and then changing it back to the original value, `changed_attributes` still tracked the attribute as changed. This caused `[attribute]_changed?` and `changed?` methods to return true incorrectly. Example: in_time_zone 'Paris' do order = Order.new original_time = Time.local(2012, 10, 10) order.shipped_at = original_time order.save order.changed? # => false # changing value order.shipped_at = Time.local(2013, 1, 1) order.changed? # => true # reverting to original value order.shipped_at = original_time order.changed? # => false, used to return true end (cherry picked from commit bc982cbcb34129ea2cfe8aa1f8e0b40e444e68db) Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb Backport of #9073 Fixes #8898
* | Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"Rafael Mendonça França2013-02-151-22/+0
| | | | | | | | | | | | | | This reverts commit c5451777b038c5e48567f69256986ae42a2cde48. Conflicts: activerecord/CHANGELOG.md
* | Do not put the version in unreleased changes [ci skip]Rafael Mendonça França2013-02-141-1/+1
| |
* | Fix the CHANGELOG headers [ci skip]Rafael Mendonça França2013-02-141-0/+2
| |
* | Merge pull request #9252 from senny/8423_hmt_preloading_bugRafael Mendonça França2013-02-141-0/+22
| | | | | | | | | | | | | | don't cache invalid subsets when preloading hmt associations Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/eager_test.rb
* | Fixed changelog typos [ci skip]Jon McCartie2013-02-141-1/+1
| |
* | backport of fix for issue #7630Matthew Robertson2013-02-131-0/+7
| |
* | Update changelogs with version/release dates [ci skip]Carlos Antonio da Silva2013-02-111-1/+3
| |
* | Merge branch '3-2-sec' into 3-2-stableAaron Patterson2013-02-111-12/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md
| * | Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numericGuillermo Iguaran2013-02-091-1/+13
| | | | | | | | | | | | | | | | | | [3.2] active_record: Quote numeric values compared to string columns. Conflicts: activerecord/CHANGELOG.md
* | | active_record: Quote numeric values compared to string columns.Dylan Smith2013-02-071-0/+10
| | |