activerecord 2.0.5 → 2.1.0

data/test/connections/native_sqlite3/connection.rb

@@ -1,12 +1,12 @@
 print "Using native SQLite3\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
 class SqliteError < StandardError
 end
 
-BASE_DIR = File.expand_path(File.dirname(__FILE__) + '/../../fixtures')
+BASE_DIR = FIXTURES_ROOT
 sqlite_test_db  = "#{BASE_DIR}/fixture_database.sqlite3"
 sqlite_test_db2 = "#{BASE_DIR}/fixture_database_2.sqlite3"
 

data/test/connections/native_sqlite3/in_memory_connection.rb

@@ -1,5 +1,5 @@
 print "Using native SQLite3\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
@@ -8,11 +8,11 @@ end
 
 def make_connection(clazz, db_definitions_file)
   clazz.establish_connection(:adapter => 'sqlite3', :database  => ':memory:')
-  File.read("#{File.dirname(__FILE__)}/../../fixtures/db_definitions/#{db_definitions_file}").split(';').each do |command|
+  File.read(SCHEMA_ROOT + "/#{db_definitions_file}").split(';').each do |command|
     clazz.connection.execute(command) unless command.strip.empty?
   end
 end
 
 make_connection(ActiveRecord::Base, 'sqlite.sql')
 make_connection(Course, 'sqlite2.sql')
-load("#{File.dirname(__FILE__)}/../../fixtures/db_definitions/schema.rb")
+load(SCHEMA_ROOT + "/schema.rb")

data/test/connections/native_sybase/connection.rb

@@ -1,5 +1,5 @@
 print "Using native Sybase Open Client\n"
-require_dependency 'fixtures/course'
+require_dependency 'models/course'
 require 'logger'
 
 ActiveRecord::Base.logger = Logger.new("debug.log")

data/test/fixtures/author_addresses.yml

@@ -0,0 +1,5 @@
+david_address:
+  id: 1
+
+david_address_extra:
+  id: 2

data/test/fixtures/authors.yml

@@ -1,6 +1,8 @@
 david:
   id: 1
   name: David
+  author_address_id: 1
+  author_address_extra_id: 2
 
 mary:
   id: 2

data/test/fixtures/clubs.yml

@@ -0,0 +1,6 @@
+boring_club:
+  name: Banana appreciation society
+moustache_club:
+  name: Moustache and Eyebrow Fancier Club
+crazy_club:
+  name: Skull and bones

data/test/fixtures/jobs.yml

@@ -0,0 +1,7 @@
+unicyclist:
+  id: 1
+  ideal_reference_id: 2
+clown:
+  id: 2
+magician:
+  id: 3

data/test/fixtures/members.yml

@@ -0,0 +1,4 @@
+groucho:
+  name: Groucho Marx
+some_other_guy:
+  name: Englebert Humperdink

data/test/fixtures/memberships.yml

@@ -0,0 +1,20 @@
+membership_of_boring_club:
+  joined_on: <%= 3.weeks.ago.to_s(:db) %>
+  club: boring_club
+  member: groucho
+  favourite: false
+  type: CurrentMembership
+  
+membership_of_favourite_club:
+  joined_on: <%= 3.weeks.ago.to_s(:db) %>
+  club: moustache_club
+  member: groucho
+  favourite: true
+  type: Membership
+
+other_guys_membership:
+  joined_on: <%= 4.weeks.ago.to_s(:db) %>
+  club: boring_club
+  member: some_other_guy
+  favourite: false
+  type: CurrentMembership

data/test/fixtures/owners.yml

@@ -0,0 +1,7 @@
+blackbeard:
+  owner_id: 1
+  name: blackbeard
+
+ashley:
+  owner_id: 2
+  name: ashley

data/test/fixtures/people.yml

@@ -1,3 +1,6 @@
 michael:
   id: 1
-  first_name: Michael
+  first_name: Michael
+david:
+  id: 2
+  first_name: David

data/test/fixtures/pets.yml

@@ -0,0 +1,14 @@
+parrot:
+  pet_id: 1
+  name: parrot
+  owner_id: 1
+
+chew:
+  pet_id: 2
+  name: chew
+  owner_id: 2
+
+mochi:
+  pet_id: 3
+  name: mochi
+  owner_id: 2

