composite_primary_keys 4.0.0.beta3 → 4.0.0.beta4

data/History.txt

@@ -1,3 +1,7 @@
+== 4.0.0.beta4 2011-07-22
+* Compatible with Rails 3.1 stable branch.  No longer works with RC4 (Charlie Savage)
+* Do not require loading of postgresql gem unless needed (Charlie Savage)
+
 == 4.0.0.beta3 2011-07-08
 * Fix the ability to update the values of a primary key (Travis Warlick)
 * Support port and host configurations for postgres rake tasks (Travis Warlick)

data/lib/composite_primary_keys.rb

@@ -53,7 +53,6 @@ require 'active_record/attribute_methods/read'
 require 'active_record/attribute_methods/write'
 
 require 'active_record/connection_adapters/abstract_adapter'
-require 'active_record/connection_adapters/postgresql_adapter'
 
 require 'active_record/relation/calculations'
 require 'active_record/relation/finder_methods'
@@ -89,7 +88,7 @@ require 'composite_primary_keys/attribute_methods/read'
 require 'composite_primary_keys/attribute_methods/write'
 
 require 'composite_primary_keys/connection_adapters/abstract_adapter'
-require 'composite_primary_keys/connection_adapters/postgresql_adapter'
+require 'composite_primary_keys/connection_adapters/abstract/connection_specification_changes'
 
 require 'composite_primary_keys/relation/calculations'
 require 'composite_primary_keys/relation/finder_methods'

data/lib/composite_primary_keys/associations/preloader/association.rb

@@ -11,7 +11,8 @@ module ActiveRecord
         
         def associated_records_by_owner
           # CPK
-          # owner_keys = owners.map { |owner| owner[owner_key_name] }.compact.uniq
+          owners_map = owners_by_key
+          #owner_keys = owners_map.keys.compact
           owner_keys = owners.map do |owner|
             Array(owner_key_name).map do |owner_key|
               owner[owner_key]
@@ -36,7 +37,7 @@ module ActiveRecord
               record[key_name]
             end.join(CompositePrimaryKeys::ID_SEP)
 
-            owners_by_key[owner_key].each do |owner|
+            owners_map[owner_key].each do |owner|
               records_by_owner[owner] << record
             end
           end

data/lib/composite_primary_keys/base.rb

@@ -124,6 +124,12 @@ module ActiveRecord
       def can_change_primary_key_values?
         false
       end
+
+      # Returns this record's primary keys values in an Array or nil if
+      # the record is not persisted? or has just been destroyed.
+      def to_key
+        ids.to_a if persisted? && !ids.compact.empty? # XXX Maybe use primary_keys with send instead of ids
+      end
     end
   end
 end

data/lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb

@@ -0,0 +1,88 @@
+module ActiveRecord
+  class Base
+    def self.load_cpk_adapter(adapter)
+      if adapter.to_s == 'postgresql'
+        require "composite_primary_keys/connection_adapters/#{adapter}_adapter.rb"
+      end
+    end
+
+    def self.establish_connection(spec = nil)
+      case spec
+        when nil
+          raise AdapterNotSpecified unless defined?(Rails.env)
+          establish_connection(Rails.env)
+        when ConnectionSpecification
+          self.connection_handler.establish_connection(name, spec)
+        when Symbol, String
+          if configuration = configurations[spec.to_s]
+            establish_connection(configuration)
+          else
+            raise AdapterNotSpecified, "#{spec} database is not configured"
+          end
+        else
+          spec = spec.symbolize_keys
+          unless spec.key?(:adapter) then raise AdapterNotSpecified, "database configuration does not specify adapter" end
+
+          begin
+            require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
+          rescue LoadError => e
+            raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{e})"
+          end
+
+          # CPK
+          load_cpk_adapter(spec[:adapter])
+
+          adapter_method = "#{spec[:adapter]}_connection"
+          unless respond_to?(adapter_method)
+            raise AdapterNotFound, "database configuration specifies nonexistent #{spec[:adapter]} adapter"
+          end
+
+          remove_connection
+          establish_connection(ConnectionSpecification.new(spec, adapter_method))
+      end
+    end
+
+    class << self
+      # Returns the connection currently associated with the class. This can
+      # also be used to "borrow" the connection to do database work unrelated
+      # to any of the specific Active Records.
+      def connection
+        retrieve_connection
+      end
+
+      # Returns the configuration of the associated connection as a hash:
+      #
+      #  ActiveRecord::Base.connection_config
+      #  # => {:pool=>5, :timeout=>5000, :database=>"db/development.sqlite3", :adapter=>"sqlite3"}
+      #
+      # Please use only for reading.
+      def connection_config
+        connection_pool.spec.config
+      end
+
+      def connection_pool
+        connection_handler.retrieve_connection_pool(self)
+      end
+
+      def retrieve_connection
+        connection_handler.retrieve_connection(self)
+      end
+
+      # Returns true if Active Record is connected.
+      def connected?
+        connection_handler.connected?(self)
+      end
+
+      def remove_connection(klass = self)
+        connection_handler.remove_connection(klass)
+      end
+
+      def clear_active_connections!
+        connection_handler.clear_active_connections!
+      end
+
+      delegate :clear_reloadable_connections!,
+        :clear_all_connections!,:verify_active_connections!, :to => :connection_handler
+    end
+  end
+end

