composite_primary_keys 3.1.8 → 3.1.9

data/History.txt

@@ -1,30 +1,34 @@
+== 3.1.9 2011-06-04
+* Improve HABTM association tests (David Rueck)
+* Remove deprecated Rake tasks (Charlie Savage)
+
 == 3.1.8 2011-05-26
 * Fix calling clear on a HABTM associate (David Rueck)
 
 == 3.1.7 2011-05-26
 * Support regular AR models having one or many composite models (Jacques Fuentes)
-* Minor test cleanup
-* Make version requirements more explicit
-* Remove Arel extensions used for calculations
+* Minor test cleanup (Charlie Savage)
+* Make version requirements more explicit (Charlie Savage)
+* Remove Arel extensions used for calculations (Charlie Savage)
 
 == 3.1.6 2011-04-03
-* Updated belongs_to association to be a bit more flexible with non-CPK
+* Updated belongs_to association to be a bit more flexible with non-CPK (Charlie Savage)
   base models (Jacques Fuentes)
 * Fix uniqueness check (David Rueck)
 * Fix write issue when one of they keys in a composite key is
   called id (Tom Hughes)
 
 == 3.1.5 2011-03-24
-* Fix simple calculation methods
-* Fix instantiation of cpk records via associations.
-* Fix Relation#delete
-* Fix Relation#destroy
+* Fix simple calculation methods (Charlie Savage)
+* Fix instantiation of cpk records via associations  (Charlie Savage)
+* Fix Relation#delete (Charlie Savage)
+* Fix Relation#destroy (Charlie Savage)
 
 == 3.1.4 2011-03-06
-* Support ActiveRecord 3.0.5 (interpolate_sql was removed and
-  replaced by interpolate_and_sanitize_sql)
-* Fix persistence methods to support destroy callbacks
-* Support rake 0.9.0 beta
+* Support ActiveRecord 3.0.5 - interpolate_sql was removed and
+  replaced by interpolate_and_sanitize_sql (Charlie Savage)
+* Fix persistence methods to support destroy callbacks (Charlie Savage)
+* Support rake 0.9.0 beta (Charlie Savage)
 
 
 == 3.1.2 2011-02-26

data/Rakefile

@@ -2,9 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 # Set global variable so other tasks can access them
 ::PROJECT_ROOT = File.expand_path(".")
@@ -14,7 +12,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
 
 # Setup Rake tasks for managing the gem
-Rake::GemPackageTask.new(spec).define
+Gem::PackageTask.new(spec).define
 
 # Now load in other task files
 Dir.glob('tasks/**/*.rake').each do |rake_file|

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 1
-    TINY  = 8
+    TINY  = 9
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/connections/native_mysql/connection.rb

@@ -1,6 +1,6 @@
 print "Using native MySQL\n"
 
-require 'active_record'
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 
 def connection_string
   options = {}

data/test/connections/native_oracle/connection.rb

@@ -1,6 +1,6 @@
 print "Using native Oracle\n"
 
-require 'active_record'
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 
 def connection_string
   "#{SPEC['username']}/#{SPEC['password']}@#{SPEC['host']}"

data/test/connections/native_oracle_enhanced/connection.rb

@@ -1,6 +1,6 @@
 print "Using native Oracle Enhanced\n"
 
-require 'active_record'
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 
 def connection_string
   "#{SPEC['username']}/#{SPEC['password']}@#{SPEC['host']}"

data/test/connections/native_postgresql/connection.rb

@@ -1,6 +1,6 @@
 print "Using native Postgresql\n"
 
-require 'active_record'
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys', 'connection_adapters', 'postgresql_adapter')
 

data/test/connections/native_sqlite/connection.rb

@@ -1,6 +1,6 @@
 print "Using native Sqlite3\n"
 
-require 'active_record'
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 def connection_string

data/test/fixtures/article.rb

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

data/test/fixtures/comment.rb

@@ -1,5 +1,4 @@
 class Comment < ActiveRecord::Base
-  set_primary_keys :id
   belongs_to :person, :polymorphic => true
   belongs_to :hack
 end

data/test/fixtures/db_definitions/db2-create-tables.sql

@@ -90,14 +90,6 @@ CREATE TABLE membership_statuses (
   PRIMARY KEY (id)
 );
 
