aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | remove dead code. @klass isn't used anymoreAaron Patterson2014-05-211-1/+0
| | | |
* | | | we can just use Ruby hereAaron Patterson2014-05-211-2/+2
| | | |
* | | | reuse path formatter from the non-optimized path.Aaron Patterson2014-05-213-39/+3
| | | | | | | | | | | | | | | | | | | | The optimized and non-optimized path share more code now without significant performance degretation
* | | | reduce object allocationsAaron Patterson2014-05-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: x = [1,2,3,4] y = [3,2,1] def test x, y hash = {} x.zip(y) { |k,v| hash[k] = v } hash end def test2 x, y Hash[x.zip(y)] end def test3 x, y x.zip(y).each_with_object({}) { |(k,v),hash| hash[k] = v } end def stat num start = GC.stat(:total_allocated_object) num.times { yield } total_obj_count = GC.stat(:total_allocated_object) - start puts "#{total_obj_count / num} allocations per call" end stat(100) { test(x,y) } stat(100) { test2(x,y) } stat(100) { test3(x,y) } __END__ 2 allocations per call 7 allocations per call 8 allocations per call
* | | | make variable name more clearAaron Patterson2014-05-211-2/+2
| | | |
* | | | do not mutate parameters, let the caller do mutationsAaron Patterson2014-05-212-4/+6
| | | |
* | | | push the formatter up to the Route objectAaron Patterson2014-05-212-4/+4
| | | |
* | | | Merge pull request #15231 from ↵Guillermo Iguaran2014-05-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | khusnetdinov/fix_typo_guides_active_support_instrumentation Fix typo guides/source/active_support_instrumentation.md [ci-skip]
| * | | | Fix typo guides/source/active_support_instrumentation.mdMarat Khusnetdinov2014-05-221-1/+1
| | | | |
* | | | | Merge pull request #15229 from peeyushsingla/masterRafael Mendonça França2014-05-211-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fixes in active record query for reorder in rails guides
| * | | | | fixes in active record query for reorderpeeyush2014-05-211-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #15227 from sgrif/sg-rename-oid-typeRafael Mendonça França2014-05-212-15/+5
|\ \ \ \ \ | |/ / / / |/| | | | Rename `oid_type` to `cast_type` to make PG columns consistent with abstract columns
| * | | | Rename `oid_type` to `cast_type` to make PG columns consistentSean Griffin2014-05-212-15/+5
|/ / / /
* | | | Merge pull request #15219 from sgrif/sg-missing-nodocRafael Mendonça França2014-05-211-3/+3
|\ \ \ \ | | | | | | | | | | Add missing nodoc
| * | | | Add missing nodocs to MySQL adapterSean Griffin2014-05-211-3/+3
| | |/ / | |/| |
* | | | Merge pull request #14613 from Sirupsen/fix-serialize-update-columnRafael Mendonça França2014-05-214-14/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix serialized field returning serialized data after update_column Conflicts: activerecord/CHANGELOG.md
| * | | | Fix serialized field returning serialized data after update_columnSimon Eskildsen2014-04-054-14/+51
| | | | |
* | | | | Revert "Merge pull request #14544 from jefflai2/named_scope_sti"Rafael Mendonça França2014-05-218-42/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a1abedcdeecd9464668695d4f9c1d55a2fd9332, reversing changes made to c72d6c91a7c0c2dc81cc857a1d6db496e84e0065. Conflicts: activerecord/CHANGELOG.md activerecord/test/models/comment.rb This change break integration with activerecord-deprecated_finders so I'm reverting until we find a way to make it work with this gem.
* | | | | Merge pull request #15221 from laurelfan/doc-fix-redirectingArthur Nogueira Neves2014-05-211-4/+8
|\ \ \ \ \ | |_|/ / / |/| | | | fix formatting and text for ActionController::Redirecting doc
| * | | | fix formatting and text for ActionController::Redirecting docLaurel Fan2014-05-211-4/+8
| | | | |
* | | | | build fix, use lambda syntax that ruby 1.9.3 understands.Yves Senn2014-05-211-1/+1
| | | | |
* | | | | push `extract_scale` to the `Type`.Yves Senn2014-05-214-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `extract_precision`, `extract_limit`, and `extract_default` probably need to follow. - would be good to remove the delegation `Column#extract_scale`. /cc @sgrif
* | | | | pg, extract money tests into separate file.Yves Senn2014-05-212-35/+55
| | | | | | | | | | | | | | | | | | | | | | | | | - Added assertions about the column. Specifically scale. - Move record insertion from setup into test method.
* | | | | Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_keyYves Senn2014-05-215-4/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix polymorphic eager load with foreign_key as String.
| * | | | | Fix polymorphic eager load with foreign_key as String.Lauro Caetano2014-05-205-2/+42
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The foreign_key could be `String` and just doing `owners_map[owner_key]` could return `nil`. To prevent this bug, we should `to_s` both keys if their types are different. Fixes #14734.
* | | | | Merge pull request #15213 from tgxworld/remove_redundant_codeRafael Mendonça França2014-05-201-3/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove redundant code.
| * | | | | Remove redundant code.Guo Xiang Tan2014-05-201-3/+2
| | | | | |
* | | | | | Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_arraysRafael Mendonça França2014-05-203-16/+67
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hash#deep_*_keys(!) recurse into nested arrays. Conflicts: activesupport/CHANGELOG.md
| * | | | | Hash#deep_*_keys(!) recurse into nested arrays.OZAWA Sakuro2013-06-083-16/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following methods now recursively transform nested arrays, too. * Hash#deep_transform_keys * Hash#deep_transform_keys! * Hash#deep_stringify_keys * Hash#deep_stringify_keys! * Hash#deep_symbolize_keys * Hash#deep_symbolize_keys!
* | | | | | Merge pull request #14544 from jefflai2/named_scope_stiRafael Mendonça França2014-05-208-5/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Issue #13466. Conflicts: activerecord/CHANGELOG.md
| * | | | | | Fixes Issue #13466.Jefferson Lai2014-04-238-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the call to a scope block to be evaluated with instance_eval. The result is that ScopeRegistry can use the actual class instead of base_class when caching scopes so queries made by classes with a common ancestor won't leak scopes.
* | | | | | | Merge pull request #15205 from sgrif/sg-delegate-klassRafael Mendonça França2014-05-209-14/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Delegate `klass` to the injected type object
| * | | | | | | Delegate `klass` to the injected type objectSean Griffin2014-05-209-14/+33
| | | | | | | |
* | | | | | | | Merge pull request #14979 from brocktimus/masterRafael Mendonça França2014-05-203-1/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Making belongs_to: touch behaviour be consistent with save updating updated_at
| * | | | | | | | Prevented belongs_to: touch propagating up if there are no changes being savedBrock Trappitt2014-05-213-1/+16
| | | | | | | | |
* | | | | | | | | Revert "Revert "Merge pull request #8313 from ↵Rafael Mendonça França2014-05-203-8/+22
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alan/only_save_changed_has_one_objects"" This reverts commit e94e6c27af495a2460c811bb506459f1428dec6b. Conflicts: activerecord/CHANGELOG.md The original commit was reverted only to be safe since #14407 were reported. We don't have any proof we added a regression with the original commit so reverting it now will give us more problem. Closes #14407
* | | | | | | | Merge pull request #15154 from msgehard/move_password_fieldRafael Mendonça França2014-05-201-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Put attr_reader in with all of the other instance methods
| * | | | | | | | Put attr_reader in with all of the other instance methodsMike Gehard2014-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the grouping make a little more sense
* | | | | | | | | we don't use this parameter for anything, so rmAaron Patterson2014-05-203-22/+21
| | | | | | | | |
* | | | | | | | | fewer string allocations per url_forAaron Patterson2014-05-201-7/+5
| | | | | | | | |
* | | | | | | | | mutate the path string to avoid object allocationsAaron Patterson2014-05-201-4/+4
| | | | | | | | |
* | | | | | | | | push only_path conditional upAaron Patterson2014-05-201-18/+19
| | | | | | | | |
* | | | | | | | | push arg checking upAaron Patterson2014-05-201-4/+4
| | | | | | | | |
* | | | | | | | | fewer method calls and string garbage when there is no user/passwordAaron Patterson2014-05-201-9/+5
| | | | | | | | |
* | | | | | | | | fewer hash allocations when calling url_forAaron Patterson2014-05-201-9/+12
| | | | | | | | |
* | | | | | | | | fix variable names, only pass hashes to the positional args methodAaron Patterson2014-05-201-8/+10
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #15208 from sgrif/sg-delegate-type-cast-for-writeRafael Mendonça França2014-05-204-30/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Delegate `type_cast_for_write` to injected type object
| * | | | | | | | Delegate `type_cast_for_write` to injected type objectSean Griffin2014-05-204-30/+14
| | | | | | | | |
* | | | | | | | | Merge pull request #11346 from tomykaira/fix_10257Rafael Mendonça França2014-05-202-2/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Check authentication scheme in Basic auth
| * | | | | | | | Run login_procedure only when the auth_scheme is validtomykaira2013-07-081-7/+14
| | | | | | | | |