aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Refactored transaction state into its own object. Each transaction creates a ↵wangjohn2013-01-212-7/+34
| | | | new transaction state object upon initialization.
* Remove extra sort from testVipul A M2013-01-211-3/+3
| | | | Cleanup change_schema tests to remove extra sorts on columns.
* Merge pull request #8913 from ↵Carlos Antonio da Silva2013-01-202-0/+10
|\ | | | | | | | | seejee/regression_test_for_chained_preloaded_scopes Added test case to prevent regression of chained, preloaded scopes.
| * Added test case to prevent regression of chained, preloaded scopes. (#7490)Chris Geihsler2013-01-192-0/+10
| |
* | Merge pull request #9008 from ranjaykrishna/dbcreateGuillermo Iguaran2013-01-201-0/+1
|\ \ | | | | | | Added a new rake task in activerecord
| * | added db:drop task that executes mysql:drop_databses and ↵Ranjay Krishna2013-01-201-0/+1
| | | | | | | | | | | | postgresql:drop_databases
* | | Merge pull request #9006 from wangjohn/activerecord_transaction_stateAaron Patterson2013-01-204-11/+49
|\ \ \ | | | | | | | | Created state for a transaction and added tests.
| * | | Added a changelog entry.wangjohn2013-01-201-0/+5
| | | |
| * | | Removed reflects_transaction_state.wangjohn2013-01-201-1/+0
| | | |
| * | | Created state for a transaction and added tests.wangjohn2013-01-203-11/+45
| | | |
* | | | Merge pull request #9005 from ranjaykrishna/dbcreateAaron Patterson2013-01-201-0/+4
|\ \ \ \ | | |/ / | |/| | added a db create rake task.
| * | | removed the puts statement and simplified the execute statementRanjay Krishna2013-01-201-6/+1
| | | |
| * | | added rake db:create that executes mysql:build_databases and ↵Ranjay Krishna2013-01-201-0/+9
| | | | | | | | | | | | | | | | postgresql:build_databases
* | | | Don't use anonymous classes in connection testsGuillermo Iguaran2013-01-191-3/+5
| |/ / |/| |
* | | Anonymous class is not allowed. For reference see #8934 and bc43763247e25Guillermo Iguaran2013-01-191-4/+6
| | |
* | | fix anonymous class issueDavid2013-01-202-0/+15
|/ /
* | Improve relation docs about to_sql and where_values_hashCarlos Antonio da Silva2013-01-191-4/+4
| | | | | | | | | | | | | | | | * User class instead of Users. * #where_values_hash does not change the value to downcase as the example was showing. [ci skip]
* | Merge pull request #8994 from Springest/fix_default_scope_update_all_delete_allJon Leighton2013-01-183-2/+33
|\ \ | | | | | | Fix .update_all and .delete_all when using a condition on a joined table in a default_scope
| * | Fix .update_all and .delete_all when using a condition on a joined tableDerek Kraan2013-01-113-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | in a default_scope. `Model.joins(...).where(condition_on_joined_table).update_all` / `delete_all` worked, but the same operation implemented with a default_scope generated a SQL error because ActiveRecord ignored the join but implemented the where condition anyways.
* | | Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"Guillermo Iguaran2013-01-1818-63/+63
| | | | | | | | | | | | | | | This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1.
* | | Merge pull request #8989 from robertomiranda/use-rails-4-find-byGuillermo Iguaran2013-01-1818-63/+63
|\ \ \ | | | | | | | | Replace deprecated find_by_* with find_by
| * | | User Rails 4 find_byrobertomiranda2013-01-1818-63/+63
| | | |
* | | | Undeprecate the :extend optionJon Leighton2013-01-186-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested by @dhh. It doesn't affect the generated SQL, so seems reasonable to continue to allow it as an association option.
* | | | CollectionProxy should be default scopedJon Leighton2013-01-182-0/+6
| | | | | | | | | | | | | | | | Fixes #8795
* | | | Merge pull request #8912 from senny/8879_association_empty_methodJon Leighton2013-01-183-1/+19
|\ \ \ \ | | | | | | | | | | `CollectionAssociation#empty?` respects newly builded records
| * | | | `CollectionAssociation#empty?` respects newly builded recordsYves Senn2013-01-133-1/+19
| | |_|/ | |/| |
* | | | iterates the RDoc of update_column(s)Xavier Noria2013-01-181-13/+13
| |/ / |/| | | | | | | | | | | | | | | | | | | | This revision makes crystal clear that the methods go straight to the database and update the receiver. It also adds and example, and removes the duplication in the singular and plural forms by referring one to the other.
* | | Refactor predicate builder when receiving empty hashCarlos Antonio da Silva2013-01-171-4/+4
| | | | | | | | | | | | | | | | | | | | | There's no need to create a new arel table or reflect on the column association if the value is empty, these attributes are not used. Also no need to concat a new array, just append the query value.
* | | Don't rely on Hash key's orderingVitor Baptista2013-01-163-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we set encoding latin1 for a PostgreSQL database, it calls PostgreSQLAdapter::create_database with options that have, among other things: { 'encoding' => 'latin1' } Then, we use reverse_merge(:encoding => "utf8") to setup the default encoding. In the end, the hash looks like: { :encoding => 'utf8', 'encoding' => 'latin1' } The call to options.symbolize_keys calls to_sym on each_key of this Hash. It usually means that the encoding passed overwrites the default utf8, but it's not guaranteed. So, we shouldn't rely on it. The same was happening in ActiveRecord::ConnectionHandling.
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 19:25:33 +0000