aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* extracted piece of code into a methodNeeraj Singh2013-05-081-13/+12
| | | | | | | | | | | | | | | | In order to fix #10421 I need to enable merge to take an option so that relations could be merged without making the last where condition to win. That fix would forever reside in 4-0-stable branch and would not be merged to master since using scope without lambda has been deprecated. In this commit I have extracted code into a method and I think it makes code look better. Hence the request to merge it in both master and 4-0-stable. If there is any concern then this code can be merged only in 4-0-stable and that would be fine too.
* Merge pull request #10521 from yahonda/sanitize_oracleRafael Mendonça França2013-05-081-5/+4
|\ | | | | Remove current_adapter? from test_sanitize_sql_hash_handles_associations
| * Remove current_adapter? from test_sanitize_sql_hash_handles_associationsYasuo Honda2013-05-081-5/+4
| | | | | | | | | | | | | | Because of each adapter implementation differences, `expected_value` string needed to be handled by each adapter. This commit removes current_adapter by using ActiveRecord::ConnectionAdapters::Quoting methods.
* | Fix Typo existant -> existent [ci skip]Prathamesh Sonpatki2013-05-081-1/+1
| |
* | Created a method to automatically find inverse associations and cachewangjohn2013-05-0711-10/+194
| | | | | | | | | | | | the results. Added tests to check to make sure that inverse associations are automatically found when has_many, has_one, or belongs_to associations are defined.
* | Revert "Merge pull request #10455 from ↵Aaron Patterson2013-05-072-35/+2
| | | | | | | | | | | | | | patricksrobertson/bigserial_id_not_identifying_pk" This reverts commit 3043d45eefc3776d5f3a9e7d212a01f99d869ef8, reversing changes made to ca0275d36b395631725c4583db5a45c06443fdb9.
* | Handle other pk types in PostgreSQL gracefully.Patrick Robertson2013-05-072-2/+35
|/ | | | | | | | | | | | | | In #10410 it was noted that you can no longer create PK's with the type of bigserial in PostgreSQL in 4.0.0.rc1. This is mostly because the newer adapter is checking for column type with the id column instead of just letting it pass through like it did before. Side effects: You may just create a PK column of a type that you really don't want to be your PK. As far as I can tell this was allowed in 3.2.X and perhaps an exception should be raised if you try and do something extremely dumb.
* Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-05-061-4/+4
|
* Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-2/+28
|\ | | | | | | | | | | | | Confirm a record has not already been destroyed before decrementing counter cache Conflicts: activerecord/CHANGELOG.md
| * Confirm a record has not already been destroyed before decrementingBen Tucker2013-05-063-1/+27
| | | | | | | | | | | | | | | | | | counter cache At present, calling destroy multiple times on the same record results in the belongs_to counter cache being decremented multiple times. With this change the record is checked for whether it is already destroyed prior to decrementing the counter cache.
* | Fix test asserting the sanitized SQL hash differently to some adaptersRafael Mendonça França2013-05-061-1/+7
| |
* | Merge pull request #10352 from ↵Rafael Mendonça França2013-05-063-4/+15
|\ \ | | | | | | | | | | | | zohlgren/fix_activerecord_sanitization_sanitize_sql_hash Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditions
| * | Fix bug in ActiveRecord::Sanitization#sanitize_sql_hash_for_conditionsZach Ohlgren2013-05-063-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | Fixing CHANGLOG description Remove extra line. Remove blank lines.
* | | fix failing test caused by 3771e4d511Neeraj Singh2013-05-061-2/+2
|/ /
* | raise IrreversibleMigration if no column givenNeeraj Singh2013-05-063-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #10419 Following code should raise IrreversibleMigration. But the code was failing since options is an array and not a hash. def change change_table :users do |t| t.remove_index [:name, :email] end end Fix was to check if the options is a Hash before operating on it.
* | fix to remove warning on postgres adapter test.Akshay Khole2013-05-051-1/+1
| | | | | | | | | | Warning was: "/vagrant/rails/activerecord/test/cases/adapters/postgresql/uuid_test.rb:63: warning: ambiguous first argument; put parentheses or even spaces"
* | Changing method call according to coding conventionsAkshay Khole2013-05-051-1/+1
| |
* | Merge pull request #10458 from bwbuchanan/issue-10451Rafael Mendonça França2013-05-043-2/+18
|\ \ | | | | | | Make SchemaDumper emit "id: :uuid" when using UUID primary keys
| * | Make SchemaDumper emit "id: :uuid" when appropriate. Fixes #10451.Brian Buchanan2013-05-033-2/+18
| | |
* | | Squashed commit of the following:Aaron Patterson2013-05-031-2/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2683de5da85135e8d9fe48593ff6167db9d64b18 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:29:20 2013 -0700 cannot support infinite ranges right now commit cebb6acef2c3957f975f6db4afd849e535126253 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:26:12 2013 -0700 reverting infinity comparison commit 385f7e6b4efd1bf9b89e8d607fcb13e5b03737ea Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:23:28 2013 -0700 Revert "Added ability to compare date/time with infinity" This reverts commit 38f28dca3aa16efd6cc3af6453f2e6b9e9655ec1. Conflicts: activesupport/CHANGELOG.md activesupport/lib/active_support/core_ext/numeric/infinite_comparable.rb activesupport/test/core_ext/date_ext_test.rb activesupport/test/core_ext/date_time_ext_test.rb activesupport/test/core_ext/numeric_ext_test.rb activesupport/test/core_ext/time_ext_test.rb activesupport/test/core_ext/time_with_zone_test.rb commit 0d799a188dc12b18267fc8421675729917610047 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:18:53 2013 -0700 Revert "Refactor infinite comparable definition a bit" This reverts commit dd3360e05e4909f2f0c74a624cccc2def688f828. commit 42dec90e49745bbfae546f0560b8783f6b48b074 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Fri May 3 11:18:47 2013 -0700 Revert "Require 'active_support/core_ext/module/aliasing' in the infinite_comparable module" This reverts commit 7003e71c13c53ec3d34250560fbf80b8381df693.
* | Do not overwrite manually built records during one-to-one nested attribute ↵Olek Janiszewski2013-05-034-11/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assignment For one-to-one nested associations, if you build the new (in-memory) child object yourself before assignment, then the NestedAttributes module will not overwrite it, e.g.: class Member < ActiveRecord::Base has_one :avatar accepts_nested_attributes_for :avatar def avatar super || build_avatar(width: 200) end end member = Member.new member.avatar_attributes = {icon: 'sad'} member.avatar.width # => 200
* | Merge pull request #10417 from jholton/fix_association_auto_saveJon Leighton2013-05-033-12/+34
|\ \ | | | | | | autosave_association issue that occurs when table has unique index (resubmission)
| * | destroys association records before saving/inserting new association recordsJohnny Holton2013-05-023-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug introduced by #3329 These are the conditions necessary to reproduce the bug: - For an association, autosave => true. - An association record is being destroyed - A new association record is being created. - There is a unique index one of the association's fields. - The record being created has the same value as the record being destroyed on the indexed field. Before, the deletion of records was postponed until after all insertions/saves. Therefore the new record with the identical value in the indexed field caused a non-unique value error to be thrown at the database level. With this fix, the deletions happen first, before the insertions/saves. Therefore the record with the duplicate value is gone from the database before the new record is created, thereby avoiding the non-uniuqe value error.
* | | Fix broken mysql testJon Leighton2013-05-032-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_mysql_integer_not_null_defaults in test/cases/defaults_test.rb was failing. This test relies on the connection being in strict mode. By default a new connection is not in strict mode, but Active Record automatically places it in strict mode. ActiveSchemaTest overwrites the connection's #execute method in order to prevent SQL statements from actually being executed. One of the operations which is performed in ActiveSchema test is a #recreate_database. Since 2088bf27981137a2c6c8b2f718f33b417b4045af, recreate_database on mysql or mysql2 will trigger a reconnect. Due to the implementation of the hacking of #execute in ActiveSchemaTest, this reconnect would take place, but the connection would *not* be placed in strict mode because #execute had been overridden to prevent SQL queries hitting the database. Therefore, after ActiveSchemaTest, the connection would no longer be in strict mode, causing test_mysql_integer_not_null_defaults to fail. I don't think that the way that ActiveSchemaTest is implemented is particularly nice or clean, but I have taken steps to make its hacks more isolated - it now create a separate connection object which is thrown away after the test, and the hacks are applied on the singleton class of this object.
* | | Merge pull request #10424 from markevich/fix_test_prepareRafael Mendonça França2013-05-022-3/+11
|\ \ \ | | | | | | | | Restore ActiveRecord connection to original environment after rake:db:test:prepare task.
| * | | rake:db:test:prepare falls back to original environment after execution.markevich2013-05-022-3/+11
| | | |
* | | | Add parameter :sslcompression to PostgreSQL adapter.Lars Kanis2013-05-021-2/+2
|/ / / | | | | | | | | | It is new in PostgreSQL-9.2 .
* / / Add test for `AR::Base#to_param`Takehiro Adachi2013-05-021-1/+6
|/ / | | | | | | | | | | | | According to the doc of `AR::Base#to_param`( https://github.com/rails/rails/blob/04cda1848cb847c2bdad0bfc12160dc8d554 7775/activerecord/lib/active_record/integration.rb#L18 ), it returns `nil` if the record is not persisted.
* | Merge pull request #10396 from tkhr/extract-test-code-from-base_test.rbCarlos Antonio da Silva2013-05-012-73/+82
|\ \ | | | | | | Extract tests code out from AR's base_test.rb to integration_test.rb
| * | Extract tests code out from AR's base_test.rb to integration_test.rbTakehiro Adachi2013-05-022-73/+82
| |/ | | | | | | | | | | `AR::Base#to_param` and `AR::Base#cache_key` is defined at active_record/integration.rb, so tests for those methods should be at integration_test.rb
* | Merge pull request #7839 from ↵Aaron Patterson2013-05-017-9/+70
|\ \ | | | | | | | | | | | | chancancode/handle_aliased_attributes_in_ar_relation Handle aliased attributes in AR::Relation
| * | Handle aliased attributes in ActiveRecord::Relation.Godfrey Chan2013-05-017-9/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using symbol keys, ActiveRecord will now translate aliased attribute names to the actual column name used in the database: With the model class Topic alias_attribute :heading, :title end The call Topic.where(heading: 'The First Topic') should yield the same result as Topic.where(title: 'The First Topic') This also applies to ActiveRecord::Relation::Calculations calls such as `Model.sum(:aliased)` and `Model.pluck(:aliased)`. This will not work with SQL fragment strings like `Model.sum('DISTINCT aliased')`. Github #7839 *Godfrey Chan*
* | | Improve docs for postgresql with uuid primary keys [ci skip]Carlos Antonio da Silva2013-05-012-9/+7
|/ / | | | | | | Introduced in 09ac1776abc0d3482f491f2d49f47bcb3d9a4ad7.
* / allow override of uuid_generate_v4() default by passing default: nilChad Moone2013-05-012-1/+61
|/ | | | without this, it's not possible to use UUID primary keys without uuid-ossp installed and activated
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-013-3/+12
|\
| * readonly info for save and save!Neeraj Singh2013-04-171-0/+6
| |
| * documentation fixes for Array.wrap and AR::Validations::AssociatedValidatorHrvoje Šimić2013-04-171-2/+2
| |
| * updated rdoc to reflect info about readonly attributeNeeraj Singh2013-04-171-0/+2
| |
| * without autosave option updated records not saveNeeraj Singh2013-04-171-1/+2
| | | | | | | | | | Emphasizing that without autosave option only new records are saved and updated records are not saved
* | maintain return value for recreate_databaseAaron Patterson2013-04-301-1/+2
| |
* | Mute psql output when running rake db:schema:loadGodfrey Chan2013-04-303-2/+6
| |
* | Fix #8856 Ensure has_one association=(associate) triggers save.Chris Thompson2013-04-303-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activerecord/lib/active_record/associations.rb states: # [association=(associate)] # Assigns the associate object, extracts the primary key, sets it as the foreign key, # and saves the associate object. Since commit 42dd5d9f2976677a4bf22347f2dde1a8135dfbb4 to fix #7191, this is no longer the case if the associate has changed, but is the same object. For example: # Pirate has_one :ship pirate = Pirate.create!(catchphrase: "A Pirate") ship = pirate.build_ship(name: 'old name') ship.save! ship.name = 'new name' pirate.ship = ship That last line should trigger a save. Although we are not changing the association, the associate (ship) has changed.
* | Merge pull request #10390 from Noemj/bind_param_handlingRafael Mendonça França2013-04-301-3/+3
|\ \ | | | | | | Added :nodoc: for relation.rb's private methods
| * | Added :nodoc: for private methodsNoemj2013-04-301-3/+3
| | |
* | | mysql needs to reconnect after recreate. Thanks @mperhamAaron Patterson2013-04-301-0/+1
| | |
* | | Abort a rake task when missing db/structure.sql like `db:schema:load` task.kennyj2013-05-014-6/+21
|/ /
* | Moved update_record logic to relation.rbNoemj2013-04-302-26/+28
| |
* | add missing :nodoc: marks to ActiveRecord::Delegation [ci skip]Francesco Rodriguez2013-04-291-3/+3
| |
* | rails/master is now 4.1.0.betaRafael Mendonça França2013-04-292-2044/+3
| |
* | Bump version to rc1David Heinemeier Hansson2013-04-291-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 00:16:06 +0000