composite_primary_keys 1.0.8 → 1.0.10

data/test/fixtures/db_definitions/sqlite.sql

@@ -1,108 +1,108 @@
-CREATE TABLE reference_types (
-  reference_type_id INTEGER PRIMARY KEY,
-  type_label varchar(50) default NULL,
-  abbreviation varchar(50) default NULL,
-  description varchar(50) default NULL
+create table reference_types (
+    reference_type_id integer primary key,
+    type_label varchar(50) default null,
+    abbreviation varchar(50) default null,
+    description varchar(50) default null
 );
 
-CREATE TABLE reference_codes (
-  reference_type_id int(11) NOT NULL,
-  reference_code int(11) NOT NULL,
-  code_label varchar(50) default NULL,
-  abbreviation varchar(50) default NULL,
-  description varchar(50) default NULL,
-  PRIMARY KEY  (reference_type_id,reference_code)
+create table reference_codes (
+    reference_type_id int(11),
+    reference_code int(11) not null,
+    code_label varchar(50) default null,
+    abbreviation varchar(50) default null,
+    description varchar(50) default null,
+    primary key (reference_type_id, reference_code)
 );
 
-CREATE TABLE products (
-  id int(11) NOT NULL PRIMARY KEY,
-  name varchar(50) default NULL
+create table products (
+    id int(11) not null primary key,
+    name varchar(50) default null
 );
 
-CREATE TABLE tariffs (
-  tariff_id int(11) NOT NULL,
-  start_date date NOT NULL,
-  amount integer(11) default NULL,
-  PRIMARY KEY  (tariff_id,start_date)
+create table tariffs (
+    tariff_id int(11) not null,
+    start_date date not null,
+    amount integer(11) default null,
+    primary key (tariff_id, start_date)
 );
 
-CREATE TABLE product_tariffs (
-  product_id int(11) NOT NULL,
-  tariff_id int(11) NOT NULL,
-  tariff_start_date date NOT NULL,
-  PRIMARY KEY  (product_id,tariff_id,tariff_start_date)
+create table product_tariffs (
+    product_id int(11) not null,
+    tariff_id int(11) not null,
+    tariff_start_date date not null,
+    primary key (product_id, tariff_id, tariff_start_date)
 );
 
-CREATE TABLE suburbs (
-  city_id int(11) NOT NULL,
-  suburb_id int(11) NOT NULL,
-  name varchar(50) NOT NULL,
-  PRIMARY KEY  (city_id,suburb_id)
+create table suburbs (
+    city_id int(11) not null,
+    suburb_id int(11) not null,
+    name varchar(50) not null,
+    primary key (city_id, suburb_id)
 );
 
-CREATE TABLE streets (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  city_id int(11) NOT NULL,
-  suburb_id int(11) NOT NULL,
-  name varchar(50) NOT NULL
+create table streets (
+    id integer not null primary key autoincrement,
+    city_id int(11) not null,
+    suburb_id int(11) not null,
+    name varchar(50) not null
 );
 
-CREATE TABLE users (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  name varchar(50) NOT NULL
+create table users (
+    id integer not null primary key autoincrement,
+    name varchar(50) not null
 );
 
-CREATE TABLE articles (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  name varchar(50) NOT NULL
+create table articles (
+    id integer not null primary key autoincrement,
+    name varchar(50) not null
 );
 
-CREATE TABLE readings (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  user_id int(11) NOT NULL,
-  article_id int(11) NOT NULL,
-  rating int(11) NOT NULL
+create table readings (
+    id integer not null primary key autoincrement,
+    user_id int(11) not null,
+    article_id int(11) not null,
+    rating int(11) not null
 );
 
-CREATE TABLE groups (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  name varchar(50) NOT NULL
+create table groups (
+    id integer not null primary key autoincrement,
+    name varchar(50) not null
 );
 
-CREATE TABLE memberships (
-  user_id int NOT NULL,
-  group_id int NOT NULL,
-  PRIMARY KEY  (user_id,group_id)
+create table memberships (
+    user_id int not null,
+    group_id int not null,
+    primary key (user_id, group_id)
 );
 
-CREATE TABLE membership_statuses (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  user_id int NOT NULL,
-  group_id int NOT NULL,
-	status varchar(50) NOT NULL
+create table membership_statuses (
+    id integer not null primary key autoincrement,
+    user_id int not null,
+    group_id int not null,
+	status varchar(50) not null
 );
 
-CREATE TABLE departments (
-  department_id INTEGER NOT NULL,
-  location_id INTEGER NOT NULL,
-  PRIMARY KEY (department_id, location_id)
+create table departments (
+    department_id integer not null,
+    location_id integer not null,
+    primary key (department_id, location_id)
 );
 
-CREATE TABLE employees (
- id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- department_id INTEGER NULL,
- location_id INTEGER NULL
+create table employees (
+    id integer not null primary key autoincrement,
+    department_id integer null,
+    location_id integer null
 );
 
-CREATE TABLE comments (
-	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	person_id varchar(100) NULL,
-	person_type varchar(100) NULL,
-	hack_id varchar(100) NULL
+create table comments (
+	id integer not null primary key autoincrement,
+	person_id varchar(100) null,
+	person_type varchar(100) null,
+	hack_id varchar(100) null
 );
 
-CREATE TABLE hacks (
- name varchar(50) NOT NULL PRIMARY KEY
+create table hacks (
+    name varchar(50) not null primary key
 );
 
 create table kitchen_sinks (
@@ -157,3 +157,4 @@ create table room_assignments (
 	dorm_id integer not null,
 	room_id integer not null	
 );
+

data/test/fixtures/street.rb

@@ -1,3 +1,3 @@
-class Street < ActiveRecord::Base
-  belongs_to :suburb,  :foreign_key => [:city_id, :suburb_id]
+class Street < ActiveRecord::Base
+  belongs_to :suburb,  :foreign_key => [:city_id, :suburb_id]
 end

data/test/fixtures/streets.yml

@@ -1,15 +1,15 @@
-first:
-  id: 1
-  city_id: 1
-  suburb_id: 1
-  name: First Street
-second1:
-  id: 2
-  city_id: 2
-  suburb_id: 1
-  name: First Street
-second2:
-  id: 3
-  city_id: 2
-  suburb_id: 1
+first:
+  id: 1
+  city_id: 1
+  suburb_id: 1
+  name: First Street
+second1:
+  id: 2
+  city_id: 2
+  suburb_id: 1
+  name: First Street
+second2:
+  id: 3
+  city_id: 2
+  suburb_id: 1
   name: Second Street

data/test/test_associations.rb

@@ -19,11 +19,6 @@ class TestAssociations < Test::Unit::TestCase
   fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,
            :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings
   
-  def test_quoted_table_columns
-    assert_equal "product_tariffs.product_id,product_tariffs.tariff_id,product_tariffs.tariff_start_date", 
-        ProductTariff.send(:quoted_table_columns, ProductTariff.primary_key)
-  end
-  
   def test_has_many_through_with_conditions_when_through_association_is_not_composite
     user = User.find(:first)
     assert_equal 1, user.articles.find(:all, :conditions => ["articles.name = ?", "Article One"]).size

data/test/test_attribute_methods.rb

@@ -16,7 +16,7 @@ class TestAttributeMethods < Test::Unit::TestCase
     sink = KitchenSink.find(1,2)
     assert_equal(1, sink.id_1)
     assert_equal(2, sink.id_2)
-    assert_equal(Date.today, sink.a_date)
+    assert_equal(Date.today, sink.a_date.to_date)
     assert_equal('string', sink.a_string)
   end
-end
+end

data/test/test_create.rb

@@ -1,68 +1,68 @@
-require 'abstract_unit'
-require 'fixtures/reference_type'
-require 'fixtures/reference_code'
-require 'fixtures/street'
-require 'fixtures/suburb'
-
-class TestCreate < Test::Unit::TestCase
-  fixtures :reference_types, :reference_codes, :streets, :suburbs
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-      :create => {:reference_type_id => 10, :type_label => 'NEW_TYPE', :abbreviation => 'New Type'}
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-      :create => {:reference_type_id => 1, :reference_code => 20, :code_label => 'NEW_CODE', :abbreviation => 'New Code'}
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-  
-  def test_setup
-    testing_with do
-      assert_not_nil @klass_info[:create]
-    end
-  end
-  
-  def test_create
-    testing_with do
-      assert new_obj = @klass.create(@klass_info[:create])
-      assert !new_obj.new_record?
-    end
-  end
-  
-  def test_create_no_id
-    testing_with do
-      begin
-        @obj = @klass.create(@klass_info[:create].block(@klass.primary_key))
-        @successful = !composite?
-      rescue CompositePrimaryKeys::ActiveRecord::CompositeKeyError
-        @successful = false
-      rescue
-        flunk "Incorrect exception raised: #{$!}, #{$!.class}"
-      end
-      assert_equal composite?, !@successful, "Create should have failed for composites; #{@obj.inspect}"
-    end
-  end
-  
-  def test_create_on_association
-    suburb = Suburb.find(:first)
-    suburb.streets.create(:city_id => suburb.city_id, :suburb_id => suburb.suburb_id, :name => "my street")
-    street = Street.find_by_name('my street')
-    assert_equal(suburb.city_id, street.city_id)
-    assert_equal(suburb.suburb_id, street.suburb_id)
-  end
-  
-  def test_create_on_association_when_belongs_to_is_single_key
-    rt = ReferenceType.find(:first)
-    rt.reference_codes.create(:reference_type_id => 1234, :reference_code => 4321, :code_label => 'foo', :abbreviation => 'bar')
-    rc = ReferenceCode.find_by_reference_code(4321)
-    assert_equal(rc.reference_type_id, rt.reference_type_id)
-  end
-end
+require 'abstract_unit'
+require 'fixtures/reference_type'
+require 'fixtures/reference_code'
+require 'fixtures/street'
+require 'fixtures/suburb'
+
+class TestCreate < Test::Unit::TestCase
+  fixtures :reference_types, :reference_codes, :streets, :suburbs
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+      :create => {:reference_type_id => 10, :type_label => 'NEW_TYPE', :abbreviation => 'New Type'}
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+      :create => {:reference_type_id => 1, :reference_code => 20, :code_label => 'NEW_CODE', :abbreviation => 'New Code'}
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+  
+  def test_setup
+    testing_with do
+      assert_not_nil @klass_info[:create]
+    end
+  end
+  
+  def test_create
+    testing_with do
+      assert new_obj = @klass.create(@klass_info[:create])
+      assert !new_obj.new_record?
+    end
+  end
+  
+  def test_create_no_id
+    testing_with do
+      begin
+        @obj = @klass.create(@klass_info[:create].block(@klass.primary_key))
+        @successful = !composite?
+      rescue CompositePrimaryKeys::ActiveRecord::CompositeKeyError
+        @successful = false
+      rescue
+        flunk "Incorrect exception raised: #{$!}, #{$!.class}"
+      end
+      assert_equal composite?, !@successful, "Create should have failed for composites; #{@obj.inspect}"
+    end
+  end
+  
+  def test_create_on_association
+    suburb = Suburb.find(:first)
+    suburb.streets.create(:name => "my street")
+    street = Street.find_by_name('my street')
+    assert_equal(suburb.city_id, street.city_id)
+    assert_equal(suburb.suburb_id, street.suburb_id)
+  end
+  
+  def test_create_on_association_when_belongs_to_is_single_key
+    rt = ReferenceType.find(:first)
+    rt.reference_codes.create(:reference_code => 4321, :code_label => 'foo', :abbreviation => 'bar')
+    rc = ReferenceCode.find_by_reference_code(4321)
+    assert_equal(rc.reference_type_id, rt.reference_type_id)
+  end
+end

data/test/test_delete.rb

@@ -65,23 +65,32 @@ class TestDelete < Test::Unit::TestCase
       @klass.delete_all
     end
   end
-  
+
   def test_clear_association
       department = Department.find(1,1)
-      assert_equal 2, department.employees.size, "Employee count for department should be 2 before clear"
+      assert_equal 2, department.employees.size, "Before clear employee count should be 2."
       department.employees.clear
-      assert_equal 0, department.employees.size, "After clear size should 0"
+      assert_equal 0, department.employees.size, "After clear employee count should be 0."
       department.reload
-      assert_equal 0, department.employees.size, "After clear count in database should have been 0"
+      assert_equal 0, department.employees.size, "After clear and a reload from DB employee count should be 0."
   end
-  
+
   def test_delete_association
       department = Department.find(1,1)
-      assert_equal 2, department.employees.size , "Employee count for department should be 2 before delete"
-	    first_employee = department.employees[0]
-      department.employees.delete(first_employee) 
-      assert_equal 1, department.employees.size, "After delete employees count should be 1."
+      assert_equal 2, department.employees.size , "Before delete employee count should be 2."
+      first_employee = department.employees[0]
+      department.employees.delete(first_employee)
+      assert_equal 1, department.employees.size, "After delete employee count should be 1."
       department.reload
-      assert_equal 1, department.employees.size, "After delete employees count should be 1 after reload from DB."
+      assert_equal 1, department.employees.size, "After delete and a reload from DB employee count should be 1."
+  end
+
+  def test_delete_records_for_has_many_association_with_composite_primary_key
+      reference_type  = ReferenceType.find(1)
+      codes_to_delete = reference_type.reference_codes[0..1]
+      assert_equal 3, reference_type.reference_codes.size, "Before deleting records reference_code count should be 3."
+      reference_type.reference_codes.delete_records(codes_to_delete)
+      reference_type.reload
+      assert_equal 1, reference_type.reference_codes.size, "After deleting 2 records and a reload from DB reference_code count should be 1."
   end
 end

data/test/test_ids.rb

@@ -46,6 +46,13 @@ class TestIds < Test::Unit::TestCase
     end
   end
   
+  def test_composite_where_clause
+    testing_with do
+      where = 'reference_codes.reference_type_id=1 AND reference_codes.reference_code=2) OR (reference_codes.reference_type_id=2 AND reference_codes.reference_code=2'
+      assert_equal(where, @klass.composite_where_clause([[1, 2], [2, 2]])) if @key_test == :dual
+    end
+  end
+  
   def test_set_ids_string
     testing_with do
       array = @primary_keys.collect {|key| 5}

data/website/template.js

@@ -1,3 +1,3 @@
-// <%= title %>
-var version = <%= version.to_json %>;
-<%= body %>
+// <%= title %>
+var version = <%= version.to_json %>;
+<%= body %>