aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Don't invoke sql_runtime if logger is not set to infoeileencodes2015-04-042-2/+3
| | | | | | | | | `sql_runtime` was getting invoked even when the logger was set to fatal. This ensures that does not happen by checking that the logger is set to info level before logging the view runtime. This reduces the number of times `sql_runtime` is called for integration tests with a fatal logger from 6 to 2.
* remove duplicatesKoen Punt2015-04-031-4/+0
|
* Freeze static arguments for gsubbrainopia2015-04-023-4/+4
|
* Prefer string patterns for gsubbrainopia2015-04-023-3/+3
| | | | | | | | | | | | | | | | | https://github.com/ruby/ruby/pull/579 - there is a new optimization since ruby 2.2 Previously regexp patterns were faster (since a string was converted to regexp underneath anyway). But now string patterns are faster and better reflect the purpose. Benchmark.ips do |bm| bm.report('regexp') { 'this is ::a random string'.gsub(/::/, '/') } bm.report('string') { 'this is ::a random string'.gsub('::', '/') } bm.compare! end # string: 753724.4 i/s # regexp: 501443.1 i/s - 1.50x slower
* Merge pull request #19586 from mechanicles/fix-eager-loading-for-find-methodsRafael Mendonça França2015-03-312-1/+18
|\ | | | | Fix eager loading association using default_scope for finder methods.
| * Fix eager loading association using default_scope for finder methods.Santosh Wadghule2015-03-312-1/+18
| | | | | | | | | | | | - Eager loading was not working for the default_scope (class method) for 'find' & 'find_by' methods. - Fixed these by adding a new check 'respond_to?(:default_scope)'.
* | Make method as nodoc since we are already docummenting at AbstractAdapterRafael Mendonça França2015-03-311-1/+1
| |
* | use Model.reset_column_information to clear table cache connection wide.Kuldeep Aggarwal2015-03-312-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `widgets` table is being created in `primary_keys_test.rb` for PostgreSQLAdapter, MysqlAdapter, Mysql2Adapter and it makes test to fail earlier. Before: `bundle exec rake mysql2:test` ``` Finished in 127.287669s, 35.5258 runs/s, 97.8885 assertions/s. 1) Error: PersistenceTest::SaveTest#test_save_touch_false: ActiveModel::UnknownAttributeError: unknown attribute 'name' for #<Class:0x0000000a7d6ef0>. /home/kd/projects/kd-rails/activerecord/lib/active_record/attribute_assignment.rb:36:in `rescue in _assign_attribute' /home/kd/projects/kd-rails/activerecord/lib/active_record/attribute_assignment.rb:34:in `_assign_attribute' /home/kd/projects/kd-rails/activemodel/lib/active_model/attribute_assignment.rb:40:in `block in _assign_attributes' /home/kd/projects/kd-rails/activemodel/lib/active_model/attribute_assignment.rb:39:in `each' /home/kd/projects/kd-rails/activemodel/lib/active_model/attribute_assignment.rb:39:in `_assign_attributes' /home/kd/projects/kd-rails/activerecord/lib/active_record/attribute_assignment.rb:26:in `_assign_attributes' /home/kd/projects/kd-rails/activemodel/lib/active_model/attribute_assignment.rb:33:in `assign_attributes' /home/kd/projects/kd-rails/activerecord/lib/active_record/core.rb:293:in `initialize' /home/kd/projects/kd-rails/activerecord/lib/active_record/inheritance.rb:61:in `new' /home/kd/projects/kd-rails/activerecord/lib/active_record/inheritance.rb:61:in `new' /home/kd/projects/kd-rails/activerecord/lib/active_record/persistence.rb:50:in `create!' /home/kd/projects/kd-rails/activerecord/test/cases/persistence_test.rb:913:in `test_save_touch_false' 4522 runs, 12460 assertions, 0 failures, 1 errors, 4 skips ``` After: `bundle exec rake mysql2:test` ``` Finished in 135.785086s, 33.3026 runs/s, 91.7774 assertions/s. 4522 runs, 12462 assertions, 0 failures, 0 errors, 4 skips ```
* | [ci skip] Combine complementary AR #find doc linesAlexander Dimitriyadi2015-03-301-3/+1
|/
* Clarify the role of `ActiveRecord::Core.encode_with`Sean Griffin2015-03-291-4/+8
| | | | Fixes #19568
* Reduce memory usage when loading types in PGSean Griffin2015-03-294-10/+40
| | | | | | | | | | | | | We were never clearing the `PG::Result` object used to query the types when the connection is first established. This would lead to a potentially large amount of memory being retained for the life of the connection. Investigating this issue also revealed several low hanging fruit on the performance of these methods, and the number of allocations has been reduced by ~90%. Fixes #19578
* use correct method in batches testyuuji.yaginuma2015-03-291-2/+3
|
* [skip ci] Improve `warn_on_records_fetched` documentationJon Atack2015-03-272-7/+6
| | | | | | | | - ‘dection’ -> ‘detection’ - ‘exceeds threshold’ -> ‘exceeds the threshold’ - Other minor improvements.
* Partially merge #17650Sean Griffin2015-03-263-147/+20
|\ | | | | | | | | Merges 647eb2cf1cd65b0391e3584361f0fc76246e64f3. The pull request as a whole is quite large, and I'm reviewing the smaller pieces individually.
| * PostgreSQL, Use ruby-pg's built-in capabilities for array en-/decoding in C.Lars Kanis2015-03-253-147/+10
| | | | | | | | This obsoletes the ruby based implementations.
| * PostgreSQL, Add input type casts for primitive types.Lars Kanis2015-03-251-0/+10
| | | | | | | | | | | | | | | | | | Ruby-pg's default way to serialize values for transmission to the database is to call #to_s . This however creates a temporary String object for each value. Setting a class based type map avoids the allocation of this additional String. The performance benefit is measurable in microbenchmarks, but not with the overhead of activerecord. However it's free to use and has no drawback.
* | Partially merge #17650Sean Griffin2015-03-268-24/+24
|\| | | | | | | | | 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-258-24/+24
| | | | | | | | | | | | | | | | | | | | 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-265-0/+102
|\ \ | | | | | | Add `config.active_record.warn_on_result_set_size` option
| * | Add `config.active_record.warn_on_records_fetched_greater_than` optionJason Nochlin2015-03-255-0/+102
| |/ | | | | | | | | | | | | | | | | 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
| |
* | Merge pull request #19503 from jasoncodes/no-psqlrcYves Senn2015-03-253-3/+7
|\ \ | | | | | | | | | Avoid loading user's psqlrc when loading test structure
| * | 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-243-1/+19
|\ \ | | | | | | | | | | | | | | | 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-223-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #19493 from larskanis/add_infinity_testYves Senn2015-03-241-0/+9
|\ \ \ | | | | | | | | PostgreSQL, Add test case for "Infinity" string assignment to float columns
| * | | PostgreSQL, Add test case for "Infinity" string assignment to float columns.Lars Kanis2015-03-221-0/+9
| |/ / | | | | | | | | | This is implemented in Type::Float, but not tested, so far.
* | | [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-233-5/+2
|\ \ \ | | | | | | | | remove old unavailable link with relevant fix patch 1
| * | | remove old unavailable link with relevant fixGaurav Sharma2015-03-233-5/+2
| | | |
* | | | 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-233-1/+20
| | | | | | | | | | | | | | | | | | | | | The subtype will (quite reasonably) ignore the possibility that it has `changed_in_place?` by becoming nil. Fixes #19467
* | | Move #19447 changelog to the top and reword it a bit [ci skip]Carlos Antonio da Silva2015-03-221-6/+8
|/ /
* | 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-214-1/+16
|/ / | | | | | | | | | | | | | | | | | | 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-202-1/+35
| | | | | | | | | | | | | | Preserving RACK_ENV behavior. This reverts commit 7bdc7635b885e473f6a577264fd8efad1c02174f, reversing changes made to 45786be516e13d55a1fca9a4abaddd5781209103.
* | Don't cast nil to string in pg enumsSean Griffin2015-03-192-1/+11
| | | | | | | | 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
| | |
* | | Merge pull request #19404 from dmathieu/remove_rack_envAaron Patterson2015-03-192-35/+1
|\ \ \ | | | | | | | | Don't fallback to RACK_ENV when RAILS_ENV is not present
| * | | don't fallback to RACK_ENV when RAILS_ENV is not presentDamien Mathieu2015-03-192-35/+1
| | | |
* | | | Merge pull request #19406 from larskanis/add_changelog_entry_for_17680Yves Senn2015-03-191-0/+7
| |/ / |/| | | | | | | | | | | | | | ActiveRecord: Add a changelog entry for issue #17680. [ci skip] Conflicts: activerecord/CHANGELOG.md
* | | Active Record changelog pass [skip ci]Jon Atack2015-03-191-35/+38
|/ /