aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #8930 from cordawyn/ordered_railties"Carlos Antonio da Silva2013-01-152-5/+1
| | | | | | | | | | This reverts commit 8348f9ea72c9b50fc4d4462fd9ebe3bba932c783, reversing changes made to 9dfe2d6f9fabddf9a451a995678a9648c8aaf401. Reason: this broke railties tests as explained in the issue, and the author is going to review and report back. https://github.com/rails/rails/pull/8930#issuecomment-12272671
* Merge pull request #8930 from cordawyn/ordered_railtiesCarlos Antonio da Silva2013-01-152-1/+5
|\ | | | | rake railties:install:migrations respects the order of railties
| * rake railties:install:migrations respects the order of railtiesSlava Kravchenko2013-01-142-1/+5
| |
* | Improve mysql database tasks handling to ensure we always rescue from an ↵Carlos Antonio da Silva2013-01-151-9/+13
| | | | | | | | | | | | | | | | | | | | exception We were previously rescuing "nil" when no exception class was found. This does work in 1.9.3, but does not in 2.0, raising an exception asking for a class or module to be given to the rescue clause. Thanks @yahonda for catching this.
* | Revert "Merge pull request #8942 from yahonda/tested_only_with_mysql"Carlos Antonio da Silva2013-01-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 1fc294f988e93ac59057a16b0e44b9cf93af9720, reversing changes made to fb9ac47c286fbdfe05263d4d0346e50892090603. Reason: these tests should run fine independent of database, since they should only take into account the configuration options. The problem was related to a change in the way "nil" is handled by the rescue clause, in Ruby 2.0 it raises an exception asking for class or module, in 1.9 it passes.
* | Address test_create_when_database_exists_outputs_info_to_stderr failuresYasuo Honda2013-01-151-0/+4
|/ | | | | When tested with ruby-2.0.0-rc1 `rake test` executes this test even if the target adapter is not mysql nor mysql2.
* Fix AR tests due to Mysql constant not being definedCarlos Antonio da Silva2013-01-123-7/+5
|
* Bring back "database already exists" messages when running rake tasksCarlos Antonio da Silva2013-01-127-20/+47
| | | | | | | | | | When running tasks such "rake db:setup", instead of showing messages like "db_development already exists", it was showing a big stack trace and a message "Couldn't create database for ..." with the configuration options, a very confusing message with a big trace. This brings back the functionality present in 3-2, showing the same message.
* Merge pull request #8568 from inossidabile/fix-in_clause_lengthJon Leighton2013-01-112-8/+8
|\ | | | | Correct source for in_clause_length for eager loading (Fix for #8474)
| * Eager loading made to use relation's in_clause_length instead of host's one ↵Boris Staal2012-12-202-8/+8
| | | | | | | | (fixes #8474)
* | Merge pull request #8823 from acapilleri/target_reflection_has_associated_recordCarlos Antonio da Silva2013-01-081-5/+1
|\ \ | | | | | | Refactor target_reflection_has_associated_record?
| * | target_reflection_has_associated_record? refactoringAngelo Capilleri2013-01-081-5/+1
| | |
* | | Merge pull request #8826 from acapilleri/different_targetCarlos Antonio da Silva2013-01-081-2/+5
|\ \ \ | | | | | | | | Improved different_target conditions
| * | | improved different_target conditionsAngelo Capilleri2013-01-081-2/+5
| |/ /
* | | Fix syntax error and remove duplicated testCarlos Antonio da Silva2013-01-081-6/+4
| | |
* | | 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 02:37:41 +0000