aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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
| | | | |
* | | | | Backported #6755 to 3-2-stable. Don't read csv file during executing ↵Narihiro Nakamura2013-02-282-1/+4
| | | | | | | | | | | | | | | | | | | | db:fixtures:load.
* | | | | Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated with ↵Yasuo Honda2013-02-281-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oracle adapter." This reverts commit 7544c7a9f290a3ea25099ae38d52795458391785. Oracle enhanced adapter is supporting remove_column with Array.
* | | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffixYasuo Honda2013-02-281-4/+4
| |/ / / |/| | | | | | | | | | | backport pull request#5837 to 3-2-stable
* | | | CHANGELOG entry for ee291b9.Steve Klabnik2013-02-261-0/+5
| | | | | | | | | | | | | | | | Since we released it, it should go in the CHANGELOG.
* | | | Revert "Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric"Steve Klabnik2013-02-267-49/+14
| | | | | | | | | | | | | | | | This reverts commit 921a296a3390192a71abeec6d9a035cc6d1865c8.
* | | | Do not override attributes on `dup` by default scopesHiroshige Umino2013-02-263-1/+13
| | | |
* | | | 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-263-1/+23
| | | | | | | | | | | | | | | | scope.
* | | | Sqlite preserves primary keys when copying/altering tables.Yves Senn2013-02-234-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport #2312. Fixes #9367. I also added a test-case to make sure that renaming or removing a column preserves the primary key.
* | | | Use order to get the first record since postgresql returns in theRafael Mendonça França2013-02-201-1/+1
| | | | | | | | | | | | | | | | desired order
* | | | keep the build :green_heart:, #first on 1.8.7 and pg is differentYves Senn2013-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build only failed for ruby-1.8.7 and pg. The problem was that the statement: ```ruby author = Author.includes(:comments_with_order_and_conditions, :posts).first ``` resulted in Author with ID 2 where on all other rubies / db-engines Author with ID 1 was retunred. Of course this breaks the assertions.
* | | | don't cache invalid subsets when preloading hmt associations.Yves Senn2013-02-193-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-153-30/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-143-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-133-0/+23
| | | |
* | | | 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-112-13/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | bumping versionAaron Patterson2013-02-101-1/+1
| | |/ / | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:24:25 +0000