aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Honour the order of the joining model in a `has_many :through`Yasyf Mohamedali2015-03-025-9/+69
| | | | | | | | | association when eager loading. Previously, eager loading a `has_many :through` association with no defined order would return the records in the natural order of the database. Now, these records will be returned in the order that the joining record is returned, in case there is a defined order there.
* Merge pull request #19177 from gregmolnar/fixturesRafael Mendonça França2015-03-022-6/+4
|\ | | | | Added testcase for #18742
| * test reset_pk_sequence with multi connectionGreg Molnar2015-03-011-1/+1
| |
| * Use the correct connection for reset_pk_sequenceMontana Low2015-03-011-5/+3
| | | | | | | | When a fs.model_class.connection uses a different database than connection, connection.reset_pk_sequence will fail with an exception causing fixture load to rollback. This is reproducible for any ActiveRecord::Base class that calls establish_connection with a different database.
* | Revert "mutate the transaction object to reflect state"Aaron Patterson2015-03-023-37/+33
| | | | | | | | | | | | | | | | This reverts commit 393e65b4170608593ad82377a9eadc918e85698d and ec51c3fedd16b561d096dcc1a6705fdc02ab7666 We don't want the records to hold hard references to transactions because they point at records that have callbacks.
* | be optimistic about missing route keysAaron Patterson2015-03-021-13/+15
| | | | | | | | | | | | | | this patch makes errors slightly more expensive when someone is missing a route key, but in exchange it drops 4 allocations per `url_for` call. Since missing a route key is an error, optimizing for the non-error path seems like a good trade off
* | use arg size for parallel iterationAaron Patterson2015-03-021-1/+1
| | | | | | | | | | we already know the length of the args, so we can use that length for parallel iteration and cut down on allocations for `url_for` calls.
* | ask the routes objects for its Rack env keyAaron Patterson2015-03-023-2/+4
| | | | | | | | | | | | this centralizes the logic for determining the script name key and drops object allocations when calling `engine_script_name` (which is called on each `url_for`).
* | Merge pull request #19174 from zoltankiss/remove_unneeded_commentRafael Mendonça França2015-03-021-1/+0
|\ \ | | | | | | Remove unneeded comment
| * | Remove unneeded comment. [ci skip]Zoltan Kiss2015-03-021-1/+0
| | |
* | | delete unused methodAaron Patterson2015-03-021-4/+0
| | |
* | | mutate the transaction object to reflect stateAaron Patterson2015-03-021-25/+21
| | | | | | | | | | | | | | | this lets us keep singleton instances of "state" values and precalculate return values of things like `finalized?` and `completed?`.
* | | ask the txn for it's state, not a state objectAaron Patterson2015-03-023-8/+16
| | | | | | | | | | | | | | | this way we don't have to mutate a state object, we can just change the state of the txn
* | | change if! to unlessAaron Patterson2015-03-021-1/+1
|/ /
* | Merge pull request #19173 from robin850/rbx-buildRafael Mendonça França2015-03-0212-9/+34
|\ \ | | | | | | Improve the Rubinius build
| * | Skip the failing tests on Rubinius for nowRobin Dupret2015-03-024-0/+9
| | |
| * | Wrap inline rescue with or-equal callsRobin Dupret2015-03-021-1/+1
| | | | | | | | | | | | | | | At the moment, `rescue_from` doesn't work with strings on Rubinius because of rubinius/rubinius#3272.
| * | Avoid Ruby versions check on RubiniusRobin Dupret2015-03-021-1/+1
| | | | | | | | | | | | | | | Rubinius is still targeting compliance with Ruby 2.1.0 but we are pretty close to a green build so let's avoid this check for the moment.
| * | Test against the mail gem's edgeRobin Dupret2015-03-022-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The edge version ships with a patch that uses composition over inheritance for the Mail::PartsList object (see mikel/mail#782). Let's test Action Mailer against it to prevent eventual regressions and experience it. Moreover, this branch makes the Action Mailer suite green against Rubinius.
| * | Add the platform-specific skip helpers to ActiveModelRobin Dupret2015-03-021-0/+9
| | |
| * | Avoid accurate assertions on error messagesRobin Dupret2015-03-022-3/+3
| | | | | | | | | | | | | | | Since there are disparities between the raised error messages on the different implementations, let's avoid being too accurate.
| * | Avoid parallelizing Action Pack's tests on RubiniusRobin Dupret2015-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the `ForkingExecutor` class seems to be pretty slow on Rubinius due to DRb (c.f. http://git.io/xIVg), let's avoid running tests with it on this platform. Also, the `parallelize_me!` call make the suite to output a bunch of errors due to rubinius/rubinius#2934 since there are thread-safety problems with autoloading.
* | | Move Array#without from Grouping to Access concern and add dedicated test ↵David Heinemeier Hansson2015-03-023-12/+16
| | | | | | | | | | | | (relates to #19157)
* | | tests, favor `drop_table` and `:if_exists` over raw SQL.Yves Senn2015-03-024-14/+6
| | | | | | | | | | | | | | | We've replaced most querues using DROP TABLE in our tests already. This patch replaces the last couple calls.
* | | Merge pull request #19105 from amatsuda/array_takeSean Griffin2015-03-023-5/+18
|\ \ \ | | | | | | | | Preserve Array#take(n) behaviour of HasManyAssociation
| * | | Preserve Array#take(n) behaviour of HasManyAssociationAkira Matsuda2015-02-283-5/+18
| | | |
* | | | Merge pull request #19077 from robin850/unknown-attribute-errorSean Griffin2015-03-0211-24/+30
|\ \ \ \ | | | | | | | | | | Move `UnknownAttributeError` to a more sane namespace
| * | | | Follow-up to #10776Robin Dupret2015-02-2611-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name `ActiveModel::AttributeAssignment::UnknownAttributeError` is too implementation specific so let's move the constant directly under the ActiveModel namespace. Also since this constant used to be under the ActiveRecord namespace, to make the upgrade path easier, let's avoid raising the former constant when we deal with this error on the Active Record side.
* | | | | Remove not needed .tapArthur Neves2015-03-021-1/+1
| | | | |
* | | | | Merge pull request #19172 from JuanitoFatas/doc/fix-typoRichard Schneeman2015-03-021-2/+2
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Fix a typo for PostgreSQL text limit, GB instead of Gb.
| * | | | | [ci skip] Fix a typo for PostgreSQL text limit, GB instead of Gb.Juanito Fatas2015-03-031-2/+2
| | | | | |
* | | | | | Make private methods privateArthur Neves2015-03-021-0/+2
| | | | | |
* | | | | | Remove !has_transactional_callbacks? checkArthur Neves2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only set the state on the record if that condition is `false` in the first place, so we dont need to call that again. Also that call is expensive, follow benchmark with before and after this change: ``` Calculating ------------------------------------- persisted? 15.272k i/100ms ------------------------------------------------- persisted? 350.119k (± 4.6%) i/s - 1.756M ``` ``` Calculating ------------------------------------- persisted? 25.988k i/100ms ------------------------------------------------- persisted? 1.294M (± 5.3%) i/s - 6.445M ``` (benchmark borrowed from 57d35b2bf9e48173a5f97ccff5e6897f0c46411f)
* | | | | | Merge pull request #19170 from ↵Carlos Antonio da Silva2015-03-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | JuanitoFatas/doc/active_record/connection_adapters/abstract/schema_definitions.rb Clarify that t.references and t.belongs_to are interchangeable. [ci skip]
| * | | | | | Clarify that t.references and t.belongs_to are interchangeable. [ci skip]Juanito Fatas2015-03-021-1/+1
| |/ / / / /
* | | | | | call `sync_with_transaction_state` inside `persisted?` then check ivarsAaron Patterson2015-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directly calling `sync_with_transaction_state` is not fast, so if we call it once, we can improve the performance of the `persisted?` method. This is important because every call to `url_for(model)` will call `persisted?`, so we want that to be fast. Here is the benchmark: ```ruby require 'active_record' ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:" ActiveRecord::Base.connection.instance_eval do create_table(:articles) end class Article < ActiveRecord::Base; end article = Article.new.tap(&:save!) Benchmark.ips do |x| x.report("persisted?") do article.persisted? end end ``` Before this patch: ``` $ bundle exec ruby -rbenchmark/ips persisted.rb Calculating ------------------------------------- persisted? 3.333k i/100ms ------------------------------------------------- persisted? 51.037k (± 8.2%) i/s - 253.308k ``` After: ``` $ bundle exec ruby -rbenchmark/ips persisted.rb Calculating ------------------------------------- persisted? 7.172k i/100ms ------------------------------------------------- persisted? 120.730k (± 5.1%) i/s - 602.448k ```
* | | | | | remove useless instance variableAaron Patterson2015-03-021-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | depth is always 0, so the index will always be false. No reason to create the instance variable if it isn't used
* | | | | | Merge pull request #19169 from hjoo/rake_restartEileen M. Uchitelle2015-03-021-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Rake restart task no longer loads entire Rails environment when run
| * | | | | Rake restart task no longer loads entire Rails environment when run.Hyonjee Joo2015-03-021-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | The restart task does not need access to models or other classes and helpers from the application environment.
* | | | | Do not output in the consoleRafael Mendonça França2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | [Robin Dupret + Rafael Mendonça França]
* | | | | Merge pull request #19106 from teeceepee/patch-1Eileen M. Uchitelle2015-03-021-7/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | Improve guides [ci skip]
| * | | | Modify guides for a better sounding sentenceYu Haidong2015-03-021-3/+3
| | | | |
| * | | | Improve guidesYu Haidong2015-02-271-7/+8
| | | | |
* | | | | Merge pull request #19133 from davydovanton/update-doc-example-mail-block-formatRobin Dupret2015-03-021-1/+11
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Add code example for MailHelper#block_format documentation
| * | | | | [ci skip] Add code example for MailHelper#block_format documentationAnton Davydov2015-03-021-1/+11
| | | | | |
* | | | | | Merge pull request #19168 from gsamokovarov/byebug-defaults-guideRobin Dupret2015-03-021-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Nit pick the byebug settings guide for default values [ci skip]
| * | | | | | Nit pick the byebug settings guide for default values [ci skip]Genadi Samokovarov2015-03-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #19097 we had a discussion where we decided to change `byebug` settings sections default part to actually say `defaults`.
* | | | | | | Merge pull request #19097 from gsamokovarov/web-console-guideRobin Dupret2015-03-021-49/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Web Console documentation for the upcoming 2.1 release [ci skip]
| * | | | | | | Web Console documentation for the upcoming 2.1 release [ci skip]Genadi Samokovarov2015-03-021-49/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the upcoming 2.1 [web-console release], I have tweaked the existing documentation a bit. I tried to focus on the spawning console use case, because I think a lot of people overlook that. Tried to explain it as best as I can, however, my English and prose aren't my best skills :) If you guys can chime in and help me improve the wording, I would be extremely grateful. There has been some configuration default changes. For example, the whitelisted IPs always include IPv4 and IPv6 localhosts now and this wasn't the case in 2.0. I think a lot of people got bitten by it, that's why I changed it. I'm a bit confused on how to document this. Should I just document the latest version, I don't think I can expect all the people reading the guide to be on it. [web-console release]: https://github.com/rails/web-console/pull/110
* | | | | | | | Merge pull request #19167 from limekin/masterArun Agrawal2015-03-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | On guides, correcting incorrect controller name used on routing.md.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 17:00:42 +0000