Update ruby-activerecord to 2.1.0 for rails-2.1.0.

Too many changes since 2.0.2.  See CHANGELOG for the complete list.

3 files changed, 196 insertions, 180 deletions

diff --git a/databases/ruby-activerecord/Makefile b/databases/ruby-activerecord/Makefile
index c811c2e634e..6986ca4bece 100644
--- a/databases/ruby-activerecord/Makefile
+++ b/databases/ruby-activerecord/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2008/04/04 15:30:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2008/06/20 04:27:37 minskim Exp $
 
-DISTNAME=	activerecord-2.0.2
+DISTNAME=	activerecord-2.1.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/activerecord/
 COMMENT=	Object-relation mapping put on rails
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.0.2nb1:../../devel/ruby-activesupport
+DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=2.1.0:../../devel/ruby-activesupport
 
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ruby-activerecord/PLIST b/databases/ruby-activerecord/PLIST
index f018370bed8..d0b25074e2b 100644
--- a/databases/ruby-activerecord/PLIST
+++ b/databases/ruby-activerecord/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2008/04/04 15:30:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/06/20 04:27:37 minskim Exp $
 ${GEM_HOME}/cache/activerecord-${PKGVERSION}.gem
 ${GEM_LIBDIR}/CHANGELOG
 ${GEM_LIBDIR}/README
@@ -8,6 +8,7 @@ ${GEM_LIBDIR}/examples/associations.png
 ${GEM_LIBDIR}/install.rb
 ${GEM_LIBDIR}/lib/active_record.rb
 ${GEM_LIBDIR}/lib/active_record/aggregations.rb
+${GEM_LIBDIR}/lib/active_record/association_preload.rb
 ${GEM_LIBDIR}/lib/active_record/associations.rb
 ${GEM_LIBDIR}/lib/active_record/associations/association_collection.rb
 ${GEM_LIBDIR}/lib/active_record/associations/association_proxy.rb
@@ -17,6 +18,7 @@ ${GEM_LIBDIR}/lib/active_record/associations/has_and_belongs_to_many_association
 ${GEM_LIBDIR}/lib/active_record/associations/has_many_association.rb
 ${GEM_LIBDIR}/lib/active_record/associations/has_many_through_association.rb
 ${GEM_LIBDIR}/lib/active_record/associations/has_one_association.rb
+${GEM_LIBDIR}/lib/active_record/associations/has_one_through_association.rb
 ${GEM_LIBDIR}/lib/active_record/attribute_methods.rb
 ${GEM_LIBDIR}/lib/active_record/base.rb
 ${GEM_LIBDIR}/lib/active_record/calculations.rb
@@ -32,10 +34,12 @@ ${GEM_LIBDIR}/lib/active_record/connection_adapters/mysql_adapter.rb
 ${GEM_LIBDIR}/lib/active_record/connection_adapters/postgresql_adapter.rb
 ${GEM_LIBDIR}/lib/active_record/connection_adapters/sqlite3_adapter.rb
 ${GEM_LIBDIR}/lib/active_record/connection_adapters/sqlite_adapter.rb
+${GEM_LIBDIR}/lib/active_record/dirty.rb
 ${GEM_LIBDIR}/lib/active_record/fixtures.rb
 ${GEM_LIBDIR}/lib/active_record/locking/optimistic.rb
 ${GEM_LIBDIR}/lib/active_record/locking/pessimistic.rb
 ${GEM_LIBDIR}/lib/active_record/migration.rb
+${GEM_LIBDIR}/lib/active_record/named_scope.rb
 ${GEM_LIBDIR}/lib/active_record/observer.rb
 ${GEM_LIBDIR}/lib/active_record/query_cache.rb
 ${GEM_LIBDIR}/lib/active_record/reflection.rb
@@ -44,6 +48,7 @@ ${GEM_LIBDIR}/lib/active_record/schema_dumper.rb
 ${GEM_LIBDIR}/lib/active_record/serialization.rb
 ${GEM_LIBDIR}/lib/active_record/serializers/json_serializer.rb
 ${GEM_LIBDIR}/lib/active_record/serializers/xml_serializer.rb
+${GEM_LIBDIR}/lib/active_record/test_case.rb
 ${GEM_LIBDIR}/lib/active_record/timestamp.rb
 ${GEM_LIBDIR}/lib/active_record/transactions.rb
 ${GEM_LIBDIR}/lib/active_record/validations.rb
