composite_primary_keys 3.0.4 → 3.0.7

data/History.txt

@@ -1,3 +1,19 @@
+== 3.0.7 2010-11-29
+* Fix has and belongs to many associations implementation.
+
+
+== 3.0.6 2010-11-29  (yanked)
+* Add full support for has and belongs to many associations.
+
+
+== 3.0.5 2010-11-28 (yanked)
+* Apply patch from Marian Rudzynski for fixing up attribute_methods/primary_key
+* Apply patch from Toby Cabot to fix up various sqlite3 issues
+* Add partial support for has and belongs to many associations.  Currently a cpk model
+  can have a habtm, but a normal model cannot have a habtm to a cpk model (its actually
+  not too hard to add, but one step at a time...)
+
+
 == 3.0.4 2010-11-21
 * Support deleting records when dependent is set to :delete_all
 * Switch the method #id to return a CompositeKeys instance (thus going back to how

data/Rakefile

@@ -10,46 +10,13 @@ require 'rake/gempackagetask'
 PROJECT_ROOT = File.expand_path(".")
 GEM_NAME = 'composite_primary_keys'
 
-# Read the current version
-require File.join(File.dirname(__FILE__), 'lib', 'composite_primary_keys', 'version')
+# Read the spec file
+spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
 
-# Setup Gem Specs
-spec = Gem::Specification.new do |s|
-  s.name        = GEM_NAME
-  s.version     = CompositePrimaryKeys::VERSION::STRING
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Dr Nic Williams", "Charlie Savage"]
-  s.email       = ["drnicwilliams@gmail.com"]
-  s.homepage    = "http://github.com/cfis/composite_primary_keys"
-  s.summary     = "Composite key support for ActiveRecord"
-  s.rubyforge_project = 'compositekeys'
-  s.description = "Composite key support for ActiveRecord 3"
-  s.files        = FileList['Rakefile',
-                            '*.txt',
-                            '*.rb',
-                            'lib/**/*',
-                            'local/**/*',
-                            'scripts/**/*',
-                            'tasks/**/*',
-                            'test/**/*'].to_a
-  s.require_path = 'lib'
-  s.test_files = Dir.glob("test/**")
+# Setup Rake tasks for managing the gem
+Rake::GemPackageTask.new(spec).define
 
-  s.date = Time.new
-  s.has_rdoc = true
-
-  # Dependencies
-  s.required_ruby_version = '>= 1.8.7'
-  s.add_dependency('activerecord', '>= 3.0.3')
-  s.add_development_dependency "rspec"
-end
-
-# Rake task to build the default package
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-end
-
-# Load task files
+# Now load in other task files
 Dir.glob('tasks/**/*.rake').each do |rake_file|
   load File.join(File.dirname(__FILE__), rake_file)
 end

data/lib/composite_primary_keys.rb

@@ -45,6 +45,7 @@ require 'active_record/associations/has_one_association'
 require 'active_record/associations/has_one_through_association'
 require 'active_record/associations/through_association_scope'
 require 'active_record/relation/query_methods'
+require 'active_record/attribute_methods/primary_key'
 
 require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/composite_arrays'
@@ -63,6 +64,7 @@ require 'composite_primary_keys/base'
 require 'composite_primary_keys/calculations'
 require 'composite_primary_keys/validations/uniqueness'
 require 'composite_primary_keys/query_methods'
+require 'composite_primary_keys/primary_key'
 
 Dir[File.dirname(__FILE__) + '/composite_primary_keys/connection_adapters/*.rb'].each do |adapter|
   begin

data/lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb

@@ -25,6 +25,69 @@ module ActiveRecord
 
         construct_counter_sql
       end