data/test/fixtures/posts.yml

@@ -3,6 +3,7 @@ welcome:
   author_id: 1
   title: Welcome to the weblog
   body: Such a lovely day
+  comments_count: 2
   type: Post
 
 thinking:

data/test/fixtures/price_estimates.yml

@@ -0,0 +1,7 @@
+saphire_1:
+  price: 10
+  estimate_of: sapphire (Treasure)
+
+sapphire_2:
+  price: 20
+  estimate_of: sapphire (Treasure)

data/test/fixtures/readers.yml

@@ -2,3 +2,8 @@ michael_welcome:
   id: 1
   post_id: 1
   person_id: 1
+
+michael_authorless:
+  id: 2
+  post_id: 3
+  person_id: 1

data/test/fixtures/references.yml

@@ -0,0 +1,17 @@
+michael_magician:
+  id: 1
+  person_id: 1
+  job_id: 3
+  favourite: false
+
+michael_unicyclist:
+  id: 2
+  person_id: 1
+  job_id: 1
+  favourite: true
+
+david_unicyclist:
+  id: 3
+  person_id: 2
+  job_id: 1
+  favourite: false

data/test/fixtures/sponsors.yml

@@ -0,0 +1,9 @@
+moustache_club_sponsor_for_groucho:
+  sponsor_club: moustache_club
+  sponsorable: groucho (Member)
+boring_club_sponsor_for_groucho:
+  sponsor_club: boring_club
+  sponsorable: some_other_guy (Member)
+crazy_club_sponsor_for_groucho:
+  sponsor_club: crazy_club
+  sponsorable: some_other_guy (Member)

data/test/fixtures/subscribers.yml

@@ -0,0 +1,7 @@
+first:
+  nick: alterself
+  name: Luke Holden
+
+second:
+  nick: webster132
+  name: David Heinemeier Hansson

data/test/fixtures/subscriptions.yml

@@ -0,0 +1,12 @@
+webster_awdr:
+  id: 1
+  subscriber_id: webster132
+  book_id: 1
+webster_rfr:
+  id: 2
+  subscriber_id: webster132
+  book_id: 2
+alterself_awdr:
+  id: 3
+  subscriber_id: alterself
+  book_id: 3

data/test/fixtures/taggings.yml

@@ -22,4 +22,7 @@ godfather:
   tag_id: 1
   taggable_id: 1
   taggable_type: Item
-  
+
+orphaned:
+  id: 5
+  tag_id: 1

data/test/fixtures/topics.yml

@@ -12,11 +12,31 @@ first:
 
 second:
   id: 2
-  title: The Second Topic's of the day
+  title: The Second Topic of the day
   author_name: Mary
-  written_on: 2003-07-15t15:28:00.0099+01:00
+  written_on: 2004-07-15t15:28:00.0099+01:00
   content: Have a nice day
   approved: true
   replies_count: 0
   parent_id: 1
   type: Reply
+
+third:
+  id: 3
+  title: The Third Topic of the day
+  author_name: Nick
+  written_on: 2005-07-15t15:28:00.0099+01:00
+  content: I'm a troll
+  approved: true
+  replies_count: 1
+
+fourth:
+  id: 4
+  title: The Fourth Topic of the day
+  author_name: Carl
+  written_on: 2006-07-15t15:28:00.0099+01:00
+  content: Why not?
+  approved: true
+  type: Reply
+  parent_id: 3
+

data/test/fixtures/warehouse-things.yml

@@ -0,0 +1,3 @@
+one:
+  id: 1
+  value: 1000

data/test/{fixtures/migrations_with_duplicate → migrations/duplicate}/1_people_have_last_names.rb

@@ -2,7 +2,7 @@ class PeopleHaveLastNames < ActiveRecord::Migration
   def self.up
     add_column "people", "last_name", :string
   end
-  
+
   def self.down
     remove_column "people", "last_name"
   end

data/test/{fixtures/migrations_with_duplicate → migrations/duplicate}/2_we_need_reminders.rb

