Emilio Tagua 8ee0b44148 Merge remote branch 'rails/master' into identity_map ...

Conflicts:
	activerecord/examples/performance.rb
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/association_proxy.rb
	activerecord/lib/active_record/autosave_association.rb
	activerecord/lib/active_record/base.rb
	activerecord/lib/active_record/nested_attributes.rb
	activerecord/test/cases/relations_test.rb

2011-02-15 12:01:04 -03:00

..

admin

Support fixtures for namespaced models [#2965 state:resolved]

2010-04-25 16:04:38 +02:00

all

Added fixtures :all to test_helper.rb to assume that most people just want all their fixtures loaded all the time [DHH] Added fixtures :all as a way of loading all fixtures in the fixture directory at once (closes #7214) [manfred]

2007-02-25 17:31:43 +00:00

categories

Add missing fixtures for #3937.

2006-02-28 17:46:16 +00:00

naked

Added tree mixin and unit tests for all the mixins

2004-12-15 00:46:26 +00:00

reserved_words

Quote table names. Defaults to column quoting. Closes #4593.

2007-10-16 05:06:33 +00:00

.gitignore

Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

2008-01-21 17:20:51 +00:00

accounts.yml

Fix has_one with foreign_key and primary_key association bug which caused the associated object being lost when saving the owner. [#1756 state:resolved]

2009-09-12 16:03:32 +02:00

author_addresses.yml

Add missing author_addresses.yml fixture. Closes #10592.

2008-01-21 17:21:12 +00:00

author_favorites.yml

add self referential has_many :through example [Rick]

2006-03-21 01:07:16 +00:00

authors.yml

belongs_to supports :dependent => :destroy and :delete. Closes #10592.

2008-01-19 05:30:42 +00:00

binaries.yml

fixing invalid yaml [#4424 state:resolved]

2010-04-17 00:14:23 -04:00

books.yml

Fix has_many :through delete with custom foreign keys. Closes #6466.

2007-10-27 18:51:32 +00:00

cars.yml

order should always be concatenated.

2010-09-05 08:13:42 -03:00

categories_ordered.yml

Fixtures: fix YAML ordered map support. Closes #2665.

2007-03-09 02:06:50 +00:00

categories_posts.yml

Use association's :conditions when eager loading. [jeremyevans0@gmail.com] closes #4144

2006-03-16 06:17:54 +00:00

categories.yml

Fixed that single-table inheritance sub-classes couldn't be used to limit the result set with eager loading #1215 [Chris McGrath]

2005-07-03 08:21:22 +00:00

categorizations.yml

Allow :uniq => true with has_many :through associations.

2006-05-06 23:37:56 +00:00

clubs.yml

Add has_one :through support, finally. Closes #4756 [thechrisoshow]

2008-03-21 18:09:03 +00:00

collections.yml

Refactor compute_type to handle situations where the correct class is already loaded

2010-04-12 21:31:20 -07:00

comments.yml

Add some tests for functionality in JoinAssociation which already exists but was previously untested

2010-10-13 08:24:19 -07:00

companies.yml

Associations: DRY up the code which is generating conditions, and make it all use arel rather than SQL strings

2010-12-26 19:38:04 +00:00

computers.yml

Added compatibility with camelCase column names for dynamic finders #533 [Dee.Zsombor]

2005-04-30 15:49:28 +00:00

courses.yml

Added new Base.find API and deprecated find_all, find_first. Added preliminary support for eager loading of associations

2005-04-03 10:52:05 +00:00

customers.yml

Added :constructor and :converter options to composed_of and deprecated the conversion block

2008-09-10 18:28:47 +02:00

dashboards.yml

If a has_many goes :through a belongs_to, and the foreign key of the belongs_to changes, then the has_many should be considered stale.

2010-12-23 15:19:18 -08:00

developers_projects.yml

fix test_find_in_association_with_options test, tweak other tests affected by developer/project addition

2006-03-16 03:24:40 +00:00

developers.yml

Sanitize scoped conditions.

2006-01-04 03:43:28 +00:00

edges.yml

Revert "Revert "Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted.""

2009-11-23 10:42:32 -08:00

entrants.yml

Added a db2 adapter that only depends on the Ruby/DB2 bindings (http://raa.ruby-lang.org/project/ruby-db2/) #386 [Maik Schmidt]. Converted all the fixtures to YAML style ones.

2005-01-01 19:22:16 +00:00

faces.yml

Add inverse polymorphic association support. [#3520 state:resolved]

2009-12-28 15:12:13 +01:00

fk_test_has_fk.yml

Fixed that fixtures were being deleted in the same order as inserts causing FK errors #890 [andrew.john.peters@gmail.com]

2005-04-18 07:52:58 +00:00

fk_test_has_pk.yml

Fixed that fixtures were being deleted in the same order as inserts causing FK errors #890 [andrew.john.peters@gmail.com]

2005-04-18 07:52:58 +00:00

funny_jokes.yml

Fixtures: correct escaping of \n and \r. Closes #5859.

2006-08-24 01:50:24 +00:00

interests.yml

Add inverse polymorphic association support. [#3520 state:resolved]

2009-12-28 15:12:13 +01:00

items.yml

Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

2010-08-14 04:12:33 -03:00

jobs.yml

Ensure table names are quoted by the association preloading code.

2008-04-26 12:14:50 +12:00

legacy_things.yml

allow the 'lock_version' column to be configured with set_locking_column. Closes #3402

2006-01-14 09:36:52 +00:00

mateys.yml

Fixed that create table with :id => false and fixtures don't play nice together (closes #10154) [jbarnette]

2007-11-25 22:08:38 +00:00

member_types.yml

Fix preloading of has_one :through associations on belongs_to [#1507 state:resolved]

2008-12-18 19:19:36 +00:00

members.yml

If a has_many goes :through a belongs_to, and the foreign key of the belongs_to changes, then the has_many should be considered stale.

2010-12-23 15:19:18 -08:00

memberships.yml

If a has_many goes :through a belongs_to, and the foreign key of the belongs_to changes, then the has_many should be considered stale.

2010-12-23 15:19:18 -08:00

men.yml

Providing support for :inverse_of as an option to associations.

2009-05-04 15:27:39 -07:00

minimalistics.yml

Missed the add

2007-10-06 01:03:19 +00:00

minivans.yml

update_attribute should not update readonly attributes

2010-07-21 14:55:57 +02:00

mixed_case_monkeys.yml

Consistently quote primary key column names. Closes #7763.

2007-03-09 03:23:37 +00:00

mixins.yml

Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

2010-08-14 04:12:33 -03:00

movies.yml

Added a db2 adapter that only depends on the Ruby/DB2 bindings (http://raa.ruby-lang.org/project/ruby-db2/) #386 [Maik Schmidt]. Converted all the fixtures to YAML style ones.

2005-01-01 19:22:16 +00:00

organizations.yml

Revert "Fixed bug with polymorphic has_one :as pointing to an STI record"

2009-05-11 12:20:54 -07:00

owners.yml

Fixed preloading belongs_to associations which reference a custom foreign key. References #9640.

2008-01-31 07:50:15 +00:00

parrots_pirates.yml

Foxy fixtures. Adapter#disable_referential_integrity. Closes #9981.

2007-10-26 05:56:46 +00:00

parrots.yml

Foxy fixtures: support single-table inheritance. Closes #10234.

2007-11-26 22:46:11 +00:00

people.yml

Fixed limited eager loading associations with numbers in the name [#2668 state:resolved]

2009-05-18 13:56:17 +02:00

pets.yml

Fixed preloading belongs_to associations which reference a custom foreign key. References #9640.

2008-01-31 07:50:15 +00:00

pirates.yml

Foxy fixtures. Adapter#disable_referential_integrity. Closes #9981.

2007-10-26 05:56:46 +00:00

posts.yml

Correctly update counter caches on deletion for has_many :through [#2824 state:resolved]. Also fixed a bunch of other counter cache bugs in the process, as once I fixed this one others started appearing like nobody's business.

2011-02-07 23:35:05 +00:00

price_estimates.yml

Fix has_many :through a polymorphic has_many. Closes #10529 [Aleksey Kondratenko]

2008-02-02 03:27:31 +00:00

products.yml

Refactor compute_type to handle situations where the correct class is already loaded

2010-04-12 21:31:20 -07:00

projects.yml

Added a db2 adapter that only depends on the Ruby/DB2 bindings (http://raa.ruby-lang.org/project/ruby-db2/) #386 [Maik Schmidt]. Converted all the fixtures to YAML style ones.

2005-01-01 19:22:16 +00:00

readers.yml

Make dynamic finders respect the :include on HasManyThrough associations. Closes #10998. [cpytel]

2008-02-18 00:14:54 +00:00

references.yml

Ensure table names are quoted by the association preloading code.

2008-04-26 12:14:50 +12:00

ships.yml

has_one should always remove the old record (properly), even if not saving the new record, so we don't get the database into a pickle

2011-01-11 13:45:06 -08:00

speedometers.yml

If a has_many goes :through a belongs_to, and the foreign key of the belongs_to changes, then the has_many should be considered stale.

2010-12-23 15:19:18 -08:00

sponsors.yml

If a has_many goes :through a belongs_to, and the foreign key of the belongs_to changes, then the has_many should be considered stale.

2010-12-23 15:19:18 -08:00

subscribers.yml

IdentityMap - Tests for IM

2010-11-19 19:03:56 -03:00

subscriptions.yml

test and fix collection_singular_ids= with string primary keys [#5125 state:resolved]

2010-08-02 16:41:20 +02:00

taggings.yml

Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

2010-08-14 04:12:33 -03:00

tags.yml

Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

2010-08-14 04:12:33 -03:00

tasks.yml

Fixed that Date was in incorrect format in tasks.yml (closes #4072) [mlaster@metavillage.com]

2006-03-04 17:17:43 +00:00

topics.yml

Test for concatenated orders added

2010-06-26 00:59:11 +02:00

toys.yml

Ensure has_many :through works with changed primary keys [#736 state:resolved]

2009-03-09 13:43:28 +00:00

traffic_lights.yml

Make serialized fixtures work again

2010-12-29 16:15:45 +00:00

treasures.yml

Add 'foxy' support for fixtures of polymorphic associations. Closes #10183 [jbarnette, David Lowenfels]

2007-11-20 21:53:22 +00:00

variants.yml

Refactor compute_type to handle situations where the correct class is already loaded

2010-04-12 21:31:20 -07:00

vertices.yml

Included associations: go deep.

2006-08-16 18:10:52 +00:00

warehouse-things.yml

More thoroughly quote table names. Exposes some issues with sqlite2 adapter. Closes #10698.

2008-01-05 14:58:28 +00:00

zines.yml

Providing support for :inverse_of as an option to associations.

2009-05-04 15:27:39 -07:00