+      
+      def insert_record(record, force = true, validate = true)
+        unless record.persisted?
+          if force
+            record.save!
+          else
+            return false unless record.save(:validate => validate)
+          end
+        end
+
+        if @reflection.options[:insert_sql]
+          @owner.connection.insert(interpolate_sql(@reflection.options[:insert_sql], record))
+        else
+          relation   = Arel::Table.new(@reflection.options[:join_table])
+          timestamps = record_timestamp_columns(record)
+          timezone   = record.send(:current_time_from_proper_timezone) if timestamps.any?
+
+          # CPK
+          #attributes = Hash[columns.map do |column|
+          #  name = column.name
+          #  value = case name.to_s
+          #    when @reflection.primary_key_name.to_s
+          #      @owner.id
+          #    when @reflection.association_foreign_key.to_s
+          #      record.id
+          #    when *timestamps
+          #      timezone
+          #    else
+          #      @owner.send(:quote_value, record[name], column) if record.has_attribute?(name)
+          #  end
+          #  [relation[name], value] unless value.nil?
+          #end]
+
+          # CPK
+          owner_foreign_keys = @reflection.cpk_primary_key.map{|key| key.to_s}
+          association_foreign_keys = Array(@reflection.association_foreign_key).map{|key| key.to_s}
+
+          attributes = Hash[columns.map do |column|
+            name = column.name.to_s
+            value = case
+              when owner_foreign_keys.include?(name)
+                index = owner_foreign_keys.index(name)
+                primary_keys = Array(@owner.class.primary_key)
+                primary_key = primary_keys[index]
+                @owner[primary_key]
+              when association_foreign_keys.include?(name)
+                index = association_foreign_keys.index(name)
+                primary_keys = Array(@reflection.klass.primary_key)
+                primary_key = primary_keys[index]
+                record[primary_key]
+              when timestamps.include?(name)
+                timezone
+              else
+                @owner.send(:quote_value, record[name], column) if record.has_attribute?(name)
+            end
+            [relation[name], value] unless value.nil?
+          end]
+
+          relation.insert(attributes)
+        end
+
+        return true
+      end
     end
   end
 end

data/lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-require 'active_record/connection_adapters/sqlite_adapter'
+require 'active_record/connection_adapters/sqlite3_adapter'
 
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
@@ -12,4 +12,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/primary_key.rb

@@ -0,0 +1,19 @@
+module ActiveRecord
+  module AttributeMethods #:nodoc:
+    module PrimaryKey
+      def to_key
+        # CPK
+        #key = send(self.class.primary_key)
+        #[key] if key
+
+        primary_key = self.class.primary_key
+        if primary_key.is_a?(Array)
+          primary_key.collect{|k| send(k)}
+        else
+          key = send(primary_key)
+          [key] if key
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/scripts/txt2html

@@ -7,7 +7,7 @@ require 'erb'
 require File.dirname(__FILE__) + '/../lib/composite_primary_keys/version.rb'
 
 version  = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubyforge.org/projects/compositekeys'
+download = 'http://rubygems.org/gems/composite_primary_keys'
 
 class Fixnum
   def ordinal

data/scripts/txt2js

@@ -8,7 +8,7 @@ require 'active_support'
 require File.dirname(__FILE__) + '/../lib/composite_primary_keys/version.rb'
 
 version  = CompositePrimaryKeys::VERSION::STRING
-download = 'http://rubyforge.org/projects/compositekeys'
+download = 'http://rubygems.org/gems/composite_primary_keys'
 
 class Fixnum
   def ordinal

data/tasks/databases/sqlite3.rake

@@ -23,6 +23,6 @@ namespace :sqlite3 do
   task :rebuild_databases => [:drop_databases, :build_databases]
 
   task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlite3", "connection")
+    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlite", "connection")
   end
 end

data/tasks/website.rake

@@ -8,11 +8,11 @@ end
 desc 'Upload website files to rubyforge'
 task :website_upload do
   config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-  host = "#{config["username"]}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/"
+  host = "cfis@rubyforge.org"
+  remote_dir = "/var/www/gforge-projects/compositekeys"
   local_dir = 'website'
-  sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
+  sh %{scp -r #{local_dir}/* #{host}:#{remote_dir}}
 end
 
 desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]
+task :website => [:website_generate, :website_upload]

data/test/connections/databases.example.yml

@@ -4,6 +4,7 @@ mysql:
 
 sqlite3:
   adapter: sqlite3
+  dbfile: db/composite_primary_keys_unittest.sqlite3
 
 postgresql:
   adapter: postgresql

data/test/connections/databases.yml

@@ -5,6 +5,7 @@ mysql:
 
 sqlite3:
   adapter: sqlite3
+  dbfile: db/composite_primary_keys_unittest.sqlite3
 
 postgresql:
   adapter: postgresql

data/test/connections/native_sqlite/connection.rb

@@ -1,13 +1,13 @@
 print "Using native Sqlite3\n"
 require 'logger'
-require 'adapter_helper/sqlite3'
 require 'active_record'
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 ActiveRecord::Base.logger = Logger.new("debug.log")
 
 def connection_string
-  connection_SPEC['dbfile']
+  SPEC['dbfile']
 end
 
 SPEC = CompositePrimaryKeys::ConnectionSpec[:sqlite3]
-ActiveRecord::Base.establish_connection(SPEC)
+ActiveRecord::Base.establish_connection(SPEC)

data/test/debug.log

