composite_primary_keys 0.7.5 → 0.8.0

data/lib/composite_primary_keys/version.rb

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

data/scripts/txt2html

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
-require '../lib/composite_primary_keys/version.rb'
+require File.dirname(__FILE__) + '/../lib/composite_primary_keys/version.rb'
 
 version  = CompositePrimaryKeys::VERSION::STRING
 download = 'http://rubyforge.org/projects/compositekeys'
@@ -34,7 +35,8 @@ end
 
 if ARGV.length >= 1
   src, template = ARGV
-  template ||= 'template.rhtml'
+  template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
+  
 else
   puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
   exit!

data/scripts/txt2js

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'redcloth'
 require 'syntax/convertors/html'
 require 'erb'
 require 'active_support'
-require '../lib/composite_primary_keys/version.rb'
+require File.dirname(__FILE__) + '/../lib/composite_primary_keys/version.rb'
 
 version  = CompositePrimaryKeys::VERSION::STRING
 download = 'http://rubyforge.org/projects/compositekeys'
@@ -35,7 +36,7 @@ end
 
 if ARGV.length >= 1
   src, template = ARGV
-  template ||= 'template.js'
+  template ||= File.dirname(__FILE__) + '/../website/template.js'
 else
   puts("Usage: #{File.split($0).last} source.txt [template.js] > output.html")
   exit!

data/test/abstract_unit.rb

@@ -1,12 +1,18 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
+require 'rubygems'
 require 'test/unit'
 require 'hash_tricks'
 require 'active_record'
 require 'active_record/fixtures'
 require 'active_support/binding_of_caller'
 require 'active_support/breakpoint'
-require 'connection'
+begin
+  require 'connection'
+rescue MissingSourceFile => e
+  adapter = 'postgresql' #'sqlite'
+  require "#{File.dirname(__FILE__)}/connections/native_#{adapter}/connection"
+end
 require 'composite_primary_keys'
 
 QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type') unless Object.const_defined?(:QUOTED_TYPE)
@@ -56,7 +62,8 @@ protected
     classes.keys.each do |@key_test|
       @klass_info = classes[@key_test]
       @klass, @primary_keys = @klass_info[:class], @klass_info[:primary_keys]
-      @first = @klass.find_first
+      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
+      @first = @klass.find(:first, :order => order)
       yield
     end
   end

data/test/connections/native_mysql/connection.rb

@@ -5,9 +5,12 @@ ActiveRecord::Base.logger = Logger.new("debug.log")
 
 db1 = 'composite_primary_keys_unittest'
 
-ActiveRecord::Base.establish_connection(
+connection_options = {
   :adapter  => "mysql",
   :username => "root",
   :encoding => "utf8",
   :database => db1
-)
+}
+
+ActiveRecord::Base.configurations = { db1 => connection_options }
+ActiveRecord::Base.establish_connection(connection_options)

data/test/connections/native_postgresql/connection.rb

@@ -0,0 +1,15 @@
+print "Using native Postgresql\n"
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+db1 = 'composite_primary_keys_unittest'
+
+connection_options = {
+  :adapter  => "postgresql",
+  :encoding => "utf8",
+  :database => db1
+}
+
+ActiveRecord::Base.configurations = { db1 => connection_options }
+ActiveRecord::Base.establish_connection(connection_options)

data/test/connections/native_sqlite/connection.rb

@@ -0,0 +1,10 @@
+print "Using native Sqlite3\n"
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "sqlite3",
+  :dbfile   => "test.db"
+)
+

data/test/fixtures/db_definitions/mysql.sql

