aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix generator command for nested (namespaced) rails engineFumiaki MATSUSHIMA2017-01-039-9/+29
| | | | | | | | | | | | | If we create nested (namespaced) rails engine such like bukkits-admin, `bin/rails g scaffold User name:string age:integer` will create `bukkits-admin/app/controllers/bukkits/users_controller.rb` but it should create `bukkits-admin/app/controllers/bukkits/admin/users_controller.rb`. In #6643, we changed `namespaced_path` as root path because we supposed application_controller is always in root but nested rails engine's application_controller will not.
* Merge pull request #27543 from ↵Kasper Timm Hansen2017-01-024-41/+50
|\ | | | | | | | | kamipo/fix_update_counters_of_multiple_records_with_touch Fix update counters of multiple records with touch: true
| * Counter cache touching don't need object finding anymoreRyuta Kamizono2017-01-031-6/+5
| | | | | | | | | | `current_time_from_proper_timezone` and timestamp attributes methods was pushed up to class method.
| * Push `current_time_from_proper_timezone` and timestamp attributes methods up ↵Ryuta Kamizono2017-01-032-35/+35
| | | | | | | | | | | | to class method Actually these methods don't need instantiation.
| * Fix update counters of multiple records with touch: trueRyuta Kamizono2017-01-032-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently does not work the following example in the doc: ```ruby # For the Posts with id of 10 and 15, increment the comment_count by 1 # and update the updated_at value for each counter. Post.update_counters [10, 15], comment_count: 1, touch: true # Executes the following SQL: # UPDATE posts # SET comment_count = COALESCE(comment_count, 0) + 1, # `updated_at` = '2016-10-13T09:59:23-05:00' # WHERE id IN (10, 15) ```
* | Merge pull request #27542 from utilum/remove_duplicate_testKasper Timm Hansen2017-01-021-8/+0
|\ \ | |/ |/| Remove duplicated test
| * Remove duplicated testutilum2017-01-021-8/+0
|/ | | | | b8f74860b61782e3b949ade3bb51bff40899e89b provided a nicer version of `#test_structure_load` but the old version was not removed.
* [ci skip] Use touch; slim wording.Kasper Timm Hansen2017-01-021-2/+2
| | | | | | * Rename update -> touch to remain consistent with the other docs language of "touch"'ing. * Remove the sentence that's repeated from just above and rephrase.
* Merge pull request #27508 from zzz6519003/patch-1Rafael França2017-01-011-2/+0
|\ | | | | remove useless import
| * remove useless importSnowmanzzz(Zhengzhong Zhao)2016-12-301-2/+0
| |
* | Merge pull request #27526 from kirs/database-tasks-schema-cacheRafael França2017-01-013-4/+21
|\ \ | | | | | | Dump schema cache for custom connection
| * | Dump schema cache for custom connectionKir Shatrov2017-01-013-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Today `rake db:schema:cache:dump` only supports dumping cache for a single connection (`ActiveRecord::Base.connection`). This doesn't work for apps with multiple databases. This PR makes `DatabaseTasks` to provide an API for dumping schema cache for any connection.
* | | Merge pull request #27541 from kenta-s/fix-grammar-in-counter_cache_rbRafael França2017-01-011-3/+3
|\ \ \ | | | | | | | | Fix grammar in active_record/counter_cache.rb [ci skip]
| * | | Fix grammar in active_record/counter_cache.rb [ci skip]kenta-s2017-01-021-3/+3
|/ / /
* | | Merge pull request #27540 from kamipo/touch_time_should_be_type_castedRafael França2017-01-011-3/+1
|\ \ \ | | | | | | | | `touch_time` should be type casted to respect the precision of the column
| * | | `touch_time` should be type casted to respect the precision of the columnRyuta Kamizono2017-01-021-3/+1
|/ / /
* | | Merge pull request #27520 from ↵Rafael França2017-01-011-11/+21
|\ \ \ | | | | | | | | | | | | | | | | prathamesh-sonpatki/merge-uncountable-tests-for-inflector Make the tests for uncountability of ascii and non-ascii words uniform
| * | | Make the tests for uncountability of ascii and non-ascii words uniformPrathamesh Sonpatki2016-12-311-11/+21
| | | |
* | | | Merge pull request #27539 from kamipo/counter_cache_touching_improvementsRafael França2017-01-011-4/+4
|\ \ \ \ | | | | | | | | | | Counter cache touching improvements
| * | | | Prefer `each` over `map` because unused return valueRyuta Kamizono2017-01-021-1/+1
| | | | |
| * | | | Don't invoke `touch_updates` if `touch` does not suppliedRyuta Kamizono2017-01-021-3/+3
|/ / / / | | | | | | | | | | | | | | | | `touch_updates` calls `Time.now` via `current_time_from_proper_timezone` so it is better to not invoke `touch_updates` if it is unnecessary.
* | | | Replace sleep with synchronizationMatthew Draper2017-01-022-2/+8
| | | |
* | | | Fix tests with counter cache touching and more.Kasper Timm Hansen2017-01-013-104/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor to use `touch_updates` Ensures we only call `current_time_from_proper_timezone` from one place. * Clarify touch default in tests. Not interested in what happens when passed false but that nothing passed means no touching. * Backdate touched columns in tests. We can't be sure a test progresses through time, so our touching code may be working correctly but the test itself is brittle. Fix by backdating that's further in the past akin to what the timestamps tests do: https://github.com/rails/rails/blob/d753645d40e925973724e4c3a8617b654da90e41/activerecord/test/cases/timestamp_test.rb#L17 * Expand changelog entry. Elaborate and show examples. Closes #26995. [ Jarred Trost & Kasper Timm Hansen ]
* | | | Added option to ActiveRecord::CounterCache methods.Jarred Trost2017-01-013-8/+216
| | | |
* | | | Revert "Merge pull request #27528 from kamipo/extract_casted_booleans"Kasper Timm Hansen2017-01-012-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out by @matthewd this change makes ImmutableString aware of MysqlString's existence whereas previously MysqlString was only overriding public API. cc @kamipo This reverts commit e632c2fa4cb60072a778ce95c952a0fa95e5b074, reversing changes made to 334a7dcf107cd3ff1697163d331d289d6d65dcd7.
* | | | Merge pull request #27536 from ↵Kasper Timm Hansen2017-01-012-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/rm-bin-yarn-if-yarn-is-skipped Remove bin/yarn if yarn is skipped, tidy up tests
| * | | | Remove bin/yarn if yarn is skipped, tidy up testsPrathamesh Sonpatki2017-01-012-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No need to remove bin/yarn separately for API only apps because :skip_yarn is set to true for API only apps. - Added a test for :skip_yarn config.
* | | | | Fix Symbol#duplicable? for Ruby 2.4.0.Kasper Timm Hansen2017-01-012-3/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.4.0 has trouble duplicating certain symbols created from strings via `to_sym`. It didn't happen with `'symbol'.to_sym.dup` for some reason, but works fine with the longer string sample. Once a newer Ruby version with a fix is released we'll get have a failing test case we can fix. Ref: #27532
* | | | Merge pull request #27535 from y-yagi/add_test_script_for_railtiesKasper Timm Hansen2017-01-011-0/+4
|\ \ \ \ | | | | | | | | | | add `bin/test` script for railties
| * | | | add `bin/test` script for railtiesyuuji.yaginuma2017-01-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The railties test does not require specific setup performed in the rake-tasks, so we can use test runner as well as other components.
* | | | | Merge pull request #27534 from y-yagi/remove_unnecessary_remove_fileKasper Timm Hansen2017-01-011-1/+0
|\ \ \ \ \ | | | | | | | | | | | | remove unnecessary `remove_file`
| * | | | | remove unnecessary `remove_file`yuuji.yaginuma2017-01-011-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | It deletes the `app/mailers` directory itself, it is not necessary to delete the file individually. https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/app_generator.rb#L329
* | | | | Merge pull request #27531 from kamipo/string_timestamp_attributesKasper Timm Hansen2017-01-012-12/+11
|\ \ \ \ \ | |/ / / / |/| | | | Change `timestamp_attributes_for_{create,update}` from symbol to string
| * | | | Change `timestamp_attributes_for_{create,update}` from symbol to stringRyuta Kamizono2017-01-012-12/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `timestamp_attributes_for_{create,update}` is defined as symbol but always used as string with `to_s`. This allocates extra strings. To avoid extra allocation, change the definitions from symbol to string. ```ruby pp ObjectSpace::AllocationTracer.trace { 1_000.times { |i| Post.create! } } ``` Before: ``` ["~/rails/activerecord/lib/active_record/timestamp.rb", 121]=>[1002, 0, 750, 0, 1, 18528], ["~/rails/activerecord/lib/active_record/timestamp.rb", 105]=>[1002, 0, 750, 0, 1, 7720], ["~/rails/activerecord/lib/active_record/timestamp.rb", 101]=>[1002, 0, 750, 0, 1, 7720], ["~/rails/activerecord/lib/active_record/timestamp.rb", 109]=>[1002, 0, 750, 0, 1, 13896], ["~/rails/activerecord/lib/active_record/timestamp.rb", 61]=>[4008, 0, 3000, 0, 1, 30880], ``` After: ``` ["~/rails/activerecord/lib/active_record/timestamp.rb", 120]=>[1000, 0, 756, 0, 1, 17184], ["~/rails/activerecord/lib/active_record/timestamp.rb", 104]=>[1000, 0, 756, 0, 1, 7160], ["~/rails/activerecord/lib/active_record/timestamp.rb", 100]=>[1000, 0, 756, 0, 1, 7160], ["~/rails/activerecord/lib/active_record/timestamp.rb", 108]=>[1000, 0, 756, 0, 1, 12888], ```
* | | | Merge pull request #27528 from kamipo/extract_casted_booleansKasper Timm Hansen2016-12-312-18/+18
|\ \ \ \ | | | | | | | | | | Extract `casted_true`/`casted_false` for `Type::ImmutableString`
| * | | | Extract `casted_true`/`casted_false` for `Type::ImmutableString`Ryuta Kamizono2017-01-012-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only difference between `Type::ImmutableString` and its subclasses is the representation of the casted booleans. Prefer extracting `casted_true`/`casted_false` and override these by subclasses.
* | | | | Merge pull request #27529 from kamipo/refactor_ids_readerKasper Timm Hansen2016-12-311-3/+1
|\ \ \ \ \ | |/ / / / |/| | | | Refactor `CollectionAssociation#ids_reader`
| * | | | Refactor `CollectionAssociation#ids_reader`Ryuta Kamizono2017-01-011-3/+1
|/ / / / | | | | | | | | | | | | | | | | Simply we can do `target.pluck(reflection.association_primary_key)` if `target` is loaded.
* | | | Merge pull request #27527 from kamipo/array_subtype_optionsKasper Timm Hansen2016-12-312-4/+6
|\ \ \ \ | | | | | | | | | | Dump array subtype options correctly
| * | | | Dump array subtype options correctlyRyuta Kamizono2017-01-012-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Currently schema dumper does not dump array subtype `precision` and `scale` options. This commit fixes the issue.
* | | | | Match Thor's `desc` signature.Kasper Timm Hansen2016-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | It can also take an options hash.
* | | | | Prevent command name being printed twice.Kasper Timm Hansen2016-12-311-0/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thor would inadvertantly duplicate the command usage because of the help method in a command class. Fixes #26664. [ Yuji Yaginuma & Kasper Timm Hansen ]
* | | | Merge pull request #27525 from kirs/patch-1Kasper Timm Hansen2016-12-311-2/+2
|\ \ \ \ | | | | | | | | | | Update schema cache doc in guides/command_line
| * | | | Update schema cache doc in guides/command_lineKir Shatrov2016-12-311-2/+2
|/ / / /
* | / / [ci skip] Update Active Model copyright years.Kasper Timm Hansen2016-12-312-2/+2
| |/ / |/| | | | | | | | | | | | | | Missed in 37d956f. Fixes #27524. [ MSathieu & Kasper Timm Hansen ]
* | | Merge pull request #27441 from koic/quoted_insert_version_sqlKasper Timm Hansen2016-12-311-4/+4
|\ \ \ | | | | | | | | Add a quote to an SQL insert statement of schema migration
| * | | Add a quote to an SQL insert statement of schema migrationKoichi ITO2016-12-231-4/+4
| | | |
* | | | [ci skip] Retouch some association wording.Kasper Timm Hansen2016-12-311-3/+4
| | | | | | | | | | | | | | | | | | | | Trim some needless words off the lines and format the code sample like we'd write in the Rails source.
* | | | [ci skip] Remove mention of GeneratedAssociationMethodsKasper Timm Hansen2016-12-311-4/+3
| | | | | | | | | | | | | | | | | | | | Marked as private in 2afe5a1 and doesn't seem worth it to mention the module name here.
* | | | Merge pull request #27521 from ↵Kasper Timm Hansen2016-12-311-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/mark-one-more-constant-as-private Mark :GeneratedAssociationMethods also as private_constant
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 22:34:03 +0000