@@ -450,3 +450,112 @@ HINT:  No operator matches the given name and argument type(s). You might need t
   SQL (0.0ms)  SET standard_conforming_strings = on
   SQL (0.0ms)  SET client_min_messages TO 'notice'
   SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  null value in column "franchise_id" violates not-null constraint
+: INSERT INTO "restaurants_suburbs" ("suburb_id", "city_id") VALUES (22, 22)
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (1.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (1.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (1.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column "tariff_idstart_date" does not exist
+LINE 1: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LE...
+                              ^
+: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LEFT OUTER JOIN "product_tariffs" ON "product_tariffs"."tariff_id" = "tariffs"."tariff_id" AND "product_tariffs"."tariff_start_date" = "tariffs"."start_date"
+PGError: ERROR:  operator does not exist: character varying = integer
+LINE 1: ...ments".person_type = 'User') AND ("comments".person_id = 1))
+                                                                  ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+: SELECT "hacks".* FROM "hacks" INNER JOIN "comments" ON ("hacks"."name" = "comments"."hack_id") WHERE (("comments".person_type = 'User') AND ("comments".person_id = 1))
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (0.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column "tariff_idstart_date" does not exist
+LINE 1: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LE...
+                              ^
+: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LEFT OUTER JOIN "product_tariffs" ON "product_tariffs"."tariff_id" = "tariffs"."tariff_id" AND "product_tariffs"."tariff_start_date" = "tariffs"."start_date"
+PGError: ERROR:  operator does not exist: character varying = integer
+LINE 1: ...ments".person_type = 'User') AND ("comments".person_id = 1))
+                                                                  ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+: SELECT "hacks".* FROM "hacks" INNER JOIN "comments" ON ("hacks"."name" = "comments"."hack_id") WHERE (("comments".person_type = 'User') AND ("comments".person_id = 1))
+  SQL (0.0ms)  SHOW client_min_messages
+  SQL (0.0ms)  SET client_min_messages TO 'panic'
+  SQL (0.0ms)  SET standard_conforming_strings = on
+  SQL (1.0ms)  SET client_min_messages TO 'notice'
+  SQL (0.0ms)  SHOW TIME ZONE
+PGError: ERROR:  column "tariff_idstart_date" does not exist
+LINE 1: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LE...
+                              ^
+: SELECT COUNT(DISTINCT tariff_idstart_date) FROM "tariffs" LEFT OUTER JOIN "product_tariffs" ON "product_tariffs"."tariff_id" = "tariffs"."tariff_id" AND "product_tariffs"."tariff_start_date" = "tariffs"."start_date"
+PGError: ERROR:  operator does not exist: character varying = integer
+LINE 1: ...ments".person_type = 'User') AND ("comments".person_id = 1))
+                                                                  ^
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+: SELECT "hacks".* FROM "hacks" INNER JOIN "comments" ON ("hacks"."name" = "comments"."hack_id") WHERE (("comments".person_type = 'User') AND ("comments".person_id = 1))

data/test/test_create.rb

@@ -13,17 +13,17 @@ class TestCreate < ActiveSupport::TestCase
       :primary_keys => :reference_type_id,
       :create => {:reference_type_id => 10, :type_label => 'NEW_TYPE', :abbreviation => 'New Type'}
     },
-    :dual   => { 
+    :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]
@@ -58,11 +58,37 @@ class TestCreate < ActiveSupport::TestCase
     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
+
+  def test_create_habtm
+    restaurant = Restaurant.new(:franchise_id => 22,
+                                :store_id => 23,
+                                :name => "My Store")
+
+    restaurant.suburbs << Suburb.new(:city_id => 24,
+                                     :suburb_id => 25,
+                                     :name => "My Suburb")
+
+    restaurant.save!
+
+    restaurant.reload
+
+    # Test restaurant
+    assert_equal(22, restaurant.franchise_id)
+    assert_equal(23, restaurant.store_id)
+    assert_equal("My Store", restaurant.name)
+    assert_equal(1, restaurant.suburbs.length)
+
+    # Test suburbs
+    suburb = restaurant.suburbs[0]
+    assert_equal(24, suburb.city_id)
+    assert_equal(25, suburb.suburb_id)
+    assert_equal("My Suburb", suburb.name)
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 9
   prerelease: false
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 7
+  version: 3.0.7
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 -07:00
+date: 2010-11-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
 - lib/composite_primary_keys/finder_methods.rb
 - lib/composite_primary_keys/fixtures.rb
+- lib/composite_primary_keys/primary_key.rb
 - lib/composite_primary_keys/query_methods.rb
 - lib/composite_primary_keys/read.rb
 - lib/composite_primary_keys/reflection.rb