composite_primary_keys 3.0.9 → 3.1.0

data/test/fixtures/article.rb

@@ -1,5 +1,5 @@
-class Article < ActiveRecord::Base
-  has_many :readings
-  has_many :users, :through => :readings
-end
-
+class Article < ActiveRecord::Base
+  has_many :readings
+  has_many :users, :through => :readings
+end
+

data/test/fixtures/articles.yml

@@ -1,6 +1,6 @@
-first:
-  id: 1
-  name: Article One
-second:
-  id: 2
+first:
+  id: 1
+  name: Article One
+second:
+  id: 2
   name: Article Two

data/test/fixtures/capitol.rb

@@ -0,0 +1,3 @@
+class Capitol < ActiveRecord::Base
+  set_primary_keys :country, :city
+end

data/test/fixtures/capitols.yml

@@ -0,0 +1,16 @@
+netherlands:
+  country: The Netherlands
+  city: Amsterdam
+
+france:
+  country: France
+  city: Paris
+
+canada:
+  country: Canada
+  city: Ottawa
+
+mexico:
+  country: Mexico
+  city: Mexico City
+  

data/test/fixtures/db_definitions/mysql.sql

@@ -179,3 +179,8 @@ create table seats (
   primary key (flight_number, seat)
 ) type=InnoDB;
 
+create table capitols (
+  country varchar(100) default null,
+  city varchar(100) default null,
+  primary key (country, city)
+) type=InnoDB;

data/test/fixtures/db_definitions/postgresql.sql

@@ -205,3 +205,8 @@ create table seats (
   primary key (flight_number, seat)
 );
 
+create table capitols (
+  country text not null,
+  city text not null,
+  primary key (country, city)
+);

data/test/fixtures/product.rb

@@ -1,7 +1,7 @@
-class Product < ActiveRecord::Base
-	set_primary_keys :id  # redundant
-	has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
-	has_one :product_tariff, :foreign_key => :product_id
-
-	has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
-end
+class Product < ActiveRecord::Base
+	set_primary_keys :id  # redundant
+	has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
+	has_one :product_tariff, :foreign_key => :product_id
+
+	has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+end

data/test/fixtures/product_tariff.rb

@@ -1,5 +1,5 @@
-class ProductTariff < ActiveRecord::Base
-	set_primary_keys :product_id, :tariff_id, :tariff_start_date
-	belongs_to :product, :foreign_key => :product_id
-	belongs_to :tariff,  :foreign_key => [:tariff_id, :tariff_start_date]
-end
+class ProductTariff < ActiveRecord::Base
+	set_primary_keys :product_id, :tariff_id, :tariff_start_date
+	belongs_to :product, :foreign_key => :product_id
+	belongs_to :tariff,  :foreign_key => [:tariff_id, :tariff_start_date]
+end

data/test/fixtures/product_tariffs.yml

@@ -1,12 +1,12 @@
-first_flat:
-  product_id: 1
-  tariff_id: 1
-  tariff_start_date: <%= Date.today.to_s(:db) %>
-first_free:  
-  product_id: 1
-  tariff_id: 2
-  tariff_start_date: <%= Date.today.to_s(:db) %>
-second_free:
-  product_id: 2
-  tariff_id: 2
-  tariff_start_date: <%= Date.today.to_s(:db) %>
+first_flat:
+  product_id: 1
+  tariff_id: 1
+  tariff_start_date: <%= Date.today.to_s(:db) %>
+first_free:  
+  product_id: 1
+  tariff_id: 2
+  tariff_start_date: <%= Date.today.to_s(:db) %>
+second_free:
+  product_id: 2
+  tariff_id: 2
+  tariff_start_date: <%= Date.today.to_s(:db) %>

data/test/fixtures/products.yml

@@ -1,6 +1,6 @@
-first_product:
-  id: 1
-  name: Product One
-second_product:
-  id: 2
+first_product:
+  id: 1
+  name: Product One
+second_product:
+  id: 2
   name: Product Two

data/test/fixtures/reading.rb

@@ -1,4 +1,4 @@
-class Reading < ActiveRecord::Base
-  belongs_to :article
-  belongs_to :user
-end 
+class Reading < ActiveRecord::Base
+  belongs_to :article
+  belongs_to :user
+end 

data/test/fixtures/readings.yml

@@ -1,10 +1,10 @@
-santiago_first:
-  id: 1
-  user_id: 1
-  article_id: 1
-  rating: 4
-santiago_second:
-  id: 2
-  user_id: 1
-  article_id: 2
+santiago_first:
+  id: 1
+  user_id: 1
+  article_id: 1
+  rating: 4
+santiago_second:
+  id: 2
+  user_id: 1
+  article_id: 2
   rating: 5

data/test/fixtures/reference_code.rb

@@ -1,7 +1,7 @@
-class ReferenceCode < ActiveRecord::Base
-  set_primary_keys :reference_type_id, :reference_code
-  
-  belongs_to :reference_type, :foreign_key => "reference_type_id"
-  
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end
+class ReferenceCode < ActiveRecord::Base
+  set_primary_keys :reference_type_id, :reference_code
+  
+  belongs_to :reference_type, :foreign_key => "reference_type_id"
+  
+  validates_presence_of :reference_code, :code_label, :abbreviation
+end

data/test/fixtures/reference_codes.yml

@@ -1,30 +1,30 @@
-name_prefix_mr:
-  reference_type_id: 1
-  reference_code: 1
-  code_label: MR
-  abbreviation: Mr
-
-name_prefix_mrs:
-  reference_type_id: 1
-  reference_code: 2
-  code_label: MRS
-  abbreviation: Mrs
-  
-name_prefix_ms:
-  reference_type_id: 1
-  reference_code: 3
-  code_label: MS
-  abbreviation: Ms
-  
-gender_male:
-  reference_type_id: 2
-  reference_code: 1
-  code_label: MALE
-  abbreviation: Male
-gender_female:
-  reference_type_id: 2
-  reference_code: 2
-  code_label: FEMALE
-  abbreviation: Female
-
+name_prefix_mr:
+  reference_type_id: 1
+  reference_code: 1
+  code_label: MR
+  abbreviation: Mr
+
+name_prefix_mrs:
+  reference_type_id: 1
+  reference_code: 2
+  code_label: MRS
+  abbreviation: Mrs
+  
+name_prefix_ms:
+  reference_type_id: 1
+  reference_code: 3
+  code_label: MS
+  abbreviation: Ms
+  
+gender_male:
+  reference_type_id: 2
+  reference_code: 1
+  code_label: MALE
+  abbreviation: Male
+gender_female:
+  reference_type_id: 2
+  reference_code: 2
+  code_label: FEMALE
+  abbreviation: Female
+
   

data/test/fixtures/reference_type.rb

@@ -1,7 +1,7 @@
-class ReferenceType < ActiveRecord::Base
-  set_primary_key :reference_type_id
-  has_many :reference_codes, :foreign_key => "reference_type_id", :dependent => :destroy
-  
-  validates_presence_of :type_label, :abbreviation
-  validates_uniqueness_of :type_label
-end
+class ReferenceType < ActiveRecord::Base
+  set_primary_key :reference_type_id
+  has_many :reference_codes, :foreign_key => "reference_type_id", :dependent => :destroy
+  
+  validates_presence_of :type_label, :abbreviation
+  validates_uniqueness_of :type_label
+end

data/test/fixtures/reference_types.yml

@@ -1,9 +1,9 @@
-name_prefix:
-  reference_type_id: 1
-  type_label: NAME_PREFIX
-  abbreviation: Name Prefix
-
-gender:
-  reference_type_id: 2
-  type_label: GENDER
-  abbreviation: Gender
+name_prefix:
+  reference_type_id: 1
+  type_label: NAME_PREFIX
+  abbreviation: Name Prefix
+
+gender:
+  reference_type_id: 2
+  type_label: GENDER
+  abbreviation: Gender

data/test/fixtures/suburb.rb

@@ -1,6 +1,6 @@
-class Suburb < ActiveRecord::Base
-  set_primary_keys :city_id, :suburb_id
-  has_many :streets,  :foreign_key => [:city_id, :suburb_id]
-  has_many :first_streets,  :foreign_key => [:city_id, :suburb_id], 
-          :class_name => 'Street', :conditions => "streets.name = 'First Street'"
+class Suburb < ActiveRecord::Base
+  set_primary_keys :city_id, :suburb_id
+  has_many :streets,  :foreign_key => [:city_id, :suburb_id]
+  has_many :first_streets,  :foreign_key => [:city_id, :suburb_id], 
+          :class_name => 'Street', :conditions => "streets.name = 'First Street'"
 end

data/test/fixtures/suburbs.yml

@@ -1,9 +1,9 @@
-first:
-  city_id: 1
-  suburb_id: 1
-  name: First Suburb
-second:
-  city_id: 2
-  suburb_id: 1
-  name: Second Suburb
+first:
+  city_id: 1
+  suburb_id: 1
+  name: First Suburb
+second:
+  city_id: 2
+  suburb_id: 1
+  name: Second Suburb
   

data/test/fixtures/tariff.rb