@@ -51,32 +56,79 @@ ${GEM_LIBDIR}/lib/active_record/vendor/db2.rb
 ${GEM_LIBDIR}/lib/active_record/vendor/mysql.rb
 ${GEM_LIBDIR}/lib/active_record/version.rb
 ${GEM_LIBDIR}/lib/activerecord.rb
-${GEM_LIBDIR}/test/aaa_create_tables_test.rb
-${GEM_LIBDIR}/test/abstract_unit.rb
-${GEM_LIBDIR}/test/active_schema_test_mysql.rb
-${GEM_LIBDIR}/test/adapter_test.rb
-${GEM_LIBDIR}/test/adapter_test_sqlserver.rb
-${GEM_LIBDIR}/test/aggregations_test.rb
-${GEM_LIBDIR}/test/all.sh
-${GEM_LIBDIR}/test/ar_schema_test.rb
-${GEM_LIBDIR}/test/association_inheritance_reload.rb
-${GEM_LIBDIR}/test/associations/callbacks_test.rb
-${GEM_LIBDIR}/test/associations/cascaded_eager_loading_test.rb
-${GEM_LIBDIR}/test/associations/eager_singularization_test.rb
-${GEM_LIBDIR}/test/associations/eager_test.rb
-${GEM_LIBDIR}/test/associations/extension_test.rb
-${GEM_LIBDIR}/test/associations/inner_join_association_test.rb
-${GEM_LIBDIR}/test/associations/join_model_test.rb
-${GEM_LIBDIR}/test/associations_test.rb
-${GEM_LIBDIR}/test/attribute_methods_test.rb
-${GEM_LIBDIR}/test/base_test.rb
-${GEM_LIBDIR}/test/binary_test.rb
-${GEM_LIBDIR}/test/calculations_test.rb
-${GEM_LIBDIR}/test/callbacks_test.rb
-${GEM_LIBDIR}/test/class_inheritable_attributes_test.rb
-${GEM_LIBDIR}/test/column_alias_test.rb
-${GEM_LIBDIR}/test/connection_test_firebird.rb
-${GEM_LIBDIR}/test/connection_test_mysql.rb
+${GEM_LIBDIR}/test/assets/example.log
+${GEM_LIBDIR}/test/assets/flowers.jpg
+${GEM_LIBDIR}/test/cases/aaa_create_tables_test.rb
+${GEM_LIBDIR}/test/cases/active_schema_test_mysql.rb
+${GEM_LIBDIR}/test/cases/active_schema_test_postgresql.rb
+${GEM_LIBDIR}/test/cases/adapter_test.rb
+${GEM_LIBDIR}/test/cases/adapter_test_sqlserver.rb
+${GEM_LIBDIR}/test/cases/aggregations_test.rb
+${GEM_LIBDIR}/test/cases/ar_schema_test.rb
+${GEM_LIBDIR}/test/cases/associations/belongs_to_associations_test.rb
+${GEM_LIBDIR}/test/cases/associations/callbacks_test.rb
+${GEM_LIBDIR}/test/cases/associations/cascaded_eager_loading_test.rb
+${GEM_LIBDIR}/test/cases/associations/eager_load_nested_include_test.rb
+${GEM_LIBDIR}/test/cases/associations/eager_singularization_test.rb
+${GEM_LIBDIR}/test/cases/associations/eager_test.rb
+${GEM_LIBDIR}/test/cases/associations/extension_test.rb
+${GEM_LIBDIR}/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+${GEM_LIBDIR}/test/cases/associations/has_many_associations_test.rb
+${GEM_LIBDIR}/test/cases/associations/has_many_through_associations_test.rb
+${GEM_LIBDIR}/test/cases/associations/has_one_associations_test.rb
+${GEM_LIBDIR}/test/cases/associations/has_one_through_associations_test.rb
+${GEM_LIBDIR}/test/cases/associations/inner_join_association_test.rb
+${GEM_LIBDIR}/test/cases/associations/join_model_test.rb
+${GEM_LIBDIR}/test/cases/associations_test.rb
+${GEM_LIBDIR}/test/cases/attribute_methods_test.rb
+${GEM_LIBDIR}/test/cases/base_test.rb
+${GEM_LIBDIR}/test/cases/binary_test.rb
+${GEM_LIBDIR}/test/cases/calculations_test.rb
+${GEM_LIBDIR}/test/cases/callbacks_test.rb
+${GEM_LIBDIR}/test/cases/class_inheritable_attributes_test.rb
+${GEM_LIBDIR}/test/cases/column_alias_test.rb
+${GEM_LIBDIR}/test/cases/connection_test_firebird.rb
+${GEM_LIBDIR}/test/cases/connection_test_mysql.rb
+${GEM_LIBDIR}/test/cases/copy_table_test_sqlite.rb
+${GEM_LIBDIR}/test/cases/datatype_test_postgresql.rb
+${GEM_LIBDIR}/test/cases/date_time_test.rb
+${GEM_LIBDIR}/test/cases/default_test_firebird.rb
+${GEM_LIBDIR}/test/cases/defaults_test.rb
+${GEM_LIBDIR}/test/cases/deprecated_finder_test.rb
+${GEM_LIBDIR}/test/cases/dirty_test.rb
+${GEM_LIBDIR}/test/cases/finder_respond_to_test.rb
+${GEM_LIBDIR}/test/cases/finder_test.rb
+${GEM_LIBDIR}/test/cases/fixtures_test.rb
+${GEM_LIBDIR}/test/cases/helper.rb
+${GEM_LIBDIR}/test/cases/inheritance_test.rb
+${GEM_LIBDIR}/test/cases/invalid_date_test.rb
+${GEM_LIBDIR}/test/cases/json_serialization_test.rb
+${GEM_LIBDIR}/test/cases/lifecycle_test.rb
+${GEM_LIBDIR}/test/cases/locking_test.rb
+${GEM_LIBDIR}/test/cases/method_scoping_test.rb
+${GEM_LIBDIR}/test/cases/migration_test.rb
+${GEM_LIBDIR}/test/cases/migration_test_firebird.rb
+${GEM_LIBDIR}/test/cases/mixin_test.rb
+${GEM_LIBDIR}/test/cases/modules_test.rb
+${GEM_LIBDIR}/test/cases/multiple_db_test.rb
+${GEM_LIBDIR}/test/cases/named_scope_test.rb
+${GEM_LIBDIR}/test/cases/pk_test.rb
+${GEM_LIBDIR}/test/cases/query_cache_test.rb
+${GEM_LIBDIR}/test/cases/readonly_test.rb
+${GEM_LIBDIR}/test/cases/reflection_test.rb
+${GEM_LIBDIR}/test/cases/reserved_word_test_mysql.rb
+${GEM_LIBDIR}/test/cases/schema_authorization_test_postgresql.rb
+${GEM_LIBDIR}/test/cases/schema_dumper_test.rb
+${GEM_LIBDIR}/test/cases/schema_test_postgresql.rb
+${GEM_LIBDIR}/test/cases/serialization_test.rb
+${GEM_LIBDIR}/test/cases/synonym_test_oracle.rb
+${GEM_LIBDIR}/test/cases/table_name_test_sqlserver.rb
+${GEM_LIBDIR}/test/cases/threaded_connections_test.rb
+${GEM_LIBDIR}/test/cases/transactions_test.rb
+${GEM_LIBDIR}/test/cases/unconnected_test.rb
+${GEM_LIBDIR}/test/cases/validations_test.rb
+${GEM_LIBDIR}/test/cases/xml_serialization_test.rb
+${GEM_LIBDIR}/test/config.rb
 ${GEM_LIBDIR}/test/connections/native_db2/connection.rb
 ${GEM_LIBDIR}/test/connections/native_firebird/connection.rb
 ${GEM_LIBDIR}/test/connections/native_frontbase/connection.rb
