Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12527 from vipulnsward/sqlite_database_types | Rafael Mendonça França | 2013-10-14 | 1 | -18/+16 |
|\ | | | | | SQLite3 Adapter datatypes cleanup | ||||
| * | Remove `default_primary_key_type` and extract contains of ↵ | Vipul A M | 2013-10-14 | 1 | -18/+16 |
| | | | | | | | | `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters. | ||||
* | | Merge pull request #9499 from ↵ | Rafael Mendonça França | 2013-10-14 | 3 | -2/+24 |
|\ \ | |/ |/| | | | | | | | | | | | | | dmitry/inverse_instance_should_not_be_reloaded_after_stale_state_change Inversed instance should not be reloaded after stale state was changed Conflicts: activerecord/CHANGELOG.md | ||||
| * | Add a note to the changelog for #9499 | Dmitry Polushkin | 2013-10-13 | 1 | -0/+6 |
| | | |||||
| * | add inversed accessor to association class | Dmitry Polushkin | 2013-10-13 | 1 | -2/+3 |
| | | |||||
| * | inversed instance should not be reloaded after stale state was changed | Dmitry Polushkin | 2013-10-13 | 2 | -2/+17 |
| | | | | | | check at association reader that record is inverted and should not be reloaded because of stale was changed at target record | ||||
* | | Merge pull request #11833 from vipulnsward/remove_autoincrement | Rafael Mendonça França | 2013-10-14 | 2 | -15/+3 |
|\ \ | | | | | | | Remove sqlite specific`supports_autoincrement?` which defaults to true | ||||
| * | | Remove sqlite specific`supports_autoincrement?` which always defaults to true | Vipul A M | 2013-08-10 | 2 | -15/+3 |
| | | | |||||
* | | | cleanup changelog entry format. [ci skip] | Yves Senn | 2013-10-14 | 1 | -2/+4 |
| | | | |||||
* | | | Extract a function to determine if the default value is a function | Rafael Mendonça França | 2013-10-14 | 1 | -1/+5 |
| | | | |||||
* | | | Push default_function to superclass to avoid method check | Rafael Mendonça França | 2013-10-14 | 3 | -15/+18 |
| | | | |||||
* | | | Dump the default function when the primary key is uuid | Rafael Mendonça França | 2013-10-14 | 2 | -2/+3 |
| | | | | | | | | | | | | Fixes #12489 | ||||
* | | | Merge pull request #12486 from cjolly/newline-eof-structure-sql | Rafael Mendonça França | 2013-10-13 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | newline at end of structure.sql file | ||||
| * | | newline at end of structure.sql file | Chad Jolly | 2013-10-13 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #12518 from vipulnsward/remove_count_options | Rafael Mendonça França | 2013-10-13 | 5 | -20/+17 |
|\ \ \ | | | | | | | | | `Relation#count` doesn't use options anymore. | ||||
| * | | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵ | Vipul A M | 2013-10-14 | 3 | -12/+12 |
| | | | | | | | | | | | | | | | | `Relation#maximum`, `Relation#calculate`, `perform_calculation`, `NullRelation#calculate` as they isn't used anymore. | ||||
| * | | | `Relation#count` doesn't use options anymore. | Vipul A M | 2013-10-13 | 3 | -8/+5 |
| | | | | |||||
* | | | | Add nodoc to method | Rafael Mendonça França | 2013-10-13 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #12508 from ↵ | Rafael Mendonça França | 2013-10-13 | 4 | -2/+40 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/12415_generate_subqueries_for_relation_from_binding_params Generate subquery for Relation passed as array condition for where Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | | Generate subquery for Relation passed as array condition for where | Paul Nikitochkin | 2013-10-13 | 4 | -2/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of executing 2 queries for fetching records filtered by array condition with Relation, added generation of subquery to current query. This behaviour will be consistent when passes Relation as hash condition to where Closes: #12415 | ||||
* | | | | | Merge pull request #12456 from razielgn/ar-test-fixes | Rafael Mendonça França | 2013-10-13 | 3 | -5/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed MRI dependent stuff in AR tests | ||||
| * | | | | | Allow methods arity below -1 in assert_responds. | Federico Ravasio | 2013-10-08 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every method from MRI's core classes is written in C. This means Method#arity always returns -1 for methods with a variable number of arguments. This is not the case with Rubinius, where, for example Array#slice! is implemented in Ruby and has arity -2, since is defined as def slice!(start, length = undefined) | ||||
| * | | | | | Assert presence of "frozen" in error message, not the full MRI message. | Federico Ravasio | 2013-10-08 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to all the other issues regarding message independent assertions to make Rails compatible with other Ruby implementations other than MRI. The best way here would be to have a specific error raised when modifying frozen objects, like FrozenObjectError or something. But since Ruby doesn't provide such a thing, we must limit the assertion to the lowest common denominator, which is word "frozen". | ||||
| * | | | | | Just change ENV and restore it afterwards. | Federico Ravasio | 2013-10-07 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stubbing ENV[] is not safe outside MRI. At some point after the stubbing has occurred a backtrace is printed to the ActiveSupport warning log: there Rubinius accesses ENV['RBX_NOCOLOR'] to determine if it should print the backtrace with colors or not, causing the stub to fail. Other implementations might access ENV in a different way too, we just can't predict it. The only thing we can do here is to actually set the ENV with what we want and restore it afterwards. | ||||
* | | | | | | Merge pull request #12511 from ↵ | Rafael Mendonça França | 2013-10-13 | 2 | -3/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/informative_raise_message_for_incorrect_association Make missed association exception message more informative | ||||
| * | | | | | | Make missed association exception message more informative | Paul Nikitochkin | 2013-10-13 | 2 | -3/+9 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Add target class name, which should have missed association on preload, into exception message to simplify detecting problem part. | ||||
* | | | | | | Drop unused iterator var | Vipul A M | 2013-10-13 | 1 | -1/+1 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #11791 from versioncontrol/includes_with_persistent_select | Rafael Mendonça França | 2013-10-12 | 3 | -1/+15 |
|\ \ \ \ \ | |/ / / / |/| | | | | Includes with persistent select, fixes #11773 | ||||
| * | | | | Fixes #11773 when using includes combined with select, the select statement ↵ | Edo Balvers | 2013-10-08 | 3 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | was overwritten. | ||||
* | | | | | no reason to do this column addition and subtraction business | Aaron Patterson | 2013-10-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | refactor a little so we can remove some methods | Aaron Patterson | 2013-10-10 | 2 | -4/+1 |
| | | | | | |||||
* | | | | | the parent node is on the stack, so use it | Aaron Patterson | 2013-10-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | we don't need to walk back up the node's parents when we have the parent on the stack | ||||
* | | | | | pass the parent node to the construct method | Aaron Patterson | 2013-10-10 | 1 | -7/+6 |
| | | | | | |||||
* | | | | | nodes do not need to be sorted | Aaron Patterson | 2013-10-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | delete unused code | Aaron Patterson | 2013-10-10 | 2 | -50/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Now that we merge trees from the top down, we don't need to search through the whole tree for particular nodes, just walk it and merge. | ||||
* | | | | | merge JoinDependency as outer joins | Aaron Patterson | 2013-10-10 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | Merge JoinDependency objects as outer joins | ||||
* | | | | | stuff the join dependency object in the "anything goes" hash. | Aaron Patterson | 2013-10-10 | 4 | -6/+8 |
| | | | | | |||||
* | | | | | stop splatting things back and forth | Aaron Patterson | 2013-10-10 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | simplify each method. | Aaron Patterson | 2013-10-10 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | | | | | | Stop writing terrible code Aaron. This is Ruby, not Scheme | ||||
* | | | | | stop creating a bunch of relation objects when we can slap all the joins on ↵ | Aaron Patterson | 2013-10-09 | 2 | -8/+3 |
| | | | | | | | | | | | | | | | | | | | | at once | ||||
* | | | | | Merge branch 'builder-instances' | Rafael Mendonça França | 2013-10-09 | 8 | -59/+43 |
|\ \ \ \ \ | |||||
| * | | | | | Method visibility will not make difference here | Rafael Mendonça França | 2013-10-09 | 4 | -8/+0 |
| | | | | | | |||||
| * | | | | | Remove builder instances | Rafael Mendonça França | 2013-10-09 | 2 | -22/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the job can be done at class level so we can avoid some object allocation | ||||
| * | | | | | Extract the scope building to a class method | Rafael Mendonça França | 2013-10-09 | 2 | -10/+17 |
| | | | | | | |||||
| * | | | | | Remove unneeded reader | Rafael Mendonça França | 2013-10-09 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | Move wrap_scope to class level | Rafael Mendonça França | 2013-10-09 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Move macro to class level | Rafael Mendonça França | 2013-10-09 | 4 | -5/+5 |
| | | | | | | |||||
| * | | | | | Make validate_options a class method | Rafael Mendonça França | 2013-10-09 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Make valid_options a class method | Rafael Mendonça França | 2013-10-09 | 6 | -7/+7 |
| | | | | | | |||||
| * | | | | | Define the association extensions without need to have a builder | Rafael Mendonça França | 2013-10-09 | 3 | -16/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | instance |