@@ -70,3 +70,23 @@ CREATE TABLE `readings` (
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
+CREATE TABLE groups (
+  id int(11) NOT NULL auto_increment,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+) TYPE=InnoDB;
+
+CREATE TABLE memberships (
+  user_id int(11) NOT NULL,
+  group_id int(11) NOT NULL,
+  PRIMARY KEY  (user_id,group_id)
+) TYPE=InnoDB;
+
+CREATE TABLE membership_statuses (
+  id int(11) NOT NULL auto_increment,
+  user_id int(11) NOT NULL,
+  group_id int(11) NOT NULL,
+  status varchar(50) NOT NULL,
+  PRIMARY KEY (id)
+) TYPE=InnoDB;
+

data/test/fixtures/db_definitions/postgresql.sql

@@ -0,0 +1,100 @@
+CREATE SEQUENCE public.reference_types_seq START 100;
+CREATE TABLE reference_types (
+  reference_type_id int DEFAULT nextval('public.reference_types_seq'),
+  type_label varchar(50) default NULL,
+  abbreviation varchar(50) default NULL,
+  description varchar(50) default NULL,
+  PRIMARY KEY  (reference_type_id)
+);
+
+CREATE TABLE reference_codes (
+  reference_type_id int NOT NULL,
+  reference_code int 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 SEQUENCE public.products_seq START 100;
+CREATE TABLE products (
+  id int NOT NULL DEFAULT nextval('public.products_seq'),
+  name varchar(50) default NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE tariffs (
+  tariff_id int NOT NULL,
+  start_date date NOT NULL,
+  amount int default NULL,
+  PRIMARY KEY  (tariff_id,start_date)
+);
+
+CREATE TABLE product_tariffs (
+  product_id int NOT NULL,
+  tariff_id int NOT NULL,
+  tariff_start_date date NOT NULL,
+  PRIMARY KEY  (product_id,tariff_id,tariff_start_date)
+);
+
+CREATE TABLE suburbs (
+  city_id int NOT NULL,
+  suburb_id int NOT NULL,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (city_id,suburb_id)
+);
+
+CREATE SEQUENCE public.streets_seq START 100;
+CREATE TABLE streets (
+  id int NOT NULL DEFAULT nextval('public.streets_seq'),
+  city_id int NOT NULL,
+  suburb_id int NOT NULL,
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE SEQUENCE public.users_seq START 100;
+CREATE TABLE users (
+  id int NOT NULL DEFAULT nextval('public.users_seq'),
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE SEQUENCE public.articles_seq START 100;
+CREATE TABLE articles (
+  id int NOT NULL DEFAULT nextval('public.articles_seq'),
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE SEQUENCE public.readings_seq START 100;
+CREATE TABLE readings (
+  id int NOT NULL DEFAULT nextval('public.readings_seq'),
+  user_id int NOT NULL,
+  article_id int NOT NULL,
+  rating int NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE SEQUENCE public.groups_seq START 100;
+CREATE TABLE groups (
+  id int NOT NULL DEFAULT nextval('public.groups_seq'),
+  name varchar(50) NOT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE memberships (
+  user_id int NOT NULL,
+  group_id int NOT NULL,
+  PRIMARY KEY  (user_id,group_id)
+);
+
+CREATE SEQUENCE public.membership_statuses_seq START 100;
+CREATE TABLE membership_statuses (
+  id int NOT NULL DEFAULT nextval('public.membership_statuses_seq'),
+  user_id int NOT NULL,
+  group_id int NOT NULL,
+	status varchar(50) NOT NULL,
+  PRIMARY KEY (id)
+);
+

data/test/fixtures/db_definitions/sqlite.sql

@@ -0,0 +1,84 @@
+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 `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 `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 `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 `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 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 membership_statuses (
+  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  user_id int NOT NULL,
+  group_id int NOT NULL,
+	status varchar(50) NOT NULL
+);
+

data/test/fixtures/group.rb

@@ -0,0 +1,3 @@
+class Group < ActiveRecord::Base
+  has_many :memberships
+end

data/test/fixtures/groups.yml

@@ -0,0 +1,3 @@
+cpk:
+  id: 1
+  name: Composite Primary Keys

data/test/fixtures/membership.rb

@@ -0,0 +1,7 @@
+class Membership < ActiveRecord::Base
+  # set_primary_keys *keys - turns on composite key functionality
+  set_primary_keys :user_id, :group_id
+  belongs_to :user
+	belongs_to :group
+	has_many :statuses, :class_name => 'MembershipStatus', :foreign_key => [:user_id, :group_id]
+end

data/test/fixtures/membership_status.rb

@@ -0,0 +1,3 @@
+class MembershipStatus < ActiveRecord::Base
+	belongs_to :membership, :foreign_key => [:user_id, :group_id]
+end

data/test/fixtures/membership_statuses.yml

@@ -0,0 +1,8 @@
+santiago-cpk:
+  user_id: 1
+  group_id: 1
+  status: Active
+drnic-cpk:
+  user_id: 2
+  group_id: 1
+  status: Owner

data/test/fixtures/memberships.yml

@@ -0,0 +1,6 @@
+santiago-cpk:
+  user_id: 1
+  group_id: 1
+drnic-cpk:
+  user_id: 2
+  group_id: 1

data/test/{associations_test.rb → test_associations.rb}

@@ -5,15 +5,14 @@ require 'fixtures/product_tariff'
 require 'fixtures/suburb'
 require 'fixtures/street'
 
-class AssociationTest < Test::Unit::TestCase
-  fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets
+class TestAssociations < Test::Unit::TestCase
 
   def setup
-    super
-    @first_product = products(:first_product)
-    @flat = tariffs(:flat)
-    @free = tariffs(:free)
-    @first_flat = product_tariffs(:first_flat)
+    create_fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets
+    @first_product = Product.find(1)
+    @flat = Tariff.find(1, Date.today.to_s(:db))
+    @free = Tariff.find(2, Date.today.to_s(:db))
+    @first_flat = ProductTariff.find(1, 1, Date.today.to_s(:db))
   end
   
   def test_setup
@@ -61,24 +60,35 @@ class AssociationTest < Test::Unit::TestCase
     assert @products = Product.find(:all, :include => :product_tariffs)
     assert_equal 2, @products.length
     assert_not_nil @products.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'
-    assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, "Incorrect number of product_tariffs returned"
+    assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, 
+      "Incorrect number of product_tariffs returned"
   end
   
   def test_find_includes_tariffs
     assert @tariffs = Tariff.find(:all, :include => :product_tariffs)
     assert_equal 3, @tariffs.length
     assert_not_nil @tariffs.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'
-    assert_equal 3, @tariffs.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, "Incorrect number of product_tariffs returned"
+    assert_equal 3, @tariffs.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, 
+      "Incorrect number of product_tariffs returnedturned"
   end
   
   def XXX_test_find_includes_extended
     # TODO - what's the correct syntax?
     assert @products = Product.find(:all, :include => {:product_tariffs => :tariffs})
-    assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, "Incorrect number of product_tariffs returned"
+    assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, 
+      "Incorrect number of product_tariffs returned"
     
     assert @tariffs = Tariff.find(:all, :include => {:product_tariffs => :products})
-    assert_equal 3, @tariffs.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, "Incorrect number of product_tariffs returned"
-    
+    assert_equal 3, @tariffs.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length}, 
+      "Incorrect number of product_tariffs returned"
+  end
+  
+  def test_join_where_clause
+    @product = Product.find(:first, :include => :product_tariffs)
+    where_clause = @product.product_tariffs.composite_where_clause(
+      ['foo','bar'], [1,2]
+    )
+    assert_equal('(foo=1 AND bar=2)', where_clause)
   end
   
 end

data/test/{attributes_test.rb → test_attributes.rb}

@@ -5,8 +5,7 @@ require 'fixtures/product'
 require 'fixtures/tariff'
 require 'fixtures/product_tariff'
 
-class AttributesTest < Test::Unit::TestCase
-  fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
+class TestAttributes < Test::Unit::TestCase
 
   CLASSES = {
     :single => {
@@ -20,7 +19,7 @@ class AttributesTest < Test::Unit::TestCase
   }
   
   def setup
-    super
+    create_fixtures :reference_types, :reference_codes, :products, :tariffs, :product_tariffs
     self.class.classes = CLASSES
   end
   
@@ -49,8 +48,8 @@ class AttributesTest < Test::Unit::TestCase
   end
     
   def test_brackets_foreign_key_assignment
-    @flat = tariffs(:flat)
-    @second_free = product_tariffs(:second_free)
+    @flat = Tariff.find(1, Date.today.to_s(:db))
+    @second_free = ProductTariff.find(2,2,Date.today.to_s(:db))
     @second_free_fk = [:tariff_id, :tariff_start_date]
     @second_free[key = @second_free_fk] = @flat.id
       compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)