Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't allow `quote_value` to be called without a column | Ben Woosley | 2013-07-22 | 3 | -3/+12 |
| | | | | | | | Some adapters require column information to do their job properly. By enforcing the provision of the column for this internal method we ensure that those using adapters that require column information will always get the proper behavior. | ||||
* | Tidy up the "Specified column type for quote_value" changes | Ben Woosley | 2013-07-22 | 3 | -4/+4 |
| | | | | | | This includes fixing typos in changelog, removing a deprecated mocha/setup test require, and preferring the `column_for_attribute` accessor over direct access to the columns_hash in the new code. | ||||
* | Specified column type for quote_value | Alfred Wong | 2013-07-22 | 3 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | | When calling quote_value the underlying connection sometimes requires more information about the column to properly return the correct quoted value. I ran into this issue when using optimistic locking in JRuby and the activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to insert a integer into a NVARCHAR column type so we need to format it as N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without the column type being passed the connection adapter cannot properly return the correct quote value because it doesn't know to return N'3' or '3'. This patch is fairly straight forward where it just passes in the column type into the quote_value, as it already has the ability to take in the column, so it can properly handle at the connection level. I've added the tests required to make sure that the quote_value method is being passed the column type so that the underlying connection can determine how to quote the value. | ||||
* | Merge pull request #11538 from vipulnsward/rescue-exp | Piotr Sarnacki | 2013-07-22 | 3 | -3/+17 |
|\ | | | | | rescue from all exceptions in `ConnectionManagement#call` | ||||
| * | rescue from all exceptions in `ConnectionManagement#call` | Vipul A M | 2013-07-22 | 3 | -3/+17 |
| | | | | | | | | | | | | | | | | | | Fixes #11497 As `ActiveRecord::ConnectionAdapters::ConnectionManagement` middleware does not rescue from Exception (but only from StandardError), the Connection Pool quickly runs out of connections when multiple erroneous Requests come in right after each other. Recueing from all exceptions and not just StandardError, fixes this behaviour. | ||||
* | | Revert "Merge pull request #11416 from tigrish/master" | Yves Senn | 2013-07-22 | 3 | -4/+4 |
|/ | | | | | This reverts commit 9dc8aef084fc5ae7e3a396dd098d89da93d06fda, reversing changes made to 02e8dae6279ea25312293a3eca777faf35139c4c. | ||||
* | 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 | 4 | -53/+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 | 4 | -43/+28 |
| | | |||||
* | | 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 | 4 | -6/+53 |
| | | | | | | | | | | 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 | 3 | -2/+19 |
| | | |||||
* | | 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 | 3 | -3/+43 |
| | | |||||
* | | use arel rather than slapping together SQL strings | Aaron Patterson | 2013-07-15 | 2 | -5/+10 |
| | | |||||
* | | Merge pull request #11451 from ↵ | Yves Senn | 2013-07-15 | 2 | -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 object | Paul Nikitochkin | 2013-07-15 | 2 | -0/+8 |
| | | | | | | | | | | | | Closes #11450 | ||||
* | | | Remove deprecation warning from attribute_missing | Arun Agrawal | 2013-07-15 | 3 | -29/+4 |
|/ / | | | | | for attributes that are columns. | ||||
* | | Merge pull request #11434 from jetthoughts/new_save_transaction_bugfix | Santiago Pastorino | 2013-07-14 | 3 | -3/+23 |
|\ \ | | | | | | | Remove extra decrement of transaction level | ||||
| * | | #4566: Remove extra decrement of transaction level | Paul Nikitochkin | 2013-07-14 | 3 | -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-nodes | Yves Senn | 2013-07-14 | 2 | -1/+8 |
|\ \ \ | | | | | | | | | Blacklist->whitelist for reference scans in order! | ||||
| * | | | Blacklist->whitelist for reference scans in order! | Ernie Miller | 2013-07-14 | 2 | -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 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 | 3 | -0/+15 |
| | | |||||
* | | 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 |
| | |||||
* | Make sure that a joins Relation can be merged with has_many :through + ↵ | Akira Matsuda | 2013-07-10 | 2 | -1/+11 |
| | | | | | | association proxy Closes #11248. | ||||
* | Fix: attribute_for_inspect truncate upto (51 => 50) characters. | namusyaka | 2013-07-09 | 2 | -3/+3 |
| | |||||
* | 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 |
| | | |||||
* | | Remove redundant test about `push_with_attributes` removal. | Vipul A M | 2013-07-09 | 1 | -7/+0 |
| | | |||||
* | | close our connection when we are done | Aaron Patterson | 2013-07-08 | 2 | -14/+17 |
| | | |||||
* | | remove dead code | Aaron Patterson | 2013-07-08 | 1 | -16/+0 |
| | | |||||
* | | if we remove the connection from the pool, we should close it | Aaron Patterson | 2013-07-08 | 1 | -0/+1 |
| | | |||||
* | | use latches rather than mucking with the scheduler | Aaron Patterson | 2013-07-08 | 1 | -7/+7 |
| | | |||||
* | | 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 #11274 from arunagw/deprecation-removed-build-fixed | Rafael Mendonça França | 2013-07-07 | 1 | -20/+0 |
|\ \ | | | | | | | Deprecation removed build fixed |