aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixing merge errorsAaron Patterson2011-01-042-78/+0
|
* Merge remote branch 'rsim/require_deprecation'Aaron Patterson2011-01-041-0/+2
|\ | | | | | | | | * rsim/require_deprecation: require ActiveSupport deprecatation file before using deprecate method in database_statements
| * require ActiveSupport deprecatation file before using deprecate method in ↵Raimonds Simanovskis2011-01-041-0/+2
| | | | | | | | | | database_statements otherwise when using external ActiveRecord adapters (e.g. Oracle) database_statements might be loaded before active_support/core_ext/module/deprecation which results in NoMethodError (commit 60cf65def805995bcca184c40b44bb01d86a48aa added "deprecate" call to database_statements.rb)
* | Merge remote branch 'rsim/habtm_select_fix'Aaron Patterson2011-01-042-2/+3
|\ \ | | | | | | | | | | | | * rsim/habtm_select_fix: Explicitly select * from has_and_belongs_to_many association tables, simplify exists? query
| * | Explicitly select * from has_and_belongs_to_many association tables, ↵Raimonds Simanovskis2011-01-042-2/+3
| |/ | | | | | | | | simplify exists? query Previous version (after commit 3103296a61709e808aa89c3d37cf22bcdbc5a675) was generating wrong SQL for Oracle when calling exists? method on HABTM association.
* | test that the custom ordered hash can be round-trippedAaron Patterson2011-01-042-5/+17
| |
* | require Psych if possible, use Psych output when enabledAaron Patterson2011-01-041-1/+14
| |
* | use dots for method callsAaron Patterson2011-01-041-3/+8
| |
* | Bump rack-test versionPratik Naik2011-01-041-1/+1
| |
* | Add test cases for model and migration generators which use `change` method.Prem Sichanugrist2011-01-041-0/+19
| |
* | Use Rails 3.1 `change` method in 'add_' migration generatorPrem Sichanugrist2011-01-042-6/+9
| |
* | Use Rails 3.1 `change` method in model generatorPrem Sichanugrist2011-01-042-11/+3
|/
* Remove undocumented feature from has_one where you could pass false as the ↵Jon Leighton2011-01-034-64/+18
| | | | | | | | | | | | second parameter to build_assoc or create_assoc, and the existing associated object would be untouched (the foreign key would not be nullified, and it would not be deleted). If you want behaviour similar to this you can do the following things: * Use :dependent => :nullify (or don't specify :dependent) if you want to prevent the existing associated object from being deleted * Use has_many if you actually want multiple associated objects * Explicitly set the foreign key if, for some reason, you really need to have multiple objects associated with the same has_one. E.g. previous = obj.assoc obj.create_assoc previous.update_attributes(:obj_id => obj.id)
* ActiveRecord::Relation#primary_key should return a string, just like ↵Jon Leighton2011-01-037-28/+25
| | | | ActiveRecord::Base.primary_key does.
* Implement deprecated version of AssociationReflection#primary_key_name, ↵Jon Leighton2011-01-033-1/+19
| | | | which has been renamed to #foreign_key. Also bumping the deprecation_horizon in Active Support to 3.1.
* When preloading a belongs_to, the target should still be set (to nil) if ↵Jon Leighton2011-01-034-12/+25
| | | | there is no foreign key present. And the loaded flag should be set on the association proxy. This then allows us to remove the foreign_key_present? check from BelongsToAssociation#find_target. Also added a test for the same thing on polymorphic associations.
* Create the association scope directly rather than going through with_scopeJon Leighton2011-01-037-31/+32
|
* Make Relation#create_with always merge rather than overwrite, not just when ↵Jon Leighton2011-01-033-4/+12
| | | | merging two relations. If you wish to overwrite, you can do relation.create_with(nil), or for a specific attribute, relation.create_with(:attr => nil).
* Use the association directly in other places tooJon Leighton2011-01-033-20/+13
|
* Let AssociationCollection#find use #scoped to do its finding. Note that I am ↵Jon Leighton2011-01-0314-114/+90
| | | | removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences.
* Fix test_any in relations_test.rb, which was failing when relations_test.rb ↵Jon Leighton2011-01-031-0/+8
| | | | is run on its own (it passes when the entire suite is run). This is a hacky fix for a problem I didn't quite get to the bottom of, so I'd welcome a better solution...
* Rename AssociationProxy#foreign_key_present to foreign_key_present?Jon Leighton2011-01-034-7/+7
|
* Allow assignment on has_one :through where the owner is a new record [#5137 ↵Jon Leighton2011-01-0315-85/+113
| | | | | | | | | | state:resolved] This required changing the code to keep the association proxy for a belongs_to around, despite its target being nil. Which in turn required various changes to the way that stale target checking is handled, in order to support various edge cases (loaded target is nil then foreign key added, foreign key is changed and then changed back, etc). A side effect is that the code is nicer and more succinct. Note that I am removing test_no_unexpected_aliasing since that is basically checking that the proxy for a belongs_to *does* change, which is the exact opposite of the intention of this commit. Also adding various tests for various edge cases and related things. Phew, long commit message!
* Have a proper AssociationReflection#foreign_type method rather than using ↵Jon Leighton2011-01-038-28/+24
| | | | options[:foreign_type]
* Add documentation for the :foreign_type option on belongs_toJon Leighton2011-01-031-0/+5
|
* Some basic tests for the :foreign_type option on belongs_to, which was ↵Jon Leighton2011-01-033-2/+33
| | | | previously completely untested.
* herp derpricating add_limit_offset!Aaron Patterson2011-01-033-12/+4
|
* User id instead of quoted_id to prevent double quoting. Fixes failing test ↵Robert Pankowecki (Gavdi)2011-01-041-1/+1
| | | | for bug #6036.
* Added one more failing test for bug #6036Robert Pankowecki (Gavdi)2011-01-041-0/+6
|
* Make sure that generator's default banner is showing its namespacePrem Sichanugrist2011-01-012-1/+11
| | | | This will make `rails g rspec:install --help` shows "rails generate rspec:install [options]" and not "rails generate install [options]"
* Merge remote branch 'jonleighton/association_fixes' into fuuuAaron Patterson2011-01-0126-255/+260
|\ | | | | | | | | | | | | | | | | | | | | | | | | * jonleighton/association_fixes: Rename AssociationReflection#primary_key_name to foreign_key, since the options key which it relates to is :foreign_key Support for :counter_cache on polymorphic belongs_to Refactor BelongsToAssociation to allow BelongsToPolymorphicAssociation to inherit from it Specify the STI type condition using SQL IN rather than a whole load of ORs. Required a fix to ActiveRecord::Relation#merge for properly merging create_with_value. This also fixes a situation where the type condition was appearing twice in the resultant SQL query. Verify that when has_many associated objects are destroyed via :dependent => :destroy, when the parent is destroyed, the callbacks are run Get rid of extra_conditions param from configure_dependency_for_has_many. I can't see a particularly plausible argument for this being used by plugins, and if they really want they can just redefine the callback or whatever. Note also that before my recent commit the extra_conditions param was completely ignored for :dependent => :destroy. And owner_quoted_id can go too Now we can drop-kick AssociationReflection#dependent_conditions into oblivion. Refactor configure_dependency_for_has_many to use AssociationCollection#delete_all. It was necessary to change test_before_destroy in lifecycle_test.rb so that it checks topic.replies.size *before* doing the destroy, as afterwards it will now (correctly) be 0.
| * Rename AssociationReflection#primary_key_name to foreign_key, since the ↵Jon Leighton2010-12-3116-54/+56
| | | | | | | | options key which it relates to is :foreign_key
| * Support for :counter_cache on polymorphic belongs_toJon Leighton2010-12-313-1/+14
| |
| * Refactor BelongsToAssociation to allow BelongsToPolymorphicAssociation to ↵Jon Leighton2010-12-316-120/+127
| | | | | | | | inherit from it
| * Specify the STI type condition using SQL IN rather than a whole load of ORs. ↵Jon Leighton2010-12-314-6/+21
| | | | | | | | Required a fix to ActiveRecord::Relation#merge for properly merging create_with_value. This also fixes a situation where the type condition was appearing twice in the resultant SQL query.
| * Verify that when has_many associated objects are destroyed via :dependent => ↵Jon Leighton2010-12-312-1/+25
| | | | | | | | :destroy, when the parent is destroyed, the callbacks are run
| * Get rid of extra_conditions param from configure_dependency_for_has_many. I ↵Jon Leighton2010-12-311-9/+3
| | | | | | | | can't see a particularly plausible argument for this being used by plugins, and if they really want they can just redefine the callback or whatever. Note also that before my recent commit the extra_conditions param was completely ignored for :dependent => :destroy.
| * And owner_quoted_id can go tooJon Leighton2010-12-313-22/+0
| |
| * Now we can drop-kick AssociationReflection#dependent_conditions into oblivion.Jon Leighton2010-12-311-11/+0
| |
| * Refactor configure_dependency_for_has_many to use ↵Jon Leighton2010-12-312-41/+24
| | | | | | | | AssociationCollection#delete_all. It was necessary to change test_before_destroy in lifecycle_test.rb so that it checks topic.replies.size *before* doing the destroy, as afterwards it will now (correctly) be 0.
* | render :template is faster than render :fileSantiago Pastorino2011-01-012-5/+4
| |
* | This is not needed anymoreSantiago Pastorino2011-01-011-3/+0
|/
* Recreate symlink in layouts for testsPiotr Sarnacki2010-12-311-0/+1
|
* Do not take gems' i18n locales while testing locales pathsPiotr Sarnacki2010-12-311-2/+8
|
* Don't be so picky on MissingTemplate error details, this fails randomly on ↵Piotr Sarnacki2010-12-311-4/+3
| | | | 1.8.7 because of not ordered hash
* added tests for the MissingTemplate exception message.Nick Sutterer2010-12-311-0/+21
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-311-1/+13
|\
| * Routing guide: clarify what the :as option does for scopesRyan Bigg2010-12-311-2/+2
| |
| * Routing guide: move scope documentation down to where it is referenced more ↵Ryan Bigg2010-12-311-10/+12
| | | | | | | | plainly
| * Routing guide: improve documentation for the scope method, demonstrating use ↵Ryan Bigg2010-12-311-0/+10
| | | | | | | | of named parameters
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 03:04:14 +0000