@@ -88,213 +140,176 @@ ${GEM_LIBDIR}/test/connections/native_sqlite/connection.rb
 ${GEM_LIBDIR}/test/connections/native_sqlite3/connection.rb
 ${GEM_LIBDIR}/test/connections/native_sqlite3/in_memory_connection.rb
 ${GEM_LIBDIR}/test/connections/native_sybase/connection.rb
-${GEM_LIBDIR}/test/copy_table_test_sqlite.rb
-${GEM_LIBDIR}/test/datatype_test_postgresql.rb
-${GEM_LIBDIR}/test/date_time_test.rb
-${GEM_LIBDIR}/test/default_test_firebird.rb
-${GEM_LIBDIR}/test/defaults_test.rb
-${GEM_LIBDIR}/test/deprecated_finder_test.rb
-${GEM_LIBDIR}/test/finder_test.rb
 ${GEM_LIBDIR}/test/fixtures/accounts.yml
 ${GEM_LIBDIR}/test/fixtures/all/developers.yml
 ${GEM_LIBDIR}/test/fixtures/all/people.csv
 ${GEM_LIBDIR}/test/fixtures/all/tasks.yml
-${GEM_LIBDIR}/test/fixtures/author.rb
+${GEM_LIBDIR}/test/fixtures/author_addresses.yml
 ${GEM_LIBDIR}/test/fixtures/author_favorites.yml
 ${GEM_LIBDIR}/test/fixtures/authors.yml