@@ -5,7 +5,7 @@ class WeNeedReminders < ActiveRecord::Migration
       t.column :remind_at, :datetime
     end
   end
-  
+
   def self.down
     drop_table "reminders"
   end

data/test/migrations/duplicate_names/20080507052938_chunky.rb

@@ -0,0 +1,7 @@
+class Chunky < ActiveRecord::Migration
+  def self.up
+  end
+
+  def self.down
+  end
+end

data/test/migrations/duplicate_names/20080507053028_chunky.rb

@@ -0,0 +1,7 @@
+class Chunky < ActiveRecord::Migration
+  def self.up
+  end
+
+  def self.down
+  end
+end

data/test/{fixtures/migrations → migrations/interleaved/pass_2}/1_people_have_last_names.rb

@@ -2,7 +2,7 @@ class PeopleHaveLastNames < ActiveRecord::Migration
   def self.up
     add_column "people", "last_name", :string
   end
-  
+
   def self.down
     remove_column "people", "last_name"
   end

data/test/{fixtures/migrations_with_missing_versions → migrations/interleaved/pass_3}/1_people_have_last_names.rb

@@ -2,7 +2,7 @@ class PeopleHaveLastNames < ActiveRecord::Migration
   def self.up
     add_column "people", "last_name", :string
   end
-  
+
   def self.down
     remove_column "people", "last_name"
   end

data/test/migrations/interleaved/pass_3/2_i_raise_on_down.rb

@@ -0,0 +1,8 @@
+class IRaiseOnDown < ActiveRecord::Migration
+  def self.up
+  end
+
+  def self.down
+    raise
+  end
+end

data/test/migrations/interleaved/pass_3/3_innocent_jointable.rb

@@ -0,0 +1,12 @@
+class InnocentJointable < ActiveRecord::Migration
+  def self.up
+    create_table("people_reminders", :id => false) do |t|
+      t.column :reminder_id, :integer
+      t.column :person_id, :integer
+    end
+  end
+
+  def self.down
+    drop_table "people_reminders"
+  end
+end

data/test/{fixtures/migrations_with_missing_versions → migrations/missing}/1000_people_have_middle_names.rb

@@ -2,7 +2,7 @@ class PeopleHaveMiddleNames < ActiveRecord::Migration
   def self.up
     add_column "people", "middle_name", :string
   end
-  
+
   def self.down
     remove_column "people", "middle_name"
   end

data/test/migrations/missing/1_people_have_last_names.rb

@@ -0,0 +1,9 @@
+class PeopleHaveLastNames < ActiveRecord::Migration
+  def self.up
+    add_column "people", "last_name", :string
+  end
+
+  def self.down
+    remove_column "people", "last_name"
+  end
+end

data/test/{fixtures/migrations_with_missing_versions → migrations/missing}/3_we_need_reminders.rb

@@ -5,7 +5,7 @@ class WeNeedReminders < ActiveRecord::Migration
       t.column :remind_at, :datetime
     end
   end
-  
+
   def self.down
     drop_table "reminders"
   end

data/test/migrations/missing/4_innocent_jointable.rb

@@ -0,0 +1,12 @@
+class InnocentJointable < ActiveRecord::Migration
+  def self.up
+    create_table("people_reminders", :id => false) do |t|
+      t.column :reminder_id, :integer
+      t.column :person_id, :integer
+    end
+  end
+
+  def self.down
+    drop_table "people_reminders"
+  end
+end

data/test/migrations/valid/1_people_have_last_names.rb

@@ -0,0 +1,9 @@
+class PeopleHaveLastNames < ActiveRecord::Migration
+  def self.up
+    add_column "people", "last_name", :string
+  end
+
+  def self.down
+    remove_column "people", "last_name"
+  end
+end

data/test/{fixtures/migrations → migrations/valid}/2_we_need_reminders.rb

@@ -5,7 +5,7 @@ class WeNeedReminders < ActiveRecord::Migration
       t.column :remind_at, :datetime
     end
   end
-  
+
   def self.down
     drop_table "reminders"
   end

data/test/migrations/valid/3_innocent_jointable.rb

@@ -0,0 +1,12 @@
+class InnocentJointable < ActiveRecord::Migration
+  def self.up
+    create_table("people_reminders", :id => false) do |t|
+      t.column :reminder_id, :integer
+      t.column :person_id, :integer
+    end
+  end
+
+  def self.down
+    drop_table "people_reminders"
+  end
+end

data/test/{fixtures → models}/author.rb

@@ -3,6 +3,7 @@ class Author < ActiveRecord::Base
   has_many :posts_with_comments, :include => :comments, :class_name => "Post"
   has_many :posts_with_categories, :include => :categories, :class_name => "Post"
   has_many :posts_with_comments_and_categories, :include => [ :comments, :categories ], :order => "posts.id", :class_name => "Post"
+  has_many :posts_containing_the_letter_a, :class_name => "Post"
   has_many :posts_with_extension, :class_name => "Post" do #, :extend => ProxyTestExtension
     def testing_proxy_owner
       proxy_owner
@@ -15,15 +16,21 @@ class Author < ActiveRecord::Base
     end
   end
   has_many :comments, :through => :posts
+  has_many :comments_containing_the_letter_e, :through => :posts, :source => :comments
+  has_many :comments_with_order_and_conditions, :through => :posts, :source => :comments, :order => 'comments.body', :conditions => "comments.body like 'Thank%'"
+  has_many :comments_with_include, :through => :posts, :source => :comments, :include => :post
+
+
   has_many :comments_desc, :through => :posts, :source => :comments, :order => 'comments.id DESC'
   has_many :limited_comments, :through => :posts, :source => :comments, :limit => 1
   has_many :funky_comments, :through => :posts, :source => :comments
   has_many :ordered_uniq_comments, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id'
   has_many :ordered_uniq_comments_desc, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id DESC'
-
+  has_many :readonly_comments, :through => :posts, :source => :comments, :readonly => true
+  
   has_many :special_posts
   has_many :special_post_comments, :through => :special_posts, :source => :comments
-  
+
   has_many :special_nonexistant_posts, :class_name => "SpecialPost", :conditions => "posts.body = 'nonexistant'"
   has_many :special_nonexistant_post_comments, :through => :special_nonexistant_posts, :source => :comments, :conditions => "comments.post_id = 0"
   has_many :nonexistant_comments, :through => :posts
@@ -32,9 +39,14 @@ class Author < ActiveRecord::Base
   has_many :hello_post_comments, :through => :hello_posts, :source => :comments
   has_many :posts_with_no_comments, :class_name => 'Post', :conditions => 'comments.id is null', :include => :comments
 
+  has_many :hello_posts_with_hash_conditions, :class_name => "Post",
+:conditions => {:body => 'hello'}
+  has_many :hello_post_comments_with_hash_conditions, :through =>
+:hello_posts_with_hash_conditions, :source => :comments
+
   has_many :other_posts,          :class_name => "Post"
   has_many :posts_with_callbacks, :class_name => "Post", :before_add => :log_before_adding,
-           :after_add     => :log_after_adding, 
+           :after_add     => :log_after_adding,
            :before_remove => :log_before_removing,
            :after_remove  => :log_after_removing
   has_many :posts_with_proc_callbacks, :class_name => "Post",
@@ -65,7 +77,8 @@ class Author < ActiveRecord::Base
   has_many :tags,     :through => :posts # through has_many :through
   has_many :post_categories, :through => :posts, :source => :categories
 
-  belongs_to :author_address
+  belongs_to :author_address, :dependent => :destroy
+  belongs_to :author_address_extra, :dependent => :delete, :class_name => "AuthorAddress"
 
   attr_accessor :post_log
 
@@ -101,6 +114,17 @@ end
 
 class AuthorAddress < ActiveRecord::Base
   has_one :author
+
+  def self.destroyed_author_address_ids
+    @destroyed_author_address_ids ||= Hash.new { |h,k| h[k] = [] }
+  end
+
+  before_destroy do |author_address|
+    if author_address.author
+      AuthorAddress.destroyed_author_address_ids[author_address.author.id] << author_address.id
+    end
+    true
+  end
 end
 
 class AuthorFavorite < ActiveRecord::Base