composite_primary_keys 5.0.8 → 5.0.9

data/History.rdoc

@@ -1,3 +1,13 @@
+== 5.0.9 2012-09-29
+* Enable tests for MS SQL Servder (Enderson Maia)
+* Update ActiveRecord::Base#initialize_dup override in line with ActiveRecord::Base 3.2.5+ (Lucas Maxwell)
+* Require postgresql_adapter.rb also when using activerecord-postgis-adapter (Torsti Schulz)
+* Make cpk_in_predicate build a simple IN when possible (Tom Hughes)
+* Fixed problem loading jdbcpostgresql adapter (Troy Caldwell)
+* Add support for counter cache (Charlie Savage)
+* Fix recreating postgresql database (Charlie Savage)
+* Update dependency to ActiveRecord 3.2.8 or higher (Charlie Savage)
+
 == 5.0.8 2012-07-01
 * Enabled tests for MS SQL Server (Enderson Maia)
 * Update establish_connection to work with Rails 3.2.6 (Ivan Schneider)

data/lib/composite_primary_keys.rb

@@ -26,11 +26,12 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~> 3.2.0'
+  gem 'activerecord', '>= 3.2.8', '~> 3.2.0'
   require 'active_record'
 end
 
 # AR files we override
+require 'active_record/counter_cache'
 require 'active_record/fixtures'
 require 'active_record/persistence'
 require 'active_record/relation'
@@ -66,6 +67,7 @@ require 'active_record/validations/uniqueness'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/composite_arrays'
 require 'composite_primary_keys/composite_predicates'
+require 'composite_primary_keys/counter_cache'
 require 'composite_primary_keys/fixtures'
 require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/relation'

data/lib/composite_primary_keys/base.rb

@@ -59,6 +59,7 @@ module ActiveRecord
 
     def initialize_dup(other)
       cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
+      self.class.initialize_attributes(cloned_attributes, :serialized => false)
       # CPK
       # cloned_attributes.delete(self.class.primary_key)
       Array(self.class.primary_key).each {|key| cloned_attributes.delete(key.to_s)}
@@ -148,7 +149,7 @@ module ActiveRecord
       def to_key
         ids.to_a if !ids.compact.empty? # XXX Maybe use primary_keys with send instead of ids
       end
-      
+
       def to_param
         persisted? ? to_key.join(CompositePrimaryKeys::ID_SEP) : nil
       end

data/lib/composite_primary_keys/composite_predicates.rb

@@ -49,14 +49,19 @@ module CompositePrimaryKeys
     end
 
     def cpk_in_predicate(table, primary_keys, ids)
-      and_predicates = ids.map do |id_set|
-        eq_predicates = Array(primary_keys).zip(Array(id_set)).map do |primary_key, value|
-          table[primary_key].eq(value)
+      primary_keys = Array(primary_keys)
+      if primary_keys.length > 1
+        and_predicates = ids.map do |id_set|
+          eq_predicates = Array(primary_keys).zip(Array(id_set)).map do |primary_key, value|
+            table[primary_key].eq(value)
+          end
+          cpk_and_predicate(eq_predicates)
         end
-        cpk_and_predicate(eq_predicates)
-      end
 
-      cpk_or_predicate(and_predicates, table)
+        cpk_or_predicate(and_predicates, table)
+      else
+        table[primary_keys.first].in(ids.flatten)
+      end
     end
   end
 end
@@ -65,4 +70,4 @@ ActiveRecord::Associations::AssociationScope.send(:include, CompositePrimaryKeys
 ActiveRecord::Associations::HasAndBelongsToManyAssociation.send(:include, CompositePrimaryKeys::Predicates)
 ActiveRecord::Associations::JoinDependency::JoinAssociation.send(:include, CompositePrimaryKeys::Predicates)
 ActiveRecord::Associations::Preloader::Association.send(:include, CompositePrimaryKeys::Predicates)
-ActiveRecord::Relation.send(:include, CompositePrimaryKeys::Predicates)
+ActiveRecord::Relation.send(:include, CompositePrimaryKeys::Predicates)

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

@@ -1,8 +1,8 @@
 module ActiveRecord
   class Base
     def self.load_cpk_adapter(adapter)
-      if adapter.to_s == 'postgresql'
-        require "composite_primary_keys/connection_adapters/#{adapter}_adapter.rb"
+      if (adapter.to_s =~ /postgresql/) or (adapter.to_s =~ /postgis/)
+        require "composite_primary_keys/connection_adapters/postgresql_adapter.rb"
       end
     end
     

data/lib/composite_primary_keys/counter_cache.rb

@@ -0,0 +1,22 @@
+module ActiveRecord
+  module CounterCache
+    def update_counters(id, counters)
+      updates = counters.map do |counter_name, value|
+        operator = value < 0 ? '-' : '+'
+        quoted_column = connection.quote_column_name(counter_name)
+        "#{quoted_column} = COALESCE(#{quoted_column}, 0) #{operator} #{value.abs}"
+      end
+
+      IdentityMap.remove_by_id(symbolized_base_class, id) if IdentityMap.enabled?
+
+      # CPK
+      # update_all(updates.join(', '), primary_key => id )
+      primary_key_predicate = relation.cpk_id_predicate(self.arel_table, Array(self.primary_key), Array(id))
+      update_all(updates.join(', '), primary_key_predicate)
+    end
+
+    def decrement_counter(counter_name, id)
+      update_counters(id, counter_name => -1)
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases/postgresql.rake

@@ -15,6 +15,10 @@ namespace :postgresql do
 
   desc 'Build the PostgreSQL test database'
   task :build_database => [:create_database] do
+    ActiveRecord::Base.clear_all_connections!
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
+    connection = ActiveRecord::Base.establish_connection(spec)
+
     path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
     sql = File.open(path, 'rb') do |file|
       file.read

data/test/fixtures/membership_statuses.yml

@@ -3,6 +3,7 @@ santiago-cpk:
   user_id: 1
   group_id: 1
   status: Active
+
 drnic-cpk:
   id: 2
   user_id: 2

data/test/fixtures/memberships.yml

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

data/test/fixtures/streets.yml

@@ -3,11 +3,13 @@ first:
   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

data/test/fixtures/suburbs.yml

@@ -2,10 +2,12 @@ first:
   city_id: 1
   suburb_id: 1
   name: First Suburb
+
 second:
   city_id: 2
   suburb_id: 1
   name: Second Suburb
+
 no_mcdonalds:
   city_id: 1
   suburb_id: 2

data/test/test_counter_cache.rb

@@ -0,0 +1,31 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCalculations < ActiveSupport::TestCase
+  fixtures :tariffs
+
+  def test_update_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.update_counters(tariff.id, :amount => 1)
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_increment_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.increment_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_decrement_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.decrement_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(49, tariff.amount)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 5.0.8
+  version: 5.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,13 +10,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.8
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
@@ -25,6 +28,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.8
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
@@ -60,6 +66,7 @@ files:
 - 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/counter_cache.rb
 - lib/composite_primary_keys/dirty.rb
 - lib/composite_primary_keys/fixtures.rb
 - lib/composite_primary_keys/persistence.rb
@@ -165,6 +172,7 @@ files:
 - test/test_attribute_methods.rb
 - test/test_calculations.rb
 - test/test_composite_arrays.rb
+- test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
 - test/test_dup.rb
@@ -202,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord
@@ -217,6 +225,7 @@ test_files:
 - test/test_attribute_methods.rb
 - test/test_calculations.rb
 - test/test_composite_arrays.rb
+- test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
 - test/test_dup.rb