aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* don't build the reflection chain to calculate `nested?`Aaron Patterson2016-03-041-1/+9
| | | | | | | | We know a reflection can be considered as `nested?` if the source reflection or the through reflection are also through reflections (since the through reflection will also add another join table). This allows us to avoid traversing the entire reflection tree just to calculate whether or not there will be more join tables.
* remove useless ivarAaron Patterson2016-03-041-1/+0
|
* don't treat all associations with extensions as instance dependent.Yves Senn2016-03-034-1/+33
| | | | | | | | | | Closes #23934. This is a forward port of ac832a43b4d026dbad28fed196d2de69ec9928ac Previously the scope of all associations with extensions were wrapped in an instance dependent proc. This made it impossible to preload such associations.
* Fix a small template misrender in ActiveRecord::PersistenceGenadi Samokovarov2016-03-021-1/+1
| | | | | | | | See the end of [this] page. [ci skip] [this]: http://edgeapi.rubyonrails.org/classes/ActiveRecord/Persistence/ClassMethods.html#method-i-create
* Merge pull request #23086 from kamipo/deprecate_insert_update_delete_sqlRafael França2016-03-025-60/+17
|\ | | | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements`
| * Deprecate `{insert|update|delete}_sql` in `DatabaseStatements`Ryuta Kamizono2016-03-025-60/+17
| | | | | | | | | | Originally, `{insert|update|delete}_sql` is protected methods. We can use the `{insert|update|delete}` public methods instead.
* | [ci skip] Add `bundle exec` for ActiveRecord unit testsYasuo Honda2016-03-021-3/+3
| |
* | remove trailing whitespace.Yves Senn2016-03-021-1/+1
| |
* | Remove not needed `exec_insert` in mysql2 adapterRyuta Kamizono2016-03-021-4/+0
|/ | | | Simply it is sufficient to use the method in the super class.
* Merge pull request #23932 from arthurnn/arthurnn/remove_load_pathsArthur Nogueira Neves2016-03-013-4/+0
|\ | | | | Remove load_paths file
| * Remove load_paths fileArthur Neves2016-02-273-4/+0
| |
* | Remove duplicated `test_` prefix [ci skip]Ryuta Kamizono2016-03-021-1/+1
| |
* | Merge pull request #23959 from kamipo/add_test_primary_key_should_be_not_nullRafael França2016-03-011-3/+4
|\ \ | | | | | | Add a test for primary key should be not null
| * | Add a test for primary key should be not nullRyuta Kamizono2016-02-291-3/+4
| |/
* | Merge pull request #23961 from ↵Rafael França2016-03-013-8/+8
|\ \ | | | | | | | | | | | | kamipo/exclude_name_and_type_from_prepare_column_options Exclude `:name` and `:type` from `prepare_column_options`
| * | Exclude `:name` and `:type` from `prepare_column_options`Ryuta Kamizono2016-02-293-8/+8
| |/ | | | | | | Actually `:name` and `:type` are not column options.
* | Merge pull request #23953 from ↵Rafael França2016-03-0112-136/+96
|\ \ | | | | | | | | | | | | kamipo/fix_tests_failure_with_prepared_statements_false Fix tests failure with `prepared_statements: false`
| * | Remove unnecessary namespaces in `explain_test.rb`Ryuta Kamizono2016-02-293-40/+28
| | |
| * | Fix tests failure with `prepared_statements: false`Ryuta Kamizono2016-02-2910-97/+69
| | | | | | | | | | | | | | | | | | Some tests does not work for unprepared statements. Add `if ActiveRecord::Base.connection.prepared_statements` and fix a regex for fix tests failure with `prepared_statements: false`.
| * | Fix `NoMethodError: undefined method `preparable'`Ryuta Kamizono2016-02-291-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error occurs with `prepared_statements: false`: ``` $ ARCONN=postgresql bundle exec ruby -w -Itest test/cases/associations_test.rb Using postgresql Run options: --seed 27753 ...E.................................... Finished in 0.713115s, 56.0919 runs/s, 91.1494 assertions/s. 1) Error: AssociationsTest#test_force_reload_is_uncached: NoMethodError: undefined method `preparable' for #<Arel::Visitors::PostgreSQL:0x007f8699702570> /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `block in select_all' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:83:in `cache_sql' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `select_all' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/querying.rb:39:in `find_by_sql' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:699:in `exec_queries' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/association_relation.rb:32:in `exec_queries' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:580:in `load' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:260:in `records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation.rb:256:in `to_a' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:458:in `get_records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:473:in `find_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_association.rb:412:in `load_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_proxy.rb:45:in `load_target' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/associations/collection_proxy.rb:983:in `records' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/relation/delegation.rb:39:in `each' test/cases/associations_test.rb:116:in `block (2 levels) in test_force_reload_is_uncached' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb:32:in `cache' /Users/kamipo/src/github.com/rails/rails/activerecord/lib/active_record/query_cache.rb:9:in `cache' test/cases/associations_test.rb:115:in `block in test_force_reload_is_uncached' /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/deprecation/reporting.rb:36:in `silence' /Users/kamipo/src/github.com/rails/rails/activesupport/lib/active_support/deprecation/instance_delegator.rb:19:in `silence' test/cases/associations_test.rb:114:in `test_force_reload_is_uncached' ```
* | Merge pull request #23954 from kamipo/fix_undefined_method_fieldsRafael França2016-03-012-1/+19
|\ \ | | | | | | Fix `NoMethodError: undefined method `fields' for nil:NilClass`
| * | Fix `NoMethodError: undefined method `fields' for nil:NilClass`Ryuta Kamizono2016-02-292-1/+19
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `exec_query` raises `NoMethodError` when executing no result queries (`INSERT`, `UPDATE`, `DELETE`, and all DDL) in mysql2 adapter. ``` irb(main):002:0> conn.execute("create table t(a int)") (43.3ms) create table t(a int) => nil irb(main):003:0> conn.execute("insert into t values (1)") (19.3ms) insert into t values (1) => nil irb(main):004:0> conn.exec_query("insert into t values (1)") SQL (28.6ms) insert into t values (1) NoMethodError: undefined method `fields' for nil:NilClass ```
* | Merge pull request #23417 from sgringwe/masterRafael Mendonça França2016-03-014-9/+79
|\ \ | | | | | | | | | Add option to error on ignored order or limit
| * | Add initial support for allowing an error on order or limit of queries being ↵Scott Ringwelski2016-02-024-9/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ignored in batches add some documentation and add 4 tests regarding error vs. warning behavior fix a typo when referring to the message go back to default in tests so that ordering is not important. use a constant instead of method. fix assert_nothing_raised call. use self.klass to allow per class configuration remove logger warn assets as that is tested elsewhere. pass error_on_ignore through find_each and find_in_batches also. add blocks to the finds so that the code is actually executed put the setting back to default in an ensure Add a changelog entry
* | | Merge pull request #23807 from matthewd/executorMatthew Draper2016-03-027-129/+72
|\ \ \ | | | | | | | | Publish AS::Executor and AS::Reloader APIs
| * | | Publish AS::Executor and AS::Reloader APIsMatthew Draper2016-03-027-129/+72
| | | | | | | | | | | | | | | | | | | | | | | | These should allow external code to run blocks of user code to do "work", at a similar unit size to a web request, without needing to get intimate with ActionDipatch.
* | | | Merge pull request #23598 from brchristian/activerecord_second_to_lastMatthew Draper2016-03-022-4/+83
|\ \ \ \ | | | | | | | | | | ActiveRecord #second_to_last tests and finder methods
| * | | | default second_to_last to primary_key index if no order suppliedBrian Christian2016-02-271-1/+7
| | | | |
| * | | | refactor AR second_to_last to use array methodsBrian Christian2016-02-271-1/+6
| | | | |
| * | | | comment out failing .second and .third testsBrian Christian2016-02-271-3/+3
| | | | |
| * | | | adding additional tests for offset and limit behaviorBrian Christian2016-02-271-0/+8
| | | | |
| * | | | additional test assertions (limit and offset)Brian Christian2016-02-271-0/+16
| | | | |
| * | | | AR #second_to_last tests and finder methodsBrian Christian2016-02-272-4/+48
| | |_|/ | |/| |
* | | | Merge pull request #22170 from ↵Matthew Draper2016-03-024-14/+135
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | samphilipd/sam/properly_deallocate_prepared_statements_outside_of_transaction Correctly deallocate prepared statements if we fail inside a transaction
| * | | Make tests a bit more beautifulSam Davies2015-11-051-10/+13
| | | |
| * | | Correctly deallocate prepared statements if we fail inside a transactionSam Davies2015-11-054-14/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Addresses issue #12330 Overview ======== Cached postgres prepared statements become invalidated if the schema changes in a way that it affects the returned result. Examples: - adding or removing a column then doing a 'SELECT *' - removing the foo column then doing a 'SELECT bar.foo' In normal operation this isn't a problem, we can rescue the error, deallocate the prepared statement and re-issue the command. However in PostgreSQL transactions, once any command fails, the transaction becomes 'poisoned' and any subsequent commands will raise InFailedSQLTransaction. This includes DEALLOCATE statements, so the default deallocation strategy instead of removing the cached prepared statement instead raises InFailedSQLTransaction. Why this is bad =============== 1. InFailedSQLTransaction is a fairly cryptic error and doesn't communicate any useful information about what has actually gone wrong. 2. In the naive implementation the prepared statement never gets deallocated - it stays alive for the length of the session taking up memory on the postgres server. 3. It is unsafe to retry the transaction because the bad prepared statement is still in the cache and we would see the exact same failure repeated. Solution ======== If we are outside a transaction we can continue to handle these failures gracefully in the usual way. Inside a transaction instead of issuing a DEALLOCATE command that will certainly fail, we now raise ActiveRecord::PreparedStatementCacheExpired. This can be handled further up the stack, notably inside TransactionManager#within_new_transaction. Here we can make sure to first rollback the transaction, then safely issue DEALLOCATE statements to invalidate the rest of the cached prepared statements. This also allows the user (or some gem) the opportunity to catch this error and voluntarily retry the transaction if a schema change causes the prepared statement cache to become invalidated. Because the outdated statement has been deallocated, we can expect the transaction to succeed on the second try.
* | | | Respect through association scopes when used with polymorphicSean Griffin2016-02-292-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `source_type` option is passed to a has_many through, the resulting `Reflection` will be an instance of `PolymorphicReflection` and not `ThroughReflection`, meaning that it will ignore the scopes that it needs to apply from the through reflections. This adds an additional delegation call to remedy this. I've been finding the reflection code completely impenetrable lately, it could use some major love. Fixes #22726
* | | | Merge pull request #23948 from ctm/remove_pathological_regexpRafael França2016-02-291-1/+1
|\ \ \ \ | | | | | | | | | | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber…
| * | | | Removes potentially quadratic Regexp from ActiveRecord::LogSubscriber#sql_colorClifford T. Matthews2016-02-231-1/+1
| | | | |
* | | | | Merge pull request #18766 from yasyf/issue_17864Sean Griffin2016-02-294-8/+68
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Honour joining model order in `has_many :through` associations when eager loading
| * | | | 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.
* | | | | Fix test name typo prescence -> presenceeileencodes2016-02-271-1/+1
| | | | |
* | | | | Merge pull request #23846 from ↵Rafael França2016-02-252-11/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/correctly_check_ApplicationRecord_in_mountable_engine correctly check `ApplicationRecord` is exist in moutable engine
| * | | | | correctly check `ApplicationRecord` is exist in moutable engineyuuji.yaginuma2016-02-252-11/+17
| | |/ / / | |/| | | | | | | | | | | | | Follow up to 1813b29fc7632959800252f36e4b2e6ed4ac7266
* | | | | Fix uniqueness validation with an after_create hook.Joe Rafaniello2016-02-252-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | record.id_was is nil in after_create/after_save, so we should use id in these cases. While this logic feels incomplete, the existing update_record uses the same logic: https://github.com/rails/rails/blob/2fda4e0874a97a76107ab9e88305169f2c625933/activerecord/lib/active_record/relation.rb#L83 This logic was originally added for a similar problem: updates not working with after_create hook. See: 482f8c15b1d699c95bfbc3d836f674a09c0d9031 Followup to #23581 Fixes #23844
* | | | | Ensure suppressor runs before validationseileencodes2016-02-244-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I ran into an issue where validations on a suppressed record were causing validation errors to be thrown on a record that was never going to be saved. There isn't a reason to run the validations on a record that doesn't matter. This change moves the suppressor up the chain to be run on the `save` or `save!` in the validations rather than in persistence. The issue with running it when we hit persistence is that the validations are run first, then we hit persistance, and then we hit the suppressor. The suppressor comes first. The change to the test was required since I added the `validates_presence_of` validations. Adding this alone was enough to demonstrate the issue. I added a new test to demonstrate the new behavior is explict.
* | | | | Preparing for 5.0.0.beta3 releaseeileencodes2016-02-241-0/+2
| | | | | | | | | | | | | | | | | | | | Adds changelog headers for beta3 release
* | | | | Prep release for Rails 5 beta3eileencodes2016-02-241-1/+1
| | | | |
* | | | | Ensure `drop_table` even if tests failure or interruptedRyuta Kamizono2016-02-241-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was encountered remaining `:binary_testings` table by tests failure. When remaining `:binary_testings` table, never reach `drop_table` due to `create_table` in the test always fails.
* | | | | Remove changelog entry for reverted commiteileencodes2016-02-241-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | I had to revert changes made for this CHANGELOG entry so this is no longer valid. The change for this entry was removed in 2c02bc0.