-${GEM_LIBDIR}/test/fixtures/auto_id.rb
-${GEM_LIBDIR}/test/fixtures/bad_fixtures/attr_with_numeric_first_char
-${GEM_LIBDIR}/test/fixtures/bad_fixtures/attr_with_spaces
-${GEM_LIBDIR}/test/fixtures/bad_fixtures/blank_line
-${GEM_LIBDIR}/test/fixtures/bad_fixtures/duplicate_attributes
-${GEM_LIBDIR}/test/fixtures/bad_fixtures/missing_value
 ${GEM_LIBDIR}/test/fixtures/binaries.yml
-${GEM_LIBDIR}/test/fixtures/binary.rb
-${GEM_LIBDIR}/test/fixtures/book.rb
 ${GEM_LIBDIR}/test/fixtures/books.yml
 ${GEM_LIBDIR}/test/fixtures/categories.yml
 ${GEM_LIBDIR}/test/fixtures/categories/special_categories.yml
 ${GEM_LIBDIR}/test/fixtures/categories/subsubdir/arbitrary_filename.yml
 ${GEM_LIBDIR}/test/fixtures/categories_ordered.yml
 ${GEM_LIBDIR}/test/fixtures/categories_posts.yml
-${GEM_LIBDIR}/test/fixtures/categorization.rb
 ${GEM_LIBDIR}/test/fixtures/categorizations.yml
-${GEM_LIBDIR}/test/fixtures/category.rb
-${GEM_LIBDIR}/test/fixtures/citation.rb
-${GEM_LIBDIR}/test/fixtures/column_name.rb
-${GEM_LIBDIR}/test/fixtures/comment.rb
+${GEM_LIBDIR}/test/fixtures/clubs.yml
 ${GEM_LIBDIR}/test/fixtures/comments.yml
 ${GEM_LIBDIR}/test/fixtures/companies.yml
-${GEM_LIBDIR}/test/fixtures/company.rb
-${GEM_LIBDIR}/test/fixtures/company_in_module.rb
-${GEM_LIBDIR}/test/fixtures/computer.rb
 ${GEM_LIBDIR}/test/fixtures/computers.yml
-${GEM_LIBDIR}/test/fixtures/contact.rb
-${GEM_LIBDIR}/test/fixtures/course.rb
 ${GEM_LIBDIR}/test/fixtures/courses.yml
-${GEM_LIBDIR}/test/fixtures/customer.rb
 ${GEM_LIBDIR}/test/fixtures/customers.yml
-${GEM_LIBDIR}/test/fixtures/db_definitions/db2.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/db2.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/db22.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/db22.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/firebird.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/firebird.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/firebird2.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/firebird2.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/frontbase.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/frontbase.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/frontbase2.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/frontbase2.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/openbase.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/openbase.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/openbase2.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/openbase2.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/oracle.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/oracle.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/oracle2.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/oracle2.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/postgresql.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/postgresql.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/postgresql2.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/postgresql2.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/schema.rb
-${GEM_LIBDIR}/test/fixtures/db_definitions/schema2.rb
-${GEM_LIBDIR}/test/fixtures/db_definitions/sqlite.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/sqlite.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/sqlite2.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/sqlite2.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/sybase.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/sybase.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/sybase2.drop.sql
-${GEM_LIBDIR}/test/fixtures/db_definitions/sybase2.sql
-${GEM_LIBDIR}/test/fixtures/default.rb
-${GEM_LIBDIR}/test/fixtures/developer.rb
 ${GEM_LIBDIR}/test/fixtures/developers.yml
 ${GEM_LIBDIR}/test/fixtures/developers_projects.yml
-${GEM_LIBDIR}/test/fixtures/developers_projects/david_action_controller
-${GEM_LIBDIR}/test/fixtures/developers_projects/david_active_record
-${GEM_LIBDIR}/test/fixtures/developers_projects/jamis_active_record
-${GEM_LIBDIR}/test/fixtures/edge.rb
 ${GEM_LIBDIR}/test/fixtures/edges.yml
-${GEM_LIBDIR}/test/fixtures/entrant.rb
 ${GEM_LIBDIR}/test/fixtures/entrants.yml
