aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Add CHANGELOG entry for YAML parsing removalPrem Sichanugrist2013-01-081-1/+5
| | | | | | | | | | | | This is for commit e80546cdec56a9c3fcaf6217cba08a02d789d2bc.
* | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵Aaron Patterson2013-01-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb
* | | Revert "Merge branch 'master-sec'"Jeremy Kemper2013-01-081-6/+0
| | | | | | | | | | | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79.
* | | Merge branch 'master-sec'Aaron Patterson2013-01-081-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | * master-sec: CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
| * | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵Aaron Patterson2013-01-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-01-096-59/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/getting_started.md
| * | | | prefer american spelling of 'behavior'Gosha Arinich2013-01-073-4/+4
| | | | |
| * | | | remove meaningless use of Relation#allAkira Matsuda2013-01-033-4/+4
| | | | | | | | | | | | | | | | | | | | particularly, `all(options)` would warn
| * | | | wrong model nameAkira Matsuda2013-01-021-1/+1
| | | | |
| * | | | find + conditions is deprecated in AR 4Akira Matsuda2013-01-021-3/+3
| | | | |
| * | | | find_or_initialize_by is deprecated in AR 4Akira Matsuda2013-01-021-7/+0
| | | | |
| * | | | find_or_create_by is deprecated in AR 4Akira Matsuda2013-01-022-27/+2
| | | | |
| * | | | find_last_by is deprecated in AR 4Akira Matsuda2013-01-021-4/+3
| | | | |
| * | | | find_all_by is deprecated in AR 4Akira Matsuda2013-01-021-6/+3
| | | | |
| * | | | scoped_by is deprecated in AR 4Akira Matsuda2013-01-021-6/+0
| | | | |
* | | | | Ignore binds payload with nil column in AR log subscriberCarlos Antonio da Silva2013-01-082-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests were raising the following error: Could not log "sql.active_record" event. NoMethodError: undefined method `type' for nil:NilClass` Due to the way binds were being logged, the column info was considered always present, but that is not true for some of the tests listed in the issue. Closes #8806.
* | | | | Merge pull request #8800 from acapilleri/primary_keyAndrew White2013-01-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | refactor reset_primary_key and change !blank? to present? in get_primary...
| * | | | | change unless !blank? to if blank? in get_primary_keyAngelo capilleri2013-01-081-1/+1
| | |/ / / | |/| | |
* | | | | Reset test data, and fix bug that the inserted data were not actually selectedAkira Matsuda2013-01-081-11/+16
| | | | |
* | | | | Reset AR::Migration.verbose change to avoid depending on test run orderAkira Matsuda2013-01-081-0/+1
| | | | |
* | | | | Fix named scope + class method exampleCarlos Antonio da Silva2013-01-071-3/+1
|/ / / / | | | | | | | | | | | | Closes #8804 [ci skip]
* | | | Use whitelist to pass valid connection parameters to PGConn.Rafael Mendonça França2013-01-061-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the valids parameters for libpq are used. See http://www.postgresql.org/docs/9.1/static/libpq-connect.html for the full list Fixes #8784
* | | | Remove the configuration key in the correct placeRafael Mendonça França2013-01-061-3/+1
| | | |
* | | | Fix failing test under sqlite3Akira Matsuda2013-01-071-1/+1
| | | |
* | | | Namespace HashWithIndifferentAccessAkira Matsuda2013-01-073-9/+8
| | | |
* | | | Needs to reset SchemaMigration first, or the tests fail in sqlite3Akira Matsuda2013-01-071-1/+1
| | | |
* | | | Fix error when assigning NaN to an integer columnTristan Harward2013-01-063-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also covers any non-castable case by returning nil, which is in-line with the intention of the former implementation, but covers the odd cases which respond to to_i but raise an error when it's called, such as NaN, Infinity and -Infinity. Fixes #8757
* | | | Missing requireAkira Matsuda2013-01-071-0/+2
| | | |
* | | | These are already required through AS/railsAkira Matsuda2013-01-078-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | * dependencies/autoload * concern * deprecation
* | | | Remove unnecessary begin..rescue..end, use only rescueAkira Matsuda2013-01-064-46/+38
| | | |
* | | | deprecate `assert_blank` and `assert_present`.Yves Senn2013-01-054-7/+7
| | | | | | | | | | | | | | | | | | | | They don't add any benefits over `assert object.blank?` and `assert object.present?`
* | | | Use better variable names for ltree tests, remove instance variableCarlos Antonio da Silva2013-01-052-14/+12
| | | |
* | | | Revert "[#8743] Test case"Rafael Mendonça França2013-01-051-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 162e2859813b31c50700b453aa61992dfa57139e. This commit was added by mistake, sorry :bow:
* | | | [#8743] Test caseCédric FABIANSKI2013-01-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reverting #a3cf03ef99 fixes the issue Conflicts: activerecord/test/cases/relations_test.rb
* | | | Move changelog entry in railties to the topCarlos Antonio da Silva2013-01-041-2/+2
| | | | | | | | | | | | | | | | Other minor changelog improvements [ci skip]
* | | | Support for PostgreSQL's ltree data type.Rob Worley2013-01-047-3/+77
| | | |
* | | | Reuse the Column integer converterRafael Mendonça França2013-01-031-1/+1
| | | |
* | | | Change duplicated test nameRafael Mendonça França2013-01-031-2/+2
| | | |
* | | | Fix undefined method `to_i' introduced since 3.2.8Jason Stirk2013-01-044-8/+37
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes a bug introduced in 96a13fc7 which breaks behaviour of integer fields. In 3.2.8, setting the value of an integer field to a non-integer (eg. Array, Hash, etc.) would default to 1 (true) : # 3.2.8 p = Post.new p.category_id = [ 1, 2 ] p.category_id # => 1 p.category_id = { 3 => 4 } p.category_id # => 1 In 3.2.9 and above, this will raise a NoMethodError : # 3.2.9 p = Post.new p.category_id = [ 1, 2 ] NoMethodError: undefined method `to_i' for [1, 2]:Array Whilst at first blush this appear to be sensible, it combines in bad ways with scoping. For example, it is common to use scopes to control access to data : @collection = Posts.where(:category_id => [ 1, 2 ]) @new_post = @collection.new In 3.2.8, this would work as expected, creating a new Post object (albeit with @new_post.category_id = 1). However, in 3.2.9 this will cause the NoMethodError to be raised as above. It is difficult to avoid triggering this error without descoping before calling .new, breaking any apps running on 3.2.8 that rely on this behaviour. This patch deviates from 3.2.8 in that it does not retain the somewhat spurious behaviour of setting the attribute to 1. Instead, it explicitly sets these invalid values to nil : p = Post.new p.category_id = [ 1, 2 ] p.category_id # => nil This also fixes the situation where a scope using an array will "pollute" any newly instantiated records. @new_post = @collection.new @new_post.category_id # => nil Finally, 3.2.8 exhibited a behaviour where setting an object to an integer field caused it to be coerced to "1". This has not been retained, as it is spurious and surprising in the same way that setting Arrays and Heshes was : c = Category.find(6) p = Post.new # 3.2.8 p.category_id = c p.category_id # => 1 # This patch p.category_id = c p.category_id # => nil This commit includes explicit test cases that expose the original issue with calling new on a scope that uses an Array. As this is a common situation, an explicit test case is the best way to prevent regressions in the future. It also updates and separates existing tests to be explicit about the situation that is being tested (eg. AR objects vs. other objects vs. non-integers)
* | | Merge pull request #8728 from amatsuda/model_all_returns_a_relationRafael Mendonça França2013-01-031-1/+1
|\ \ \ | | | | | | | | A small fix for an AR test case
| * | | need to to_a the Relation to execute SQL hereAkira Matsuda2013-01-041-1/+1
| | | |
* | | | Merge pull request #8705 from amparo-luna/change_update_attributes_to_updateGuillermo Iguaran2013-01-0322-98/+147
|\ \ \ \ | |/ / / |/| | | Rename update_attributes method to update
| * | | Add Changelog entry regarding update_attibutes being renamed to updateAmparo Luna + Guillermo Iguaran2013-01-031-0/+7
| | | |
| * | | Change docs to use update instead of update_attributesAmparo Luna + Guillermo Iguaran2013-01-033-3/+3
| | | |
| * | | Rename update_attributes method to update, keep update_attributes as an aliasAmparo Luna + Guillermo Iguaran2013-01-0319-95/+137
| | | |
* | | | Changelog improvements [ci skip]Carlos Antonio da Silva2013-01-021-1/+2
| | | |
* | | | CVE-2012-5664 options hashes should only be extracted if there are extra ↵Aaron Patterson2013-01-021-0/+12
|/ / / | | | | | | | | | | | | | | | | | | parameters Conflicts: activerecord/lib/active_record/dynamic_matchers.rb
* | | refactoring to_sym of Symbol in preloadAngelo capilleri2013-01-021-1/+3
| | |
* | | Merge pull request #8682 from amatsuda/rm_as_frozen_object_errorGuillermo Iguaran2013-01-014-7/+4
|\ \ \ | | | | | | | | remove meaningless AS::FrozenObjectError
| * | | remove meaningless AS::FrozenObjectErrorAkira Matsuda2013-01-024-7/+4
| |/ /