aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11432 from yalab/generate_model_name_optionYves Senn2013-10-155-6/+53
|\ | | | | Add --model-name option into scaffold_controller generator
| * Added --model-name option scaffold_controller_generator.yalab2013-10-155-6/+53
|/
* Merge pull request #12534 from vipulnsward/minor_number_helper_perfsRafael Mendonça França2013-10-141-4/+2
|\ | | | | Minor Refactoring to `NumberHelper#number_to_human`
| * Minor Refactoring to `NumberHelper#number_to_human`Vipul A M2013-10-141-4/+2
| | | | | | | | | | * Use destructive `map` and `sort_by` to save extra object creation. * Create `INVERTED_DECIMAL_UNITS.invert` constant instead of repeatedly doing `DECIMAL_UNITS.invert`
* | read the association instead of sendingAaron Patterson2013-10-141-1/+3
| |
* | we should have unique sponsorable ids in the fixtures at leastAaron Patterson2013-10-141-1/+1
| |
* | Merge pull request #12536 from sbagdat/patch-1Rafael Mendonça França2013-10-141-2/+0
|\ \ | | | | | | Remove size alias for length validation
| * | Remove size alias for length validationSıtkı Bağdat2013-10-141-2/+0
| |/ | | | | | | | | | | | | | | | | | | Removed ```The `size` helper is an alias for `length`.``` line. If you use this "nonexist" helper, you will get an error message like this: ``` ArgumentError: Unknown validator: 'SizeValidator' ... ``` Maybe wanted to mean ```validates_size_of``` helper as an alias for ```validates_length_of``` helper.
* | simplify populating the ordering hashAaron Patterson2013-10-141-10/+5
| |
* | the preloader for the RHS has all the preloaded records, so ask itAaron Patterson2013-10-141-3/+3
| |
* | only calculate offset index once. #12537Aaron Patterson2013-10-141-6/+10
| |
* | Merge pull request #10538 from neerajdotname/3882Rafael Mendonça França2013-10-149-1/+65
|\ \ | | | | | | scope_chain should not be mutated for other reflections
| * | scope_chain should not be mutated for other reflectionsNeeraj Singh2013-10-149-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `scope_chain` uses same array for building different `scope_chain` for different associations. During processing these arrays are sometimes mutated and because of in-place mutation the changed `scope_chain` impacts other reflections. Fix is to dup the value before adding to the `scope_chain`. Fixes #3882.
* | | Merge pull request #12532 from vipulnsward/singleton_classRafael Mendonça França2013-10-141-2/+5
|\ \ \ | |_|/ |/| | Fix `singleton_class?`
| * | Fix `singleton_class?`Vipul A M2013-10-151-2/+5
|/ / | | | | | | | | Due to changes from http://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39628 current `singleton_class?` implementation fails. Changed based on reference from http://bugs.ruby-lang.org/issues/7609
* | Merge pull request #12530 from vipulnsward/remove_thread_safeRafael Mendonça França2013-10-141-13/+0
|\ \ | | | | | | `$SAFE = 4;` has been removed with Ruby 2.1
| * | `$SAFE = 4;` has been removed with Ruby 2.1Vipul A M2013-10-141-13/+0
|/ / | | | | | | | | | | For background - https://bugs.ruby-lang.org/issues/8468 Changset - https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/41259/diff/test/ruby/test_thread.rb
* | Merge pull request #12527 from vipulnsward/sqlite_database_typesRafael Mendonça França2013-10-141-18/+16
|\ \ | |/ |/| SQLite3 Adapter datatypes cleanup
| * Remove `default_primary_key_type` and extract contains of ↵Vipul A M2013-10-141-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ça2013-10-143-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 #9499Dmitry Polushkin2013-10-131-0/+6
| |
| * add inversed accessor to association classDmitry Polushkin2013-10-131-2/+3
| |
| * inversed instance should not be reloaded after stale state was changedDmitry Polushkin2013-10-132-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_autoincrementRafael Mendonça França2013-10-142-15/+3
|\ \ | | | | | | Remove sqlite specific`supports_autoincrement?` which defaults to true
| * | Remove sqlite specific`supports_autoincrement?` which always defaults to trueVipul A M2013-08-102-15/+3
| | |
* | | cleanup changelog entry format. [ci skip]Yves Senn2013-10-141-2/+4
| | |
* | | Extract a function to determine if the default value is a functionRafael Mendonça França2013-10-141-1/+5
| | |
* | | Push default_function to superclass to avoid method checkRafael Mendonça França2013-10-143-15/+18
| | |
* | | Dump the default function when the primary key is uuidRafael Mendonça França2013-10-142-2/+3
| | | | | | | | | | | | Fixes #12489
* | | Merge pull request #12486 from cjolly/newline-eof-structure-sqlRafael Mendonça França2013-10-131-0/+1
|\ \ \ | |_|/ |/| | newline at end of structure.sql file
| * | newline at end of structure.sql fileChad Jolly2013-10-131-0/+1
| | |
* | | Merge pull request #12518 from vipulnsward/remove_count_optionsRafael Mendonça França2013-10-135-20/+17
|\ \ \ | | | | | | | | `Relation#count` doesn't use options anymore.
| * | | Stop accepting `options` for `Relation#average`, `Relation#minimum`, ↵Vipul A M2013-10-143-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 M2013-10-133-8/+5
| | | |
* | | | Add nodoc to methodRafael Mendonça França2013-10-131-1/+1
| | | |
* | | | Merge pull request #12508 from ↵Rafael Mendonça França2013-10-134-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 wherePaul Nikitochkin2013-10-134-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-fixesRafael Mendonça França2013-10-133-5/+11
|\ \ \ \ \ | | | | | | | | | | | | Fixed MRI dependent stuff in AR tests
| * | | | | Allow methods arity below -1 in assert_responds.Federico Ravasio2013-10-081-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 Ravasio2013-10-081-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 Ravasio2013-10-071-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ça2013-10-132-3/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | jetthoughts/informative_raise_message_for_incorrect_association Make missed association exception message more informative
| * | | | | | Make missed association exception message more informativePaul Nikitochkin2013-10-132-3/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Add target class name, which should have missed association on preload, into exception message to simplify detecting problem part.
* | | | | | Merge pull request #12514 from ↵Rafael Mendonça França2013-10-133-13/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | schuetzm/stdout-logging-with-implicit-development-env Make logging to stdout work again with implicit `development` env
| * | | | | | Make logging to stdout work again with implicit `development` envMarc Schütz2013-10-133-13/+54
| |/ / / / /
* | | | | | Merge pull request #12491 from shamanime/patch-1Rafael Mendonça França2013-10-131-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix wrong variable name used in the select_day method documentation
| * | | | | | Fix wrong variable name used in the select_day method documentationJefferson Queiroz Venerando2013-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | The variable name created in the example is `my_date`, the methods were using `my_time` instead.
* | | | | | | Merge pull request #12493 from drodriguez/patch-1Rafael Mendonça França2013-10-131-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Keep code consistent with previous code blocks.
| * | | | | | | Keep code consistent with previous code blocks.Daniel Rodríguez Troitiño2013-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #12517 from vipulnsward/destructive_map_amRafael Mendonça França2013-10-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change `map` to `map!` to save extra array creation on new array