-${GEM_LIBDIR}/test/fixtures/example.log
 ${GEM_LIBDIR}/test/fixtures/fk_test_has_fk.yml
 ${GEM_LIBDIR}/test/fixtures/fk_test_has_pk.yml
-${GEM_LIBDIR}/test/fixtures/flowers.jpg
 ${GEM_LIBDIR}/test/fixtures/funny_jokes.yml
-${GEM_LIBDIR}/test/fixtures/item.rb
 ${GEM_LIBDIR}/test/fixtures/items.yml
-${GEM_LIBDIR}/test/fixtures/joke.rb
-${GEM_LIBDIR}/test/fixtures/keyboard.rb
-${GEM_LIBDIR}/test/fixtures/legacy_thing.rb
+${GEM_LIBDIR}/test/fixtures/jobs.yml
 ${GEM_LIBDIR}/test/fixtures/legacy_things.yml
-${GEM_LIBDIR}/test/fixtures/matey.rb
 ${GEM_LIBDIR}/test/fixtures/mateys.yml
-${GEM_LIBDIR}/test/fixtures/migrations/1_people_have_last_names.rb
-${GEM_LIBDIR}/test/fixtures/migrations/2_we_need_reminders.rb
-${GEM_LIBDIR}/test/fixtures/migrations/3_innocent_jointable.rb
-${GEM_LIBDIR}/test/fixtures/migrations_with_decimal/1_give_me_big_numbers.rb
-${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate/1_people_have_last_names.rb
-${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate/2_we_need_reminders.rb
-${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate/3_foo.rb
-${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate/3_innocent_jointable.rb
-${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions/1000_people_have_middle_names.rb
-${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions/1_people_have_last_names.rb
-${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions/3_we_need_reminders.rb
-${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions/4_innocent_jointable.rb
-${GEM_LIBDIR}/test/fixtures/minimalistic.rb
+${GEM_LIBDIR}/test/fixtures/members.yml
+${GEM_LIBDIR}/test/fixtures/memberships.yml
 ${GEM_LIBDIR}/test/fixtures/minimalistics.yml
-${GEM_LIBDIR}/test/fixtures/mixed_case_monkey.rb
 ${GEM_LIBDIR}/test/fixtures/mixed_case_monkeys.yml
 ${GEM_LIBDIR}/test/fixtures/mixins.yml
-${GEM_LIBDIR}/test/fixtures/movie.rb
 ${GEM_LIBDIR}/test/fixtures/movies.yml
 ${GEM_LIBDIR}/test/fixtures/naked/csv/accounts.csv
 ${GEM_LIBDIR}/test/fixtures/naked/yml/accounts.yml
 ${GEM_LIBDIR}/test/fixtures/naked/yml/companies.yml
 ${GEM_LIBDIR}/test/fixtures/naked/yml/courses.yml
-${GEM_LIBDIR}/test/fixtures/order.rb
-${GEM_LIBDIR}/test/fixtures/parrot.rb
+${GEM_LIBDIR}/test/fixtures/owners.yml
 ${GEM_LIBDIR}/test/fixtures/parrots.yml
 ${GEM_LIBDIR}/test/fixtures/parrots_pirates.yml
 ${GEM_LIBDIR}/test/fixtures/people.yml
-${GEM_LIBDIR}/test/fixtures/person.rb
-${GEM_LIBDIR}/test/fixtures/pirate.rb
+${GEM_LIBDIR}/test/fixtures/pets.yml
 ${GEM_LIBDIR}/test/fixtures/pirates.yml
-${GEM_LIBDIR}/test/fixtures/post.rb
 ${GEM_LIBDIR}/test/fixtures/posts.yml
-${GEM_LIBDIR}/test/fixtures/project.rb
+${GEM_LIBDIR}/test/fixtures/price_estimates.yml
 ${GEM_LIBDIR}/test/fixtures/projects.yml
-${GEM_LIBDIR}/test/fixtures/reader.rb
 ${GEM_LIBDIR}/test/fixtures/readers.yml
-${GEM_LIBDIR}/test/fixtures/reply.rb
+${GEM_LIBDIR}/test/fixtures/references.yml
 ${GEM_LIBDIR}/test/fixtures/reserved_words/distinct.yml
 ${GEM_LIBDIR}/test/fixtures/reserved_words/distincts_selects.yml
 ${GEM_LIBDIR}/test/fixtures/reserved_words/group.yml
 ${GEM_LIBDIR}/test/fixtures/reserved_words/select.yml
 ${GEM_LIBDIR}/test/fixtures/reserved_words/values.yml
-${GEM_LIBDIR}/test/fixtures/ship.rb
 ${GEM_LIBDIR}/test/fixtures/ships.yml
-${GEM_LIBDIR}/test/fixtures/subject.rb
-${GEM_LIBDIR}/test/fixtures/subscriber.rb
-${GEM_LIBDIR}/test/fixtures/subscribers/first
-${GEM_LIBDIR}/test/fixtures/subscribers/second
-${GEM_LIBDIR}/test/fixtures/tag.rb
-${GEM_LIBDIR}/test/fixtures/tagging.rb
+${GEM_LIBDIR}/test/fixtures/sponsors.yml
+${GEM_LIBDIR}/test/fixtures/subscribers.yml
+${GEM_LIBDIR}/test/fixtures/subscriptions.yml
 ${GEM_LIBDIR}/test/fixtures/taggings.yml
 ${GEM_LIBDIR}/test/fixtures/tags.yml
-${GEM_LIBDIR}/test/fixtures/task.rb
 ${GEM_LIBDIR}/test/fixtures/tasks.yml
-${GEM_LIBDIR}/test/fixtures/topic.rb
 ${GEM_LIBDIR}/test/fixtures/topics.yml
-${GEM_LIBDIR}/test/fixtures/treasure.rb
 ${GEM_LIBDIR}/test/fixtures/treasures.yml
-${GEM_LIBDIR}/test/fixtures/vertex.rb
 ${GEM_LIBDIR}/test/fixtures/vertices.yml
-${GEM_LIBDIR}/test/fixtures_test.rb
-${GEM_LIBDIR}/test/inheritance_test.rb
-${GEM_LIBDIR}/test/json_serialization_test.rb
-${GEM_LIBDIR}/test/lifecycle_test.rb
-${GEM_LIBDIR}/test/locking_test.rb
-${GEM_LIBDIR}/test/method_scoping_test.rb
-${GEM_LIBDIR}/test/migration_test.rb
-${GEM_LIBDIR}/test/migration_test_firebird.rb
-${GEM_LIBDIR}/test/mixin_test.rb
-${GEM_LIBDIR}/test/modules_test.rb
-${GEM_LIBDIR}/test/multiple_db_test.rb
-${GEM_LIBDIR}/test/pk_test.rb
-${GEM_LIBDIR}/test/query_cache_test.rb
-${GEM_LIBDIR}/test/readonly_test.rb
-${GEM_LIBDIR}/test/reflection_test.rb
-${GEM_LIBDIR}/test/reserved_word_test_mysql.rb
-${GEM_LIBDIR}/test/schema_authorization_test_postgresql.rb
-${GEM_LIBDIR}/test/schema_dumper_test.rb
-${GEM_LIBDIR}/test/schema_test_postgresql.rb
-${GEM_LIBDIR}/test/serialization_test.rb
-${GEM_LIBDIR}/test/synonym_test_oracle.rb
-${GEM_LIBDIR}/test/table_name_test_sqlserver.rb
-${GEM_LIBDIR}/test/threaded_connections_test.rb
-${GEM_LIBDIR}/test/transactions_test.rb
-${GEM_LIBDIR}/test/unconnected_test.rb
-${GEM_LIBDIR}/test/validations_test.rb
-${GEM_LIBDIR}/test/xml_serialization_test.rb
+${GEM_LIBDIR}/test/fixtures/warehouse-things.yml
+${GEM_LIBDIR}/test/migrations/decimal/1_give_me_big_numbers.rb
+${GEM_LIBDIR}/test/migrations/duplicate/1_people_have_last_names.rb
+${GEM_LIBDIR}/test/migrations/duplicate/2_we_need_reminders.rb
+${GEM_LIBDIR}/test/migrations/duplicate/3_foo.rb
+${GEM_LIBDIR}/test/migrations/duplicate/3_innocent_jointable.rb
+${GEM_LIBDIR}/test/migrations/duplicate_names/20080507052938_chunky.rb
+${GEM_LIBDIR}/test/migrations/duplicate_names/20080507053028_chunky.rb
+${GEM_LIBDIR}/test/migrations/interleaved/pass_1/3_innocent_jointable.rb
+${GEM_LIBDIR}/test/migrations/interleaved/pass_2/1_people_have_last_names.rb
+${GEM_LIBDIR}/test/migrations/interleaved/pass_2/3_innocent_jointable.rb
+${GEM_LIBDIR}/test/migrations/interleaved/pass_3/1_people_have_last_names.rb
+${GEM_LIBDIR}/test/migrations/interleaved/pass_3/2_i_raise_on_down.rb
+${GEM_LIBDIR}/test/migrations/interleaved/pass_3/3_innocent_jointable.rb
+${GEM_LIBDIR}/test/migrations/missing/1000_people_have_middle_names.rb
+${GEM_LIBDIR}/test/migrations/missing/1_people_have_last_names.rb
+${GEM_LIBDIR}/test/migrations/missing/3_we_need_reminders.rb
+${GEM_LIBDIR}/test/migrations/missing/4_innocent_jointable.rb
+${GEM_LIBDIR}/test/migrations/valid/1_people_have_last_names.rb
+${GEM_LIBDIR}/test/migrations/valid/2_we_need_reminders.rb
+${GEM_LIBDIR}/test/migrations/valid/3_innocent_jointable.rb
+${GEM_LIBDIR}/test/models/author.rb
+${GEM_LIBDIR}/test/models/auto_id.rb
+${GEM_LIBDIR}/test/models/binary.rb
+${GEM_LIBDIR}/test/models/book.rb
+${GEM_LIBDIR}/test/models/categorization.rb
+${GEM_LIBDIR}/test/models/category.rb
+${GEM_LIBDIR}/test/models/citation.rb
+${GEM_LIBDIR}/test/models/club.rb
+${GEM_LIBDIR}/test/models/column_name.rb
+${GEM_LIBDIR}/test/models/comment.rb
+${GEM_LIBDIR}/test/models/company.rb
+${GEM_LIBDIR}/test/models/company_in_module.rb
+${GEM_LIBDIR}/test/models/computer.rb
+${GEM_LIBDIR}/test/models/contact.rb
+${GEM_LIBDIR}/test/models/course.rb
+${GEM_LIBDIR}/test/models/customer.rb
+${GEM_LIBDIR}/test/models/default.rb
+${GEM_LIBDIR}/test/models/developer.rb
+${GEM_LIBDIR}/test/models/edge.rb
+${GEM_LIBDIR}/test/models/entrant.rb
+${GEM_LIBDIR}/test/models/guid.rb
+${GEM_LIBDIR}/test/models/item.rb
+${GEM_LIBDIR}/test/models/job.rb
+${GEM_LIBDIR}/test/models/joke.rb
+${GEM_LIBDIR}/test/models/keyboard.rb
+${GEM_LIBDIR}/test/models/legacy_thing.rb
+${GEM_LIBDIR}/test/models/matey.rb
+${GEM_LIBDIR}/test/models/member.rb
+${GEM_LIBDIR}/test/models/membership.rb
+${GEM_LIBDIR}/test/models/minimalistic.rb
+${GEM_LIBDIR}/test/models/mixed_case_monkey.rb
+${GEM_LIBDIR}/test/models/movie.rb
+${GEM_LIBDIR}/test/models/order.rb
+${GEM_LIBDIR}/test/models/owner.rb
+${GEM_LIBDIR}/test/models/parrot.rb
+${GEM_LIBDIR}/test/models/person.rb
+${GEM_LIBDIR}/test/models/pet.rb
+${GEM_LIBDIR}/test/models/pirate.rb
+${GEM_LIBDIR}/test/models/post.rb
+${GEM_LIBDIR}/test/models/price_estimate.rb
+${GEM_LIBDIR}/test/models/project.rb
+${GEM_LIBDIR}/test/models/reader.rb
+${GEM_LIBDIR}/test/models/reference.rb
+${GEM_LIBDIR}/test/models/reply.rb
+${GEM_LIBDIR}/test/models/ship.rb
+${GEM_LIBDIR}/test/models/sponsor.rb
+${GEM_LIBDIR}/test/models/subject.rb
+${GEM_LIBDIR}/test/models/subscriber.rb
+${GEM_LIBDIR}/test/models/subscription.rb
+${GEM_LIBDIR}/test/models/tag.rb
+${GEM_LIBDIR}/test/models/tagging.rb
+${GEM_LIBDIR}/test/models/task.rb
+${GEM_LIBDIR}/test/models/topic.rb
+${GEM_LIBDIR}/test/models/treasure.rb
+${GEM_LIBDIR}/test/models/vertex.rb
+${GEM_LIBDIR}/test/models/warehouse_thing.rb
+${GEM_LIBDIR}/test/schema/mysql_specific_schema.rb
+${GEM_LIBDIR}/test/schema/postgresql_specific_schema.rb
+${GEM_LIBDIR}/test/schema/schema.rb
+${GEM_LIBDIR}/test/schema/schema2.rb
+${GEM_LIBDIR}/test/schema/sqlite_specific_schema.rb
+${GEM_LIBDIR}/test/schema/sqlserver_specific_schema.rb
 ${GEM_HOME}/specifications/activerecord-${PKGVERSION}.gemspec
-@dirrm ${GEM_LIBDIR}/test/fixtures/subscribers
+@dirrm ${GEM_LIBDIR}/test/schema
+@dirrm ${GEM_LIBDIR}/test/models
+@dirrm ${GEM_LIBDIR}/test/migrations/valid
+@dirrm ${GEM_LIBDIR}/test/migrations/missing
+@dirrm ${GEM_LIBDIR}/test/migrations/interleaved/pass_3
+@dirrm ${GEM_LIBDIR}/test/migrations/interleaved/pass_2
+@dirrm ${GEM_LIBDIR}/test/migrations/interleaved/pass_1
+@dirrm ${GEM_LIBDIR}/test/migrations/interleaved
+@dirrm ${GEM_LIBDIR}/test/migrations/duplicate_names
+@dirrm ${GEM_LIBDIR}/test/migrations/duplicate
+@dirrm ${GEM_LIBDIR}/test/migrations/decimal
+@dirrm ${GEM_LIBDIR}/test/migrations
 @dirrm ${GEM_LIBDIR}/test/fixtures/reserved_words
 @dirrm ${GEM_LIBDIR}/test/fixtures/naked/yml
 @dirrm ${GEM_LIBDIR}/test/fixtures/naked/csv
 @dirrm ${GEM_LIBDIR}/test/fixtures/naked
-@dirrm ${GEM_LIBDIR}/test/fixtures/migrations_with_missing_versions
-@dirrm ${GEM_LIBDIR}/test/fixtures/migrations_with_duplicate
-@dirrm ${GEM_LIBDIR}/test/fixtures/migrations_with_decimal
-@dirrm ${GEM_LIBDIR}/test/fixtures/migrations
-@dirrm ${GEM_LIBDIR}/test/fixtures/developers_projects
-@dirrm ${GEM_LIBDIR}/test/fixtures/db_definitions
 @dirrm ${GEM_LIBDIR}/test/fixtures/categories/subsubdir
 @dirrm ${GEM_LIBDIR}/test/fixtures/categories
-@dirrm ${GEM_LIBDIR}/test/fixtures/bad_fixtures
 @dirrm ${GEM_LIBDIR}/test/fixtures/all
 @dirrm ${GEM_LIBDIR}/test/fixtures
 @dirrm ${GEM_LIBDIR}/test/connections/native_sybase
@@ -308,7 +323,9 @@ ${GEM_HOME}/specifications/activerecord-${PKGVERSION}.gemspec
 @dirrm ${GEM_LIBDIR}/test/connections/native_firebird
 @dirrm ${GEM_LIBDIR}/test/connections/native_db2
 @dirrm ${GEM_LIBDIR}/test/connections
-@dirrm ${GEM_LIBDIR}/test/associations
+@dirrm ${GEM_LIBDIR}/test/cases/associations
+@dirrm ${GEM_LIBDIR}/test/cases
+@dirrm ${GEM_LIBDIR}/test/assets
 @dirrm ${GEM_LIBDIR}/test
 @dirrm ${GEM_LIBDIR}/lib/active_record/vendor
 @dirrm ${GEM_LIBDIR}/lib/active_record/serializers
diff --git a/databases/ruby-activerecord/distinfo b/databases/ruby-activerecord/distinfo
index 2cecb1feab1..df5ac257e27 100644
--- a/databases/ruby-activerecord/distinfo
+++ b/databases/ruby-activerecord/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2008/04/04 15:30:00 jlam Exp $
+$NetBSD: distinfo,v 1.13 2008/06/20 04:27:37 minskim Exp $
 
-SHA1 (activerecord-2.0.2.gem) = 9a7a0356fd20e65dd61d2a2c8441ad336c2fba80
-RMD160 (activerecord-2.0.2.gem) = fe105181e94577fbd96619b703e888df5198707e
-Size (activerecord-2.0.2.gem) = 422400 bytes
+SHA1 (activerecord-2.1.0.gem) = 561c85de72c90aad0986a6cd415b15e62d1b6cf8
+RMD160 (activerecord-2.1.0.gem) = 1d3b9b2a3aaa4b28d32ca66f382bec90fc7c85c6
+Size (activerecord-2.1.0.gem) = 452096 bytes