aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* reorder bind parameters when merging relationsAaron Patterson2013-07-153-3/+43
|
* use arel rather than slapping together SQL stringsAaron Patterson2013-07-152-5/+10
|
* Merge pull request #11451 from ↵Yves Senn2013-07-152-0/+8
|\ | | | | | | | | jetthoughts/11450_do_not_resave_destroyed_association Do not re-save destroyed association on saving parent object
| * Do not re-save destroyed association on saving parent objectPaul Nikitochkin2013-07-152-0/+8
| | | | | | | | Closes #11450
* | Remove deprecation warning from attribute_missing Arun Agrawal2013-07-153-29/+4
|/ | | for attributes that are columns.
* Merge pull request #11434 from jetthoughts/new_save_transaction_bugfixSantiago Pastorino2013-07-143-3/+23
|\ | | | | Remove extra decrement of transaction level
| * #4566: Remove extra decrement of transaction levelPaul Nikitochkin2013-07-143-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | `rollback_active_record_state!` tries to restore model state on `Exception` by invoking `restore_transaction_record_state` it decrement deep level by `1`. After restoring it ensure that states to be cleared and level decremented by invoking `clear_transaction_record_state`, which cause the bug: because state already reduced in `restore_transaction_record_state`. Removed double derement of transaction level and removed duplicated code which clear transaction state for top level.
* | Merge pull request #11439 from ernie/only-scan-strings-for-nodesYves Senn2013-07-142-1/+8
|\ \ | | | | | | Blacklist->whitelist for reference scans in order!
| * | Blacklist->whitelist for reference scans in order!Ernie Miller2013-07-142-1/+8
| |/ | | | | | | | | | | Stop special-casing Arel::Nodes as exempt from reference scanning in order. Instead, only scan order values that are strings for a table reference.
* / re-introduce `select_for_count` private method.Yves Senn2013-07-141-5/+10
|/ | | | See https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2#commitcomment-3630064 for discussion.
* Reset @column_defaults when assigning .kennyj2013-07-143-0/+15
|
* Typo fix [skip ci]Ankit Gupta2013-07-121-1/+1
|
* Avoid creating an extra Range instanceAkira Matsuda2013-07-101-1/+1
|
* fix visibility of the relation construction methodsAaron Patterson2013-07-091-5/+7
|
* pass arel to select_all rather than depend on method_missingAaron Patterson2013-07-091-1/+1
|
* Make sure that a joins Relation can be merged with has_many :through + ↵Akira Matsuda2013-07-102-1/+11
| | | | | | association proxy Closes #11248.
* Fix: attribute_for_inspect truncate upto (51 => 50) characters.namusyaka2013-07-092-3/+3
|
* Merge pull request #11174 from vipulnsward/remove_column_passingRafael Mendonça França2013-07-091-2/+2
|\ | | | | Stop sending column info to `substitute_at` as it doesn't get utilized.
| * Document where `column` param gets utilized in `substitute_at`.Vipul A M2013-07-011-2/+2
| |
* | Remove redundant test about `push_with_attributes` removal.Vipul A M2013-07-091-7/+0
| |
* | close our connection when we are doneAaron Patterson2013-07-082-14/+17
| |
* | remove dead codeAaron Patterson2013-07-081-16/+0
| |
* | if we remove the connection from the pool, we should close itAaron Patterson2013-07-081-0/+1
| |
* | use latches rather than mucking with the schedulerAaron Patterson2013-07-081-7/+7
| |
* | refactor to_sql so it does not depend on the to_sql implementation ofAaron Patterson2013-07-081-4/+11
| | | | | | | | the connection
* | Merge pull request #11274 from arunagw/deprecation-removed-build-fixedRafael Mendonça França2013-07-071-20/+0
|\ \ | | | | | | Deprecation removed build fixed
| * | Removed unused test for DateTime.local_offsetArun Agrawal2013-07-071-20/+0
| | | | | | | | | | | | see discussion here #11274
* | | Merge pull request #11336 from ankit8898/performance-bmRafael Mendonça França2013-07-061-1/+13
|\ \ \ | | | | | | | | Some performance benchmarking for take vs limit
| * | | Some performance benchmarking for take vs limitAnkit Gupta2013-07-061-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a dummy progress bar during insert of records so it shows something is happening. Performance report Model.take 6198.9 (±13.4%) i/s - 121743 in 20.042671s Model.take! 6173.6 (±13.6%) i/s - 121242 in 20.057006s Model.all limit(100) 107.8 (±15.8%) i/s - 2106 in 20.022316s Model.all take(100) 105.2 (±15.2%) i/s - 2061 in 20.062509s
* | | | Merge pull request #11306 from ↵Rafael Mendonça França2013-07-063-2/+50
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/11288_remove_extra_queries_for_belongs_to_with_touch #11288: Removed duplicated touching Conflicts: activerecord/CHANGELOG.md
| * | | #11288: Removed duplicated touchingPaul Nikitochkin2013-07-053-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | if belongs to model with touch option on touch Closes #11288
* | | | Extract common query to a constant.Vipul A M2013-07-061-1/+3
| | | | | | | | | | | | | | | | Perf ref: https://gist.github.com/vipulnsward/8209749201dfdd678c97
* | | | Revert "Merge pull request #11299 from ↵Yves Senn2013-07-053-4/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | arunagw/disable_implicit_join_references_removed" `disable_implicit_join_references=` was only deprecated on `master`, not with rails 4.0. We can remove it after 4.1 This reverts commit 3c719ead414ffd29e71efce185698af979052abb, reversing changes made to d5c3bf9722abd5733a769c8d789de3f74dbfb92d.
* | | Cleanup belongs to testsPaul Nikitochkin2013-07-051-2/+1
| | | | | | | | | | | | simplified logic to calculate number of queries by using assert_queries
* | | Merge pull request #11299 from arunagw/disable_implicit_join_references_removedCarlos Antonio da Silva2013-07-043-11/+4
|\ \ \ | | | | | | | | Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`
| * | | Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`.Arun Agrawal2013-07-043-11/+4
| | | |
* | | | Removed unsued deprecation requireRashmi Yadav2013-07-041-1/+0
| | | |
* | | | Merge pull request #11297 from ankit8898/masterRafael Mendonça França2013-07-041-1/+1
|\ \ \ \ | | | | | | | | | | SQL keywords in UPPERCASE
| * | | | SQL Keywords to be in UPPERCASEankit88982013-07-041-1/+1
| | | | |
* | | | | remove leftover if after deprecation removal (68563128).Yves Senn2013-07-041-4/+1
| |/ / / |/| | |
* | | | Remove deprecated nil-passing to `SchemaCache` methods.Yves Senn2013-07-042-28/+13
| | | |
* | | | replace artificial space with RDoc markup (follow up #11285). [ci skip]Yves Senn2013-07-041-2/+2
| | | |
* | | | Remove deprecated block filter from `ActiveRecord::Migrator#migrate`.Yves Senn2013-07-042-9/+5
| | | |
* | | | Merge pull request #11285 from ankit8898/masterYves Senn2013-07-041-1/+1
|\| | | | | | | | | | | Fixing the broken wikipedia link for Optimistic Concurrency control [ci skip]
| * | | [ci skip] Separated full stop from the Optimistic_concurrency_control wiki ↵ankit88982013-07-041-1/+1
| | | | | | | | | | | | | | | | link d4e3f8ba826cd42aa3c242149
* | | | Remove deprecated String constructor from `ActiveRecord::Migrator`.Yves Senn2013-07-043-9/+4
|/ / /
* | | Remove deprecated `scope` use without passing a callable object.Arun Agrawal2013-07-033-23/+4
| | | | | | | | | | | | Removed tests from deprecated code.
* | | Remove deprecated `transaction_joinable=`Arun Agrawal2013-07-033-15/+5
| | | | | | | | | | | | | | | in favor of `begin_transaction` with `:joinable` option.
* | | Remove deprecated `decrement_open_transactions`.Arun Agrawal2013-07-032-4/+4
| | |
* | | removed deprecated increment_open_transactionsArun Agrawal2013-07-032-4/+4
|/ /