aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* Use _read_attribute(primary_key) instead of idRafael Mendonça França2015-04-191-1/+1
| | | | | | | | | This will avoid the indirection of having calling id since we already know which is the primary key column. Also this will make explicit the behavior since it is not clear that id gets the right primary key value and not just the value of the "id" column.
* Merge pull request #19783 from vngrs/raise_error_on_touch_if_object_is_staleSean Griffin2015-04-192-3/+25
|\ | | | | Raise StaleObjectError if touched object is stale and locking is enabled
| * Raise StaleObjectError if touched object is stale and locking is enabledMehmet Emin İNAÇ2015-04-192-3/+25
| | | | | | | | | | | | | | | | | | | | Fixes #19776 change test variable names and use more verbose on method less verbose use _read_attribute instead of send
* | Autosave existing records on HMT associations when the parent is newSean Griffin2015-04-183-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To me it seems like this should only be the case if `autosave: true` is set on the association. However, when implemented that way, it caused issues with has many associations, where we have explicit tests stating that child records are updated when the parent is new, even if autosave is not set (presumably to update the parent id, but other changed attributes would be persisted as well). It's quirky, but at least we should be consistently quirky. This constitutes a minor but subtle change in behavior, and therefore should not be backported to 4.2 and earlier. Fixes #19782
* | Merge pull request #19787 from Senjai/patch-2Yves Senn2015-04-181-5/+4
|\ \ | |/ |/| | | | | | | [Doc] Encourage users to user super to override methods. [ci skip]
| * Encourage users to user super to override methods.Richard Wilson2015-04-161-5/+4
|/ | | IMO we shouldn't encourage users to use methods they shouldn't need to know about. As Song (in this example) inherits from ActiveRecord, we can use super here instead to get the same effect with the bonus of not knowing how active record actually implements these methods.
* Merge pull request #19763 from jonatack/fix-typos-in-docsYves Senn2015-04-152-3/+3
|\ | | | | Fix typos and improve the documentation
| * Fix typos and improve the documentationJon Atack2015-04-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a squash of the following commits, from first to last: - Fix minor, random things I’ve come across lately that individually did not seem worth making a PR for, so I saved them for one commit. One common error is using “it’s” (which is an abbreviation of “it is”) when the possessive “its” should be used for indicating possession. - Changes include the name of a test, so remove the `[skip ci]` (thanks @senny). - Line wrap the changes at 80 chars and add one more doc fix. - Add a missing line wrap in the Contributing to Ruby on Rails Guide. - Line wrap the `TIP` section in the Contributing to Ruby on Rails Guide as well. Rendering the guide locally with `bundle exec rake guides:generate` did not show any change in on-screen formatting after adding the line wrap. The HTML generated is (extra line added to illustrate where the line wrap takes place): <div class="info"><p>Please squash your commits into a single commit when appropriate. This simplifies future cherry picks and also keeps the git log clean.</p></div> - Squash commits.
* | Revert "Merge pull request #19755 from yuki24/activerecord/support-for-set"Yves Senn2015-04-153-15/+0
|/ | | | | | | | | | | | | | | This reverts commit 524d40591eaa2f4d007409bfad386f6b107492eb, reversing changes made to 34d3a6095100245283861ef480a54d0643bbee4c. Reasoning behind the revert are in the PR discussion: https://github.com/rails/rails/pull/19755 - This means that types can no longer cast to/from `Set`, and reasonably work with `where` (we already have this problem for `array`/`json` types on pg) - This adds precedent for every other `Enumerable`, and we can't target `Enumerable` directly. - Calling `to_a` on a `Set` is reasonable.
* Merge pull request #19755 from yuki24/activerecord/support-for-setYves Senn2015-04-143-0/+15
|\ | | | | | | Add support for Set to Relation#where
| * Add support for Set to Relation#whereYuki Nishijima2015-04-133-0/+16
| | | | | | | | | | | | | | | | | | Previously `#where` used to treat `Set`objects as nil, but now it treats them as an array: set = Set.new([1, 2]) Author.where(:id => set) # => SELECT "authors".* FROM "authors" WHERE "authors"."id" IN (1, 2)
* | Merge pull request #19753 from jonatack/use-ruby-2-2-2Guillermo Iguaran2015-04-131-1/+1
|\ \ | |/ |/| Upgrade to Ruby 2.2.2
| * Upgrade to Ruby 2.2.2Jon Atack2015-04-141-1/+1
| | | | | | | | and fix the grammar in the ruby_version_check.rb user message.
* | Merge pull request #19741 from greysteil/add-note-about-partial-index-supportYves Senn2015-04-131-0/+2
|\ \ | | | | | | | | | Document that partial indexes are only supported by Postgres and SQLite.
| * | Document that partial indexes are only supported by Postgres and SQLite.Grey Baker2015-04-132-0/+8
|/ / | | | | | | Fixes #18106
* | Add a note regarding add_column restricted API [ci skip]Zachary Scott2015-04-121-0/+4
| | | | | | | | | | | | We should document current behavior, and this is design of API for now. Closes #17597
* | Apply edits from @senny to close #19397 [ci skip]Zachary Scott2015-04-121-4/+1
| |
* | Merge branch 'patch-1'Zachary Scott2015-04-121-3/+5
|\ \
| * | Enhance documentation of pluck with a hint to ids [ci skip]wingfire2015-04-121-3/+5
| | | | | | | | | | | | | | | Documentation is giving an example that can be replaced by a more dry command. Give a hint that ids can be used instead of pluck(:id).
* | | Fix (intermittent?) test failureMatthew Draper2015-04-131-1/+1
| | | | | | | | | | | | | | | | | | We don't actually need to enumerate the possible types here any more; that dates back to before e105e599e706780905d4c348394da989de3b200f, when they were symbols, and indistinguishable from other options.
* | | Merge pull request #19721 from vngrs/validates_presence_of_missing_noteRobin Dupret2015-04-111-0/+4
|\ \ \ | | | | | | | | Missing note on validates_presence_of validation [ci skip]
| * | | Missing note on validates_presence_of validation [ci skip]Mehmet Emin İNAÇ2015-04-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Without this note, someone can misunderstand the usage of validates_presence_of method add missing note for the validates_presence_of
* | | | Use `use_transactional_tests` in Active RecordPrem Sichanugrist2015-04-102-2/+2
|/ / / | | | | | | | | | | | | | | | `use_transactional_fixtures` was deprecated in favor of `use_transactional_tests` in Rails 5.0. This removes one warning while running test suite.
* | | fix documentation for SchemaStatements#add_foreign_keySimon Stemplinger2015-04-081-2/+2
| | | | | | | | | | | | | | | | | | The implementation of the generation of the foreign key name was changed between Rails 4.2.0 and 4.2.1 from a random to a deterministic behavior, however the documentation still describes the old randomized behavior.
* | | Batch touch parent recordsArthur Neves2015-04-087-7/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [fixes #18606] Make belongs_to use touch over touch_later when running the callbacks. Add more tests and small method rename Thanks Jeremy for the feedback.
* | | Merge branch 'fix_uniqueness_validation_when_value_is_out_of_range'Sean Griffin2015-04-083-0/+32
|\ \ \
| * | | Fix uniqueness validation with out of range valueAndrey Voronkov2015-04-083-0/+31
|/ / /
* | | Merge pull request #19680 from vngrs/make_join_model_name_const_privateRafael Mendonça França2015-04-071-3/+1
|\ \ \ | | | | | | | | Change join model name constant to private constant
| * | | Change join model name constant to private constantMehmet Emin İNAÇ2015-04-071-3/+1
| | | | | | | | | | | | | | | | This will resolve the fixme message which is about making constant invisible.
* | | | Merge pull request #17574 from kamipo/charset_collation_optionsJeremy Kemper2015-04-078-19/+172
|\ \ \ \ | | | | | | | | | | | | | | | Add charset and collation options support for MySQL string and text columns.
| * | | | Add `:charset` and `:collation` options support for MySQL string and text ↵Ryuta Kamizono2015-03-068-19/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | columns Example: create_table :foos do |t| t.string :string_utf8_bin, charset: 'utf8', collation: 'utf8_bin' t.text :text_ascii, charset: 'ascii' end
* | | | | Merge pull request #19647 from codeout/association_updateRafael Mendonça França2015-04-062-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix a regression introduced by removing unnecessary db call when replacing
| * | | | | Fix a regression introduced by removing unnecessary db call when replacingShintaro Kojima2015-04-042-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | When replacing a has_many association with the same one, there is nothing to do with database but a setter method should still return the substituted value for backward compatibility.
* | | | | | Merge pull request #19448 from tgxworld/fix_activesupport_callbacks_clash_on_runRafael Mendonça França2015-04-065-19/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix AS::Callbacks raising an error when `:run` callback is defined.
| * | | | | | Revert "Reduce allocations when running AR callbacks."Guo Xiang Tan2015-03-225-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 796cab45561fce268aa74e6587cdb9cae3bb243e.
* | | | | | | No need to document drop_table in the PostgreSQLAdapterRafael Mendonça França2015-04-063-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It behaves in the same way that the abstract adapter. [ci skip]
* | | | | | | change the explanation of :if_exists option [ci skip]Mehmet Emin İNAÇ2015-04-062-2/+2
| |_|_|/ / / |/| | | | |
* | | | | | drop_table method documentation for mysql and postgresql adapters [ci skip]Mehmet Emin İNAÇ2015-04-062-0/+19
| | | | | |
* | | | | | Merge pull request #19652 from vngrs/pluralize_foreign_key_table_name_bugYves Senn2015-04-064-2/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | use singular table name if pluralize_table_names is setted as false whil...
| * | | | | | use singular table name if pluralize_table_names is setted as false while ↵Mehmet Emin İNAÇ2015-04-063-2/+27
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creating foreign key test case for use singular table name if pluralize_table_names is setted as false while creating foreign key refactor references foreign key addition tests use singular table name while removing foreign key merge foreign key singular table name methods remove unnecessary drop table from test
* | | | | | 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