aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Partially merge #17650Sean Griffin2015-03-263-10/+10
|\| | | | | | | | | | | | | | | | | | | Merges 1d8d5a74b81b8aab1f5e6d233d509a92525ed4e1. The pull request as a whole is quite large, and I'm reviewing the smaller pieces individually.
| * | | PostgreSQL, Fix OID based type casts in C for primitive types.Lars Kanis2015-03-253-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type map was introduced in aafee23, but wasn't properly filled. This mainly adjusts many locations, that expected strings instead of integers or boolean. add_pg_decoders is moved after setup of the StatementPool, because execute_and_clear could potentially make use of it.
* | | | Merge pull request #18846 from hundredwatt/feat/warn-on-result-set-sizeRafael Mendonça França2015-03-263-0/+67
|\ \ \ \ | | | | | | | | | | Add `config.active_record.warn_on_result_set_size` option
| * | | | Add `config.active_record.warn_on_records_fetched_greater_than` optionJason Nochlin2015-03-253-0/+67
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When set to an integer, a warning will be logged whenever a result set larger than the specified size is returned by a query. Fixes #16463 The warning is outputed a module which is prepended in an initializer, so there will be no performance impact if `config.active_record.warn_on_records_fetched_greater_than` is not set.
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-03-261-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: guides/source/4_0_release_notes.md
| * | | [ci skip] Add <tt> tag to `save!` and `create!`yui-knk2015-03-211-1/+1
| | | |
* | | | Avoid loading user's psqlrc when loading test structureJason Weathered2015-03-251-1/+1
| | | |
* | | | Revert "Merge pull request #19500 from ccutrer/dry_sti_subclass_finding"Rafael Mendonça França2015-03-241-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5cfa6a8ab997089c3012a82052c8c317b2e095f5, reversing changes made to bfd5bf8313e6ea0bb2eccb68ee5076bb63f0b2db. Reason: This broken travis build.
* | | | DRY up STI subclass logicCody Cutrer2015-03-241-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the newer method used for discriminating new records did not use the older and more robust method used for instantiating existing records, but did have a better post-check to ensure the sublass was in the hierarchy. so move the descendants check to find_sti_class, and then simply call find_sti_class from subclass_from_attributes
* | | | Merge pull request #19452 from ↵Carlos Antonio da Silva2015-03-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | pinglamb/fix-referencing-wrong-alias-when-joining-tables-of-has-many-through-association Fix referencing wrong aliases while joining tables of has many through association
| * | | | Fix referencing wrong aliases while joining tables of has many throughpinglamb2015-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association While joining table of has_many :through association, ActiveRecord will use the actual table name instead of through-join alias. It results with a wrong SQL and exception is raised. This only happens when calculation methods like #count is called. This issue is affecting Rails 4.1.x and 4.2.x as well.
* | | | | [ci skip] Remove unacceptable method nameyui-knk2015-03-241-1/+1
| | | | |
* | | | | Merge pull request #19449 from Gaurav2728/gaurav-unavailable_linkRafael Mendonça França2015-03-231-2/+1
|\ \ \ \ \ | | | | | | | | | | | | remove old unavailable link with relevant fix patch 1
| * | | | | remove old unavailable link with relevant fixGaurav Sharma2015-03-231-2/+1
| | | | | |
* | | | | | update mysql link that has been replacedGaurav Sharma2015-03-231-1/+1
|/ / / / /
* | | | | Provide a more truthful #inspectMatthew Draper2015-03-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is obviously all very internal, but sometimes you have to look at it... and when you do, it'll save a lot of confusion if it doesn't lie about its identity.
* | | | | Make sure to persist a newly-nil serialized valueMatthew Draper2015-03-231-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The subtype will (quite reasonably) ignore the possibility that it has `changed_in_place?` by becoming nil. Fixes #19467
* | | | Merge pull request #19442 from joevandyk/patch-1Matthew Draper2015-03-221-1/+3
|\ \ \ \ | |_|/ / |/| | | Fix documentation for find_or_create_by
| * | | Fix documentation for find_or_create_byJoe Van Dyk2015-03-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in the comment fails on concurrent inserts if done inside a transaction. The fix is to force a savepoint to run so that if the database raises an unique violation exception. Otherwise, you'll get errors like: ``` (0.3ms) BEGIN Cart Load (0.5ms) SELECT "carts".* FROM "carts" WHERE "carts"."uuid" = '12345' LIMIT 1 # Another process inserts a cart with uuid of '12345' right now SQL (4371.7ms) INSERT INTO "carts" ("created_at", "updated_at", "uuid") VALUES ('2015-03-21 01:05:07.833231', '2015-03-21 01:05:07.833231', '12345') RETURNING "id" [["created_at", Sat, 21 Mar 2015 01:05:07 PDT -07:00], ["updated_at", Sat, 21 Mar 2015 01:05:07 PDT -07:00], ["uuid", "12345"]] PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "carts_uuid_idx1" DETAIL: Key (uuid)=(12345) already exists. : INSERT INTO "carts" ("created_at", "updated_at", "uuid") VALUES ('2015-03-21 01:05:07.833231', '2015-03-21 01:05:07.833231', '12345') RETURNING "id" # Retrying the find Cart Load (0.8ms) SELECT "carts".* FROM "carts" WHERE "carts"."uuid" = '12345' LIMIT 1 PG::InFailedSqlTransaction: ERROR: current transaction is aborted, commands ignored until end of transaction block : SELECT "carts".* FROM "carts" WHERE "carts"."uuid" = '12345' LIMIT 1 (0.1ms) ROLLBACK ActiveRecord::StatementInvalid: PG::InFailedSqlTransaction: ERROR: current transaction is aborted, commands ignored until end of transaction block : SELECT "carts".* FROM "carts" WHERE "carts"."uuid" = '12345' LIMIT 1 ```
* | | | Delegate limit to subtypewallerjake2015-03-211-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | As described here https://github.com/rails/rails/issues/19420. When using the Postgres BigInt[] field type the big int value was not being translated into schema.rb. This caused the field to become just a regular integer field when building off of schema.rb. This fix will address this by delegating the limit from the subtype to the Array type. https://github.com/rails/rails/issues/19420
* | | Revert "Merge pull request #19404 from dmathieu/remove_rack_env"Jeremy Kemper2015-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Preserving RACK_ENV behavior. This reverts commit 7bdc7635b885e473f6a577264fd8efad1c02174f, reversing changes made to 45786be516e13d55a1fca9a4abaddd5781209103.
* | | Don't cast nil to string in pg enumsSean Griffin2015-03-191-1/+3
| | | | | | | | | | | | Fixes #19389.
* | | Updated MySQL documentation link to MySQL latest version 5.6 everywhere [ci ↵amitkumarsuroliya2015-03-192-4/+4
| | | | | | | | | | | | skip]
* | | Updated MySQL documentation link to latest version MySQL 5.6 [ci skip]amitkumarsuroliya2015-03-191-2/+2
| | |
* | | Merge pull request #19407 from amitsuroliya/mysql_adapter_docYves Senn2015-03-191-1/+1
|\ \ \ | | | | | | | | Updated MySQL documentation link for STRICT_ALL_TABLES [ci skip]
| * | | Updated MySQL documentation link for STRICT_ALL_TABLESamitkumarsuroliya2015-03-191-1/+1
| | | |
* | | | don't fallback to RACK_ENV when RAILS_ENV is not presentDamien Mathieu2015-03-191-1/+1
|/ / /
* | | Add `clear_association_scope_cache` methodeileencodes2015-03-181-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the tests if I were to call `post.categorizations.to_a` and then later call `post.categorizations.to_a` expecting to have different results the 2 queries would be the same because of the caching involved in `@association_scope_cache`. The chain gets cached and the queries will be the same even if they are not supposed to be (i.e. testing an order dependent scoping issue). I found this issue because I was working on a bug with cached scoped in hm:t and hm:t polymorphic relationships but `capture_sql` was outputting the wrong SQL to write a good test.
* | | Merge pull request #19348 from Empact/null-scopeYves Senn2015-03-181-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reuse the CollectionAssociation#reader proxy cache if the foreign key is present from the start. Conflicts: activerecord/CHANGELOG.md
| * | | Reuse the CollectionAssociation#reader proxy cache if the foreign key is ↵Ben Woosley2015-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present from the start. When a new record has the necessary information prior to save, we can avoid busting the cache. We could simply clear the @proxy on #reset or #reset_scope, but that would clear the cache more often than necessary.
* | | | Update old link in pessimistic.rb commentsAlexander Leishman2015-03-181-1/+1
| | | | | | | | | | | | Update link in comments to point to latest MySQL production version documentation. See here for reference: http://dev.mysql.com/doc/refman/5.0/en/choosing-version.html
* | | | Fix NullRelation.update_all and .exists? signature to match the same on RelationBen Woosley2015-03-181-2/+2
| | | |
* | | | Add config.active_record.dump_schemas.Ryan Wallace2015-03-172-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes db:structure:dump when using schema_search_path and PostgreSQL extensions. Closes #17157.
* | | | Drop `references_eager_loaded_tables?` test from `has_include?`Ben Woosley2015-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is redundant with tests in `eager_loading?`, but for the difference between `includes_values.present?` and `includes_values.any?`, which is a difference without a distinction because `false` has no meaning for `includes`.
* | | | reflection doc fix about hierarchykeepcosmos2015-03-171-1/+1
| | | |
* | | | Merge pull request #19359 from yahonda/mysql_subclientRafael Mendonça França2015-03-161-1/+3
|\ \ \ \ | | | | | | | | | | Materialize subqueries by adding `DISTINCT` to suport MySQL 5.7.6 and later
| * | | | Materialize subqueries by adding `DISTINCT`Yasuo Honda2015-03-161-1/+3
| |/ / / | | | | | | | | | | | | to support MySQL 5.7.6 `optimizer_switch='derived_merge=on'`
* / / / Closes rails/rails#18864: Renaming transactional fixtures to transactional testsBrandon Weiss2015-03-161-8/+20
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I’m renaming all instances of `use_transcational_fixtures` to `use_transactional_tests` and “transactional fixtures” to “transactional tests”. I’m deprecating `use_transactional_fixtures=`. So anyone who is explicitly setting this will get a warning telling them to use `use_transactional_tests=` instead. I’m maintaining backwards compatibility—both forms will work. `use_transactional_tests` will check to see if `use_transactional_fixtures` is set and use that, otherwise it will use itself. But because `use_transactional_tests` is a class attribute (created with `class_attribute`) this requires a little bit of hoop jumping. The writer method that `class_attribute` generates defines a new reader method that return the value being set. Which means we can’t set the default of `true` using `use_transactional_tests=` as was done previously because that won’t take into account anyone using `use_transactional_fixtures`. Instead I defined the reader method manually and it checks `use_transactional_fixtures`. If it was set then it should be used, otherwise it should return the default, which is `true`. If someone uses `use_transactional_tests=` then it will overwrite the backwards-compatible method with whatever they set.
* | | Fix leaky chain on polymorphic associationeileencodes2015-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there was a polymorphic hm:t association with a scope AND second non-scoped hm:t association on a model the polymorphic scope would leak through into the call for the non-polymorhic hm:t association. This would only break if `hotel.drink_designers` was called before `hotel.recipes`. If `hotel.recipes` was called first there would be no problem with the SQL. Before (employable_type should not be here): ``` SELECT COUNT(*) FROM "drink_designers" INNER JOIN "chefs" ON "drink_designers"."id" = "chefs"."employable_id" INNER JOIN "departments" ON "chefs"."department_id" = "departments"."id" WHERE "departments"."hotel_id" = ? AND "chefs"."employable_type" = ? [["hotel_id", 1], ["employable_type", "DrinkDesigner"]] ``` After: ``` SELECT COUNT(*) FROM "recipes" INNER JOIN "chefs" ON "recipes"."chef_id" = "chefs"."id" INNER JOIN "departments" ON "chefs"."department_id" = "departments"."id" WHERE "departments"."hotel_id" = ? [["hotel_id", 1]] ``` From the SQL you can see that `employable_type` was leaking through when calling recipes. The solution is to dup the chain of the polymorphic association so it doesn't get cached. Additionally, this follows `scope_chain` which dup's the `source_reflection`'s `scope_chain`. This required another model/table/relationship because the leak only happens on a hm:t polymorphic that's called before another hm:t on the same model. I am specifically testing the SQL here instead of the number of records becasue the test could pass if there was 1 drink designer recipe for the drink designer chef even though the `employable_type` was leaking through. This needs to specifically check that `employable_type` is not in the SQL statement.
* | | Doc fix about association hierarchykeepcosmos2015-03-151-2/+2
| | |
* | | Fix before_commit when updating a record on the callbackArthur Neves2015-03-141-23/+22
| | |
* | | Merge pull request #19301 from Empact/default-scopesCarlos Antonio da Silva2015-03-126-19/+20
|\ \ \ | | | | | | | | Isolate access to .default_scopes in ActiveRecord::Scoping::Default
| * | | Isolate access to .default_scopes in ActiveRecord::Scoping::DefaultBen Woosley2015-03-126-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead use .scope_attributes? consistently in ActiveRecord to check whether there are attributes currently associated with the scope. Move the implementation of .scope_attributes? and .scope_attributes to ActiveRecord::Scoping because they don't particularly have to do specifically with Named scopes and their only dependency, in the case of .scope_attributes?, and only caller, in the case of .scope_attributes is contained in Scoping.
* | | | Require pg~>0.18 to ensure Ruby 2.2 compatibilityMatt Brictson2015-03-111-2/+2
|/ / / | | | | | | | | | | | | | | | | | | Versions of the pg gem earlier than 0.18.0 cannot be used safely with Ruby 2.2. Specifically, pg 0.17 when used with Ruby 2.2 has a known bug that causes random bits to be added to the end of strings. Further explanation here: https://bitbucket.org/ged/ruby-pg/issue/210/crazy-bytes-being-added-to-record
* | | Revert "Merge pull request #15476 from JacobEvelyn/master"Jeremy Kemper2015-03-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces undesirable `Rails.logger` formatters (such as the syslog formatter) onto a `Logger.new(STDERR)` for the console. The production logger may be going elsewhere than standard io, so we can't presume to reuse its formatter. With syslog, this causes missing newlines in the console, so irb prompts start at the end of the last log message. We can work to expose the console formatter in another way to address the original issue. This reverts commit 026ce5ddf11c4cda0aae7f33a9266e54117db318, reversing changes made to 6f0a69c5899ebdc892e2aa23e68e2604fa70fb73.
* | | pg, `disable_referential_integrity` only catches AR errors.Yves Senn2015-03-111-2/+2
| | | | | | | | | | | | This change was prompted by 598b841.
* | | fix typo in transaction argument. Closes #19265.Yves Senn2015-03-111-1/+1
| | | | | | | | | | | | | | | | | | There was a typo in the `:requires_new` option. This led to `#<ArgumentError: unknown keyword: require_new>` leaving all the triggers in a disabled state.
* | | Add YAML compatibility for objects from Rails 4.2Sean Griffin2015-03-101-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of Ruby 2.2, Psych can handle any object which is marshallable. This was not true on previous versions of Ruby, so our delegator types had to provide their own implementation of `init_with` and `encode_with`. Unfortunately, this doesn't match up with what Psych will do today. Since by the time we hit this layer, the objects will have already been created, I think it makes the most sense to just grab the current type from the class.
* | | Attempt to provide backwards compatible YAML deserializationSean Griffin2015-03-103-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I should have done this in the first place. We are now serializing an explicit version so we can make more careful changes in the future. This will load Active Record objects which were serialized in Rails 4.1. There will be bugs, as YAML serialization was at least partially broken back then. There will also be edge cases that we might not be able to handle, especially if the type of a column has changed. In addition, we're passing this as `from_database`, since that is required for serialized columns at minimum. All other types were serializing the cast value. At a glance, there should be no types for which this is a problem. Finally, dirty checking information will be lost on records serialized in 4.1, so no columns will be marked as changed.
* | | Merge pull request #19275 from keepcosmos/remove-autoload-pathRafael Mendonça França2015-03-101-16/+16
|\ \ \ | | | | | | | | remove unnecessary autoload path parameters