Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11416 from tigrish/master | Yves Senn | 2013-07-21 | 3 | -4/+4 |
|\ | | | | | Rename the I18n keys for associations' restrict_dependent_destroy errors | ||||
| * | Remove ambiguity with pluralizations and I18n keys used for association ↵ | Christopher Dell | 2013-07-13 | 3 | -4/+4 |
| | | | | | | | | restrict_dependent_destroy errors | ||||
* | | use the superclass implementation | Aaron Patterson | 2013-07-18 | 2 | -2/+4 |
| | | |||||
* | | Improve ActiveRecord::QueryMethods#includes docs | Henrik Hodne | 2013-07-17 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | It's not immediately clear whether you can pass in multiple relations or not. After going through the code a bit, I saw that the arguments are just appended to an array. Also, added nested relations example. [ci skip] | ||||
* | | Revert "Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting" | Yves Senn | 2013-07-17 | 2 | -6/+6 |
| | | | | | | | | | | This reverts commit cb1d07e43926bcec95cb8b4a663ca9889173395a, reversing changes made to 754a373e301d2df0b12a11083405252722bc8366. | ||||
* | | parent_table is only used internally | Aaron Patterson | 2013-07-16 | 1 | -4/+4 |
| | | |||||
* | | decouple the manager class from building join constraints | Aaron Patterson | 2013-07-16 | 2 | -10/+11 |
| | | |||||
* | | cache the klass member of the reflection | Aaron Patterson | 2013-07-16 | 1 | -8/+10 |
| | | |||||
* | | cache the scope chain on the stack and eliminate `i` | Aaron Patterson | 2013-07-16 | 1 | -7/+4 |
| | | |||||
* | | just push on to the scope chain items. Oops! (thanks @carlosantoniodasilva) | Aaron Patterson | 2013-07-16 | 1 | -2/+1 |
| | | |||||
* | | use Relation#merge to combine scope chain items | Aaron Patterson | 2013-07-16 | 1 | -6/+6 |
| | | |||||
* | | make sure scope_chain_items has consistent types | Aaron Patterson | 2013-07-16 | 1 | -7/+9 |
| | | |||||
* | | removes the obsolete private method column_methods_hash [Closes #11406] | Xavier Noria | 2013-07-16 | 1 | -13/+0 |
| | | |||||
* | | Move initializing process for query cache to ↵ | kennyj | 2013-07-16 | 2 | -2/+6 |
| | | | | | | | | ActiveRecord::ConnectionAdapters::QueryCache module. | ||||
* | | Unifies mysql and mysql2 casting of booleans | awilliams | 2013-07-16 | 2 | -6/+6 |
| | | | | | | | | | | Using the mysql2 adapter, boolean values were sometimes being incorrectly cast to 't' or 'f'. This changes the cast to match the mysql adapter behavior, ie 1 and 0. | ||||
* | | `change_column` for PG adapter respects `:array` option. | Yves Senn | 2013-07-16 | 1 | -2/+3 |
| | | |||||
* | | save another array allocation | Aaron Patterson | 2013-07-15 | 1 | -1/+1 |
| | | |||||
* | | removing useless assingment | Aaron Patterson | 2013-07-15 | 1 | -1/+1 |
| | | |||||
* | | reorder bind parameters when merging relations | Aaron Patterson | 2013-07-15 | 1 | -2/+18 |
| | | |||||
* | | use arel rather than slapping together SQL strings | Aaron Patterson | 2013-07-15 | 1 | -2/+4 |
| | | |||||
* | | Merge pull request #11451 from ↵ | Yves Senn | 2013-07-15 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | 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 object | Paul Nikitochkin | 2013-07-15 | 1 | -0/+1 |
| | | | | | | | | | | | | Closes #11450 | ||||
* | | | Remove deprecation warning from attribute_missing | Arun Agrawal | 2013-07-15 | 1 | -14/+0 |
|/ / | | | | | for attributes that are columns. | ||||
* | | Merge pull request #11434 from jetthoughts/new_save_transaction_bugfix | Santiago Pastorino | 2013-07-14 | 1 | -3/+3 |
|\ \ | | | | | | | Remove extra decrement of transaction level | ||||
| * | | #4566: Remove extra decrement of transaction level | Paul Nikitochkin | 2013-07-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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-nodes | Yves Senn | 2013-07-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Blacklist->whitelist for reference scans in order! | ||||
| * | | | Blacklist->whitelist for reference scans in order! | Ernie Miller | 2013-07-14 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | 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 Senn | 2013-07-14 | 1 | -5/+10 |
|/ / | | | | | | | See https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2#commitcomment-3630064 for discussion. | ||||
* | | Reset @column_defaults when assigning . | kennyj | 2013-07-14 | 1 | -0/+1 |
| | | |||||
* | | Typo fix [skip ci] | Ankit Gupta | 2013-07-12 | 1 | -1/+1 |
|/ | |||||
* | Avoid creating an extra Range instance | Akira Matsuda | 2013-07-10 | 1 | -1/+1 |
| | |||||
* | fix visibility of the relation construction methods | Aaron Patterson | 2013-07-09 | 1 | -5/+7 |
| | |||||
* | pass arel to select_all rather than depend on method_missing | Aaron Patterson | 2013-07-09 | 1 | -1/+1 |
| | |||||
* | Fix: attribute_for_inspect truncate upto (51 => 50) characters. | namusyaka | 2013-07-09 | 1 | -2/+2 |
| | |||||
* | Merge pull request #11174 from vipulnsward/remove_column_passing | Rafael Mendonça França | 2013-07-09 | 1 | -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 M | 2013-07-01 | 1 | -2/+2 |
| | | |||||
* | | refactor to_sql so it does not depend on the to_sql implementation of | Aaron Patterson | 2013-07-08 | 1 | -4/+11 |
| | | | | | | | | the connection | ||||
* | | Merge pull request #11306 from ↵ | Rafael Mendonça França | 2013-07-06 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/11288_remove_extra_queries_for_belongs_to_with_touch #11288: Removed duplicated touching Conflicts: activerecord/CHANGELOG.md | ||||
| * | | #11288: Removed duplicated touching | Paul Nikitochkin | 2013-07-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | if belongs to model with touch option on touch Closes #11288 | ||||
* | | | Extract common query to a constant. | Vipul A M | 2013-07-06 | 1 | -1/+3 |
| | | | | | | | | | | | | Perf ref: https://gist.github.com/vipulnsward/8209749201dfdd678c97 | ||||
* | | | Revert "Merge pull request #11299 from ↵ | Yves Senn | 2013-07-05 | 1 | -0/+5 |
|/ / | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge pull request #11299 from arunagw/disable_implicit_join_references_removed | Carlos Antonio da Silva | 2013-07-04 | 1 | -5/+0 |
|\ \ | | | | | | | Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=` | ||||
| * | | Remove deprecated `ActiveRecord::Base.disable_implicit_join_references=`. | Arun Agrawal | 2013-07-04 | 1 | -5/+0 |
| | | | |||||
* | | | Removed unsued deprecation require | Rashmi Yadav | 2013-07-04 | 1 | -1/+0 |
| | | | |||||
* | | | remove leftover if after deprecation removal (68563128). | Yves Senn | 2013-07-04 | 1 | -4/+1 |
|/ / | |||||
* | | Remove deprecated nil-passing to `SchemaCache` methods. | Yves Senn | 2013-07-04 | 1 | -28/+8 |
| | | |||||
* | | replace artificial space with RDoc markup (follow up #11285). [ci skip] | Yves Senn | 2013-07-04 | 1 | -2/+2 |
| | | |||||
* | | Remove deprecated block filter from `ActiveRecord::Migrator#migrate`. | Yves Senn | 2013-07-04 | 1 | -9/+1 |
| | | |||||
* | | Merge pull request #11285 from ankit8898/master | Yves Senn | 2013-07-04 | 1 | -1/+1 |
|\ \ | | | | | | | Fixing the broken wikipedia link for Optimistic Concurrency control [ci skip] | ||||
| * | | [ci skip] Separated full stop from the Optimistic_concurrency_control wiki ↵ | ankit8898 | 2013-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | link d4e3f8ba826cd42aa3c242149 |