data/lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb

@@ -8,6 +8,8 @@ module ActiveRecord
         pk ||= primary_key(table)
 
         if pk
+          # CPK
+          # select_value("#{sql} RETURNING #{quote_column_name(pk)}")
           select_value("#{sql} RETURNING #{quote_column_names(pk)}")
         else
           super
@@ -22,10 +24,12 @@ module ActiveRecord
           pk = primary_key(table)
         end
 
+        # CPK
+        # sql = "#{sql} RETURNING #{quote_column_name(pk)}" if pk
         sql = "#{sql} RETURNING #{quote_column_names(pk)}" if pk
 
         [sql, binds]
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/persistence.rb

@@ -1,13 +1,15 @@
 module ActiveRecord
   module Persistence
     def destroy
-      if persisted?
-        ::ActiveRecord::IdentityMap.remove(self) if ::ActiveRecord::IdentityMap.enabled?
+      destroy_associations
 
+      if persisted?
+        IdentityMap.remove(self) if IdentityMap.enabled?
         # CPK
         #pk         = self.class.primary_key
         #column     = self.class.columns_hash[pk]
         #substitute = connection.substitute_at(column, 0)
+
         primary_keys = Array(self.class.primary_key)
         bind_values = Array.new
         eq_predicates = Array.new
@@ -20,10 +22,12 @@ module ActiveRecord
         predicate = Arel::Nodes::And.new(eq_predicates)
         relation = self.class.unscoped.where(predicate)
 
+        #relation = self.class.unscoped.where(
+        #  self.class.arel_table[pk].eq(substitute))
+
         # CPK
         #relation.bind_values = [[column, id]]
         relation.bind_values = bind_values
-
         relation.delete_all
       end
 

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta3'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta4'].join('.')
   end
 end

data/tasks/databases/mysql.rake

@@ -1,3 +1,4 @@
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 namespace :mysql do

data/tasks/databases/oracle.rake

@@ -1,3 +1,4 @@
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 namespace :oracle do

data/tasks/databases/postgresql.rake

@@ -1,3 +1,4 @@
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 namespace :postgresql do

data/tasks/databases/sqlite3.rake

@@ -1,3 +1,4 @@
+require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
 require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
 namespace :sqlite3 do

data/test/abstract_unit.rb

@@ -1,7 +1,4 @@
-dir = File.dirname(__FILE__)
-PROJECT_ROOT = File.expand_path(File.join(dir, '..'))
-
-adapter = ENV["ADAPTER"] || "postgresql"
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 require "pp"
 require "test/unit"
@@ -11,18 +8,22 @@ require "hash_tricks"
 #require 'composite_primary_keys'
 require File.join(PROJECT_ROOT, "lib", "composite_primary_keys")
 
+# Now load the connection spec
 require File.join(PROJECT_ROOT, "test", "connections", "connection_spec")
+config = CompositePrimaryKeys::ConnectionSpec.config
+spec = config[config.keys.first]
+
+# And now connect to the database
+adapter = spec['adapter']
 require File.join(PROJECT_ROOT, "test", "connections", "native_#{adapter}", "connection")
 
+# Tell active record about the configuration
+ActiveRecord::Base.configurations[:test] = spec
 
 # Tell ActiveRecord where to find models
 ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
 
-QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type') unless Object.const_defined?(:QUOTED_TYPE)
-
-ActiveRecord::Base.configurations[:test] = SPEC
-
-class ActiveSupport::TestCase #:nodoc:
+class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
   
   self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
@@ -98,4 +99,3 @@ ActiveRecord::Base.connection.class.class_eval do
 end
 
 ActiveRecord::Base.logger = Logger.new(STDOUT)
-#ActiveRecord::Base.colorize_logging = false

data/test/connections/databases.example.yml

@@ -1,3 +1,7 @@
+# To run tests:
+#  1. Copy this file to databases.yml
+#  2. Delete all the specs except one
+
 mysql:
   adapter: mysql
   username: root

data/test/connections/databases.yml

@@ -1,12 +1,3 @@
-mysql:
-  adapter: mysql
-  username: root
-  database: composite_primary_keys_unittest
-
-sqlite3:
-  adapter: sqlite3
-  database: db/composite_primary_keys_unittest.sqlite3
-
 postgresql:
   adapter: postgresql
   database: composite_primary_keys_unittest

data/test/connections/native_ibm_db/connection.rb

@@ -5,7 +5,6 @@ require 'IBM_DB'
 
 RAILS_CONNECTION_ADAPTERS = %w( mysql postgresql sqlite firebird sqlserver db2 oracle sybase openbase frontbase ibm_db )
 