@@ -1,6 +1,6 @@
-class Tariff < ActiveRecord::Base
-	set_primary_keys [:tariff_id, :start_date]
-	has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
-	has_one :product_tariff, :foreign_key => [:tariff_id, :tariff_start_date]
-	has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
-end
+class Tariff < ActiveRecord::Base
+	set_primary_keys [:tariff_id, :start_date]
+	has_many :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+	has_one :product_tariff, :foreign_key => [:tariff_id, :tariff_start_date]
+	has_many :products, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+end

data/test/fixtures/tariffs.yml

@@ -1,13 +1,13 @@
-flat:
-  tariff_id: 1
-  start_date: <%= Date.today.to_s(:db) %>
-  amount: 50
-free:
-  tariff_id: 2
-  start_date: <%= Date.today.to_s(:db) %>
-  amount: 0
-flat_future:
-  tariff_id: 1
-  start_date: <%= Date.today.next.to_s(:db) %>
-  amount: 100
+flat:
+  tariff_id: 1
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 50
+free:
+  tariff_id: 2
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 0
+flat_future:
+  tariff_id: 1
+  start_date: <%= Date.today.next.to_s(:db) %>
+  amount: 100
   

data/test/fixtures/user.rb

@@ -1,10 +1,10 @@
-class User < ActiveRecord::Base
-  has_many :readings
-  has_many :articles, :through => :readings
-  has_many :comments, :as => :person
-  has_many :hacks, :through => :comments, :source => :hack
-  
-  def find_custom_articles
-    articles.find(:all, :conditions => ["name = ?", "Article One"])
-  end
-end
+class User < ActiveRecord::Base
+  has_many :readings
+  has_many :articles, :through => :readings
+  has_many :comments, :as => :person
+  has_many :hacks, :through => :comments, :source => :hack
+  
+  def find_custom_articles
+    articles.find(:all, :conditions => ["name = ?", "Article One"])
+  end
+end

data/test/fixtures/users.yml

@@ -1,6 +1,6 @@
-santiago:
-  id: 1
-  name: Santiago
-drnic:
-  id: 2
+santiago:
+  id: 1
+  name: Santiago
+drnic:
+  id: 2
   name: Dr Nic

data/test/hash_tricks.rb

@@ -1,34 +1,34 @@
-# From:
-# http://www.bigbold.com/snippets/posts/show/2178
-# http://blog.caboo.se/articles/2006/06/11/stupid-hash-tricks
-# 
-# An example utilisation of these methods in a controller is:
-# def some_action
-#    # some script kiddie also passed in :bee, which we don't want tampered with _here_.
-#    @model = Model.create(params.pass(:foo, :bar))
-#  end
-class Hash
-
-  # lets through the keys in the argument
-  # >> {:one => 1, :two => 2, :three => 3}.pass(:one)
-  # => {:one=>1}
-  def pass(*keys)
-    keys = keys.first if keys.first.is_a?(Array)
-    tmp = self.clone
-    tmp.delete_if {|k,v| ! keys.include?(k.to_sym) }
-    tmp.delete_if {|k,v| ! keys.include?(k.to_s) }
-    tmp
-  end
-
-  # blocks the keys in the arguments
-  # >> {:one => 1, :two => 2, :three => 3}.block(:one)
-  # => {:two=>2, :three=>3}
-  def block(*keys)
-    keys = keys.first if keys.first.is_a?(Array)
-    tmp = self.clone
-    tmp.delete_if {|k,v| keys.include?(k.to_sym) }
-    tmp.delete_if {|k,v| keys.include?(k.to_s) }
-    tmp
-  end
-
-end
+# From:
+# http://www.bigbold.com/snippets/posts/show/2178
+# http://blog.caboo.se/articles/2006/06/11/stupid-hash-tricks
+# 
+# An example utilisation of these methods in a controller is:
+# def some_action
+#    # some script kiddie also passed in :bee, which we don't want tampered with _here_.
+#    @model = Model.create(params.pass(:foo, :bar))
+#  end
+class Hash
+
+  # lets through the keys in the argument
+  # >> {:one => 1, :two => 2, :three => 3}.pass(:one)
+  # => {:one=>1}
+  def pass(*keys)
+    keys = keys.first if keys.first.is_a?(Array)
+    tmp = self.clone
+    tmp.delete_if {|k,v| ! keys.include?(k.to_sym) }
+    tmp.delete_if {|k,v| ! keys.include?(k.to_s) }
+    tmp
+  end
+
+  # blocks the keys in the arguments
+  # >> {:one => 1, :two => 2, :three => 3}.block(:one)
+  # => {:two=>2, :three=>3}
+  def block(*keys)
+    keys = keys.first if keys.first.is_a?(Array)
+    tmp = self.clone
+    tmp.delete_if {|k,v| keys.include?(k.to_sym) }
+    tmp.delete_if {|k,v| keys.include?(k.to_s) }
+    tmp
+  end
+
+end