-create table kitchen_sinks (
-	id_1 integer not null,
-	id_2 integer not null,
-	a_date date,
-	a_string varchar(100),
-	primary key (id_1, id_2)
-);
-
 create table restaurants (
 	franchise_id integer not null,
 	store_id integer not null,
@@ -112,9 +104,8 @@ create table restaurants_suburbs (
 	suburb_id integer not null
 );
 
-create table way_nodes (
-  id integer not null,
-  node_id integer not null,
-  sequence_id integer not null,
-  primary key (id, sequence_id)
+create table products_restaurants (
+  product_id integer not null,
+  franchise_id integer not null,
+  store_id integer not null
 );

data/test/fixtures/db_definitions/db2-drop-tables.sql

@@ -14,4 +14,4 @@ drop table PRODUCT_TARIFFS;
 drop table KITCHEN_SINK;
 drop table RESTAURANTS;
 drop table RESTAURANTS_SUBURBS;
-drop table WAY_NODES;
+drop table PRODUCTS_RESTAURANTS;

data/test/fixtures/db_definitions/mysql.sql

@@ -116,14 +116,6 @@ create table hacks (
     primary key (name)
 ) type=InnoDB;
 
-create table kitchen_sinks (
-    id_1 int(11) not null,
-    id_2 int(11) not null,
-    a_date date,
-    a_string varchar(100),
-    primary key (id_1, id_2)
-) type=InnoDB;
-
 create table restaurants (
     franchise_id int(11) not null,
     store_id int(11) not null,
@@ -185,9 +177,9 @@ create table capitols (
   primary key (country, city)
 ) type=InnoDB;
 
-create table way_nodes (
-  id int(11) not null,
-  node_id int(11) not null,
-  sequence_id int(11) not null,
-  primary key (id, sequence_id)
+create table products_restaurants (
+  product_id int(11) not null,
+  franchise_id int(11) not null,
+  store_id int(11) not null
 ) type=InnoDB;
+

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -25,7 +25,6 @@ drop sequence employees_seq;
 drop table comments;
 drop sequence comments_seq;
 drop table hacks;
-drop table kitchen_sinks;
 drop table restaurants;
 drop table restaurants_suburbs;
 drop table dorms;
@@ -37,4 +36,4 @@ drop table room_attribute_assignments;
 drop table room_assignments;
 drop table students;
 drop sequence students_seq;
-drop table way_nodes;
+drop table products_restaurants;

data/test/fixtures/db_definitions/oracle.sql

@@ -124,14 +124,6 @@ create table hacks (
     name varchar(50) not null primary key
 );
 
-create table kitchen_sinks (
-    id_1   number(11) not null,
-    id_2   number(11) not null,
-    a_date date,
-    a_string varchar(100),
-    constraint kitchen_sinks_pk primary key (id_1, id_2)
-);
-
 create table restaurants (
     franchise_id number(11) not null,
     store_id     number(11) not null,
@@ -186,9 +178,8 @@ create table room_assignments (
     room_id    number(11) not null
 );
 
-create table way_nodes (
-    id number(11) not null,
-    node_id number(11) not null,
-    sequence_id number(11) not null,
-    constraint way_nodes_pk primary key (id, sequence_id)
+create table products_restaurants (
+    product_id   number(11) not null,
+    franchise_id number(11) not null,
+    store_id     number(11) not null
 );

data/test/fixtures/db_definitions/postgresql.sql

@@ -136,14 +136,6 @@ create table hacks (
     primary key (name)
 );
 
-create table kitchen_sinks (
-    id_1   int not null,
-    id_2   int not null,
-    a_date date,
-    a_string varchar(100),
-    primary key (id_1, id_2)
-);
-
 create table restaurants (
     franchise_id int not null,
     store_id     int not null,
@@ -211,9 +203,9 @@ create table capitols (
   primary key (country, city)
 );
 
-create table way_nodes (
-  id int not null,
-  node_id int not null,
-  sequence_id int not null,
-  primary key (id, sequence_id)
+create table products_restaurants (
+  product_id int not null,
+  franchise_id int not null,
+  store_id int not null
 );
+  

data/test/fixtures/db_definitions/sqlite.sql

@@ -105,14 +105,6 @@ create table hacks (
     name varchar(50) not null primary key
 );
 
-create table kitchen_sinks (
-	id_1 integer not null,
-	id_2 integer not null,
-	a_date date,
-	a_string varchar(100),
-	primary key (id_1, id_2)
-);
-
 create table restaurants (
 	franchise_id integer not null,
 	store_id integer not null,
@@ -171,9 +163,8 @@ create table capitols (
   primary key (country, city)
 );
 
-create table way_nodes (
-  id integer not null,
-  node_id integer not null,
-  sequence_id integer not null,
-  primary key (id, sequence_id)
+create table products_restaurants (
+  product_id integer not null,
+	franchise_id integer not null,
+	store_id integer not null
 );

data/test/fixtures/department.rb

@@ -1,4 +1,5 @@
 class Department < ActiveRecord::Base
   set_primary_keys :department_id, :location_id
   has_many :employees, :foreign_key => [:department_id, :location_id]
+  has_one :head, :class_name => 'Employee', :foreign_key => [:department_id, :location_id], :dependent => :delete
 end

data/test/fixtures/departments.yml

@@ -1,3 +1,7 @@
-department1-cpk:
+accounting:
   department_id: 1
   location_id: 1
+
+engineering:
+  department_id: 2
+  location_id: 1

data/test/fixtures/employees.yml

@@ -1,9 +1,19 @@
-employee1:
+steve:
   id: 1
   department_id: 1
   location_id: 1
-employee2:
+
+jill:
   id: 2
   department_id: 1
   location_id: 1
 
+sarah:
+  id: 3
+  department_id: 2
+  location_id: 1
+
+robert:
+  id: 4
+  department_id: 2
+  location_id: 1

data/test/fixtures/membership.rb

@@ -4,7 +4,5 @@ class Membership < ActiveRecord::Base
   belongs_to :user
 	belongs_to :group
 	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
-
   has_many :readings, :primary_key => :user_id, :foreign_key => :user_id
-  has_one :reading, :primary_key => :user_id, :foreign_key => :user_id, :order => 'id DESC'
 end

data/test/fixtures/product.rb

@@ -1,7 +1,9 @@
 class Product < ActiveRecord::Base
 	set_primary_keys :id  # redundant
 	has_many :product_tariffs, :foreign_key => :product_id, :dependent => :delete_all
-	# Yeah, this is fake, it uses for testing
-  has_one :product_tariff, :foreign_key => :product_id
 	has_many :tariffs, :through => :product_tariffs, :foreign_key => [:tariff_id, :tariff_start_date]
+
+  has_and_belongs_to_many :restaurants,
+    :foreign_key => :product_id,
+    :association_foreign_key => [:franchise_id, :store_id]
 end

data/test/fixtures/restaurant.rb

@@ -3,4 +3,7 @@ class Restaurant < ActiveRecord::Base
   has_and_belongs_to_many :suburbs, 
     :foreign_key => [:franchise_id, :store_id],  
     :association_foreign_key => [:city_id, :suburb_id]
-end
+  has_and_belongs_to_many :products,
+    :foreign_key => [:franchise_id, :store_id],
+    :association_foreign_key => :product_id
+end

data/test/fixtures/restaurants.yml

@@ -2,4 +2,11 @@ mcdonalds:
   franchise_id: 1
   store_id: 1
   name: McDonalds
-
+subway_one:
+  franchise_id: 2
+  store_id: 1
+  name: Subway 1
+subway_two:
+  franchise_id: 2
+  store_id: 2
+  name: Subway 2

data/test/fixtures/tariff.rb

@@ -1,6 +1,5 @@
 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

@@ -2,10 +2,12 @@ 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) %>

data/test/test_associations.rb

@@ -1,9 +1,9 @@
 require 'abstract_unit'
 
 class TestAssociations < ActiveSupport::TestCase
-  fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,
+  fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants,
            :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings,
-           :memberships
+           :departments, :memberships
   
   def test_count
     assert_equal(2, Product.count(:include => :product_tariffs))
@@ -20,7 +20,6 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal 2, products(:first_product).product_tariffs.length
     assert_not_nil products(:first_product).tariffs
     assert_equal 2, products(:first_product).tariffs.length
-    assert_not_nil products(:first_product).product_tariff
   end
 
   def test_product_tariffs
@@ -35,7 +34,6 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal 1, tariffs(:flat).product_tariffs.length
     assert_not_nil tariffs(:flat).products
     assert_equal 1, tariffs(:flat).products.length
-    assert_not_nil tariffs(:flat).product_tariff
   end
 
   # Its not generating the instances of associated classes from the rows
@@ -152,22 +150,6 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal(rooms(:branner_room_1), room_assignment.room)
   end
 
-  def test_has_and_belongs_to_many
-    @restaurant = Restaurant.find([1,1])
-    assert_equal 2, @restaurant.suburbs.size
-
-    @restaurant = Restaurant.find([1,1], :include => :suburbs)
-    assert_equal 2, @restaurant.suburbs.size
-  end
-
-  def test_habtm_clear
-    @restaurant = Restaurant.find([1,1])
-    assert_equal 2, @restaurant.suburbs.size
-    @restaurant.suburbs.clear
-    @restaurant = Restaurant.find([1,1])
-    assert_equal 0, @restaurant.suburbs.size
-  end
-
   def test_has_many_with_primary_key
     @membership = Membership.find([1, 1])
     assert_equal 2, @membership.reading.id
@@ -175,8 +157,8 @@ class TestAssociations < ActiveSupport::TestCase
 
   def test_has_one_with_composite
     # In this case a regular model has_one composite model
-    product = products(:first_product)
-    assert_not_nil(product.product_tariff)
+    department = departments(:engineering)
+    assert_not_nil(department.head)
   end
 
   def test_has_many_with_primary_key
@@ -200,7 +182,8 @@ class TestAssociations < ActiveSupport::TestCase
   end
 
   def test_joins_has_one_with_primary_key
-    @membership = Membership.find(:first, :joins => :reading, :conditions => { :readings => { :id => 2 } })
+    @membership = Membership.find(:first, :joins => :readings,
+                                          :conditions => { :readings => { :id => 2 } })
 
     assert_equal [1, 1], @membership.id
   end