-
 db1 = 'composite_primary_keys_unittest'
 
 connection_options = {
@@ -17,4 +16,4 @@ connection_options = {
 }
 
 ActiveRecord::Base.configurations = { db1 => connection_options }
-ActiveRecord::Base.establish_connection(connection_options)
+ActiveRecord::Base.establish_connection(connection_options)

data/test/connections/native_mysql/connection.rb

@@ -1,7 +1,5 @@
 print "Using native MySQL\n"
 
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-
 def connection_string
   options = {}
   options['u'] = SPEC['username']  if SPEC['username']
@@ -10,6 +8,6 @@ def connection_string
   options.map { |key, value| "-#{key}#{value}" }.join(" ")
 end
 
-  # Adapter config setup in locals/database_connections.rb
-SPEC = CompositePrimaryKeys::ConnectionSpec[:mysql]
+# Adapter config setup in text/connections/databases.yml
+SPEC = CompositePrimaryKeys::ConnectionSpec['mysql']
 ActiveRecord::Base.establish_connection(SPEC)

data/test/connections/native_oracle/connection.rb

@@ -7,5 +7,5 @@ def connection_string
 end
 
 # Adapter config setup in locals/database_connections.rb
-SPEC = CompositePrimaryKeys::ConnectionSpec[:oracle]
+SPEC = CompositePrimaryKeys::ConnectionSpec['oracle']
 ActiveRecord::Base.establish_connection(SPEC)

data/test/connections/native_postgresql/connection.rb

@@ -1,9 +1,5 @@
 print "Using native Postgresql\n"
 
-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')
-
 def connection_string
   options = Hash.new
   options['U'] = SPEC['username']  if SPEC['username']
@@ -12,5 +8,6 @@ def connection_string
   options.map { |key, value| "-#{key} #{value}" }.join(" ")
 end
 
-SPEC = CompositePrimaryKeys::ConnectionSpec[:postgresql]
-ActiveRecord::Base.establish_connection(SPEC)
+# Adapter config setup in text/connections/databases.yml
+SPEC = CompositePrimaryKeys::ConnectionSpec['postgresql']
+ActiveRecord::Base.establish_connection(SPEC)

data/test/connections/native_sqlite/connection.rb

@@ -1,11 +1,9 @@
 print "Using native Sqlite3\n"
 
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
 def connection_string
   SPEC['database']
 end
 
-SPEC = CompositePrimaryKeys::ConnectionSpec[:sqlite3]
+# Adapter config setup in text/connections/databases.yml
+SPEC = CompositePrimaryKeys::ConnectionSpec['sqlite3']
 ActiveRecord::Base.establish_connection(SPEC)

data/test/test_attribute_methods.rb

@@ -2,7 +2,7 @@ require 'abstract_unit'
 
 class TestAttributeMethods < ActiveSupport::TestCase
   fixtures :reference_types
-  
+
   def test_read_attribute_with_single_key
     rt = ReferenceType.find(1)
     assert_equal(1, rt.reference_type_id)
@@ -11,9 +11,45 @@ class TestAttributeMethods < ActiveSupport::TestCase
   end
 
   def test_read_attribute_with_composite_keys
-    ref_code = ReferenceCode.find(1,1)
+    ref_code = ReferenceCode.find(1, 1)
     assert_equal(1, ref_code.id.first)
     assert_equal(1, ref_code.id.last)
     assert_equal('Mr', ref_code.abbreviation)
   end
+
+  # to_key returns array even for single key
+  def test_to_key_with_single_key
+    rt = ReferenceType.find(1)
+    assert_equal([1], rt.to_key)
+  end
+
+  def test_to_key_with_composite_keys
+    ref_code = ReferenceCode.find(1, 1)
+    assert_equal(1, ref_code.to_key.first)
+    assert_equal(1, ref_code.to_key.last)
+  end
+
+  def test_to_key_with_single_key_unsaved
+    rt = ReferenceType.new
+    assert_nil(rt.to_key)
+  end
+
+  def test_to_key_with_composite_keys_unsaved
+    ref_code = ReferenceCode.new
+    assert_nil(ref_code.to_key)
+  end
+
+  def test_to_key_with_single_key_destroyed
+    rt = ReferenceType.find(1)
+    rt.destroy
+    assert_nil(rt.to_key)
+  end
+
+  def test_to_key_with_composite_key_destroyed
+    ref_code = ReferenceCode.find(1, 1)
+    ref_code.destroy
+    assert_nil(ref_code.to_key)
+  end
+
+
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 62196261
+  hash: 62196267
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - beta
-  - 3
-  version: 4.0.0.beta3
+  - 4
+  version: 4.0.0.beta4
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 Z
+date: 2011-07-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -71,6 +71,7 @@ files:
 - lib/composite_primary_keys/base.rb
 - lib/composite_primary_keys/composite_arrays.rb
 - lib/composite_primary_keys/composite_predicates.rb
+- lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
 - lib/composite_primary_keys/dirty.rb
@@ -221,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord