composite_primary_keys 9.0.0.beta1 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e62c2248e714242837c9bd00862bd0411c02f00
-  data.tar.gz: 587c5f4beabb743d14fd3d7febb134d2fdfa3ab5
+  metadata.gz: 407e2b2f6781c2f4dbc7e34e576942f3833dbb98
+  data.tar.gz: 189eb2e8ac24f2124288a15189fbab23d119bba5
 SHA512:
-  metadata.gz: 82894133f71054b13e6fa8293e968fff35732cddd7b7856749d9b67b40a81798130f66974acb6561e137899feb591119cab35657b4b98eaf892a12a938dd5ccf
-  data.tar.gz: d5605252ae0c73bef65b92993562032808e86d6ba192eda0e8c5f12681d9465679ab947b2a76b8a93e8423ef1ae673ce0611f66275d16611e7af9ceb4c8de03e
+  metadata.gz: 024d036a68642775e0763f05962303e5f4b4ccb5b60942820daa9e46fb82f16eb6f7bcd0bfe61bdcb383ebcfac2e3d74805c2e75184fdc488e8a20cef8cadab1
+  data.tar.gz: 5ce0de500d3c796b374716dcbe4a356930a3537490f6e6e26eecd59bce02bf0626abfc1e19c6b536736d06d689121881ed08cb47aa0a5e8eaf802f8d6ab18c26

data/History.rdoc

@@ -1,5 +1,8 @@
-== 9.0.0.beta1 (2015-08-04)
-* Rails 5 support (Sammy Larbi)
+== 9.0.0 (2016-07-06)
+* Support connection_specification_name in rails5.0.0.rc1 (pocari)
+
+== 9.0.0.beta1 (2016-04-16)
+* Rails 5 beta support (Sammy Larbi)
 
 == 8.1.3 (2016-04-16)
 

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

@@ -12,7 +12,8 @@ module ActiveRecord
     def self.establish_connection(spec = nil)
       spec     ||= ActiveRecord::ConnectionHandling::DEFAULT_ENV.call.to_sym
       resolver =   ConnectionAdapters::ConnectionSpecification::Resolver.new configurations
-      spec     =   resolver.spec(spec)
+      spec     =   resolver.spec(spec, self == Base ? "primary" : name)
+      self.connection_specification_name = spec.name
 
       # CPK
       load_cpk_adapter(spec.config[:adapter])
@@ -22,7 +23,7 @@ module ActiveRecord
       end
 
       remove_connection
-      connection_handler.establish_connection self, spec
+      connection_handler.establish_connection spec
     end
 
     class << self
@@ -44,20 +45,20 @@ module ActiveRecord
       end
 
       def connection_pool
-        connection_handler.retrieve_connection_pool(self)
+        connection_handler.retrieve_connection_pool(connection_specification_name)
       end
 
       def retrieve_connection
-        connection_handler.retrieve_connection(self)
+        connection_handler.retrieve_connection(connection_specification_name)
       end
 
       # Returns true if Active Record is connected.
       def connected?
-        connection_handler.connected?(self)
+        connection_handler.connected?(connection_specification_name)
       end
 
-      def remove_connection(klass = self)
-        connection_handler.remove_connection(klass)
+      def remove_connection(id = connection_specification_name)
+        connection_handler.remove_connection(id)
       end
 
       def clear_active_connections!

data/lib/composite_primary_keys/relation/batches.rb

@@ -1,14 +1,14 @@
 module CompositePrimaryKeys
   module ActiveRecord
     module Batches
-      def in_batches(of: 1000, start: nil, finish: nil, load: false)
+      def in_batches(of: 1000, start: nil, finish: nil, load: false, error_on_ignore: nil)
         relation = self
         unless block_given?
           return BatchEnumerator.new(of: of, start: start, finish: finish, relation: self)
         end
 
-        if logger && (arel.orders.present? || arel.taken.present?)
-          logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
+        if arel.orders.present? || arel.taken.present?
+          act_on_order_or_limit_ignored(error_on_ignore)
         end
 
         relation = relation.reorder(batch_order).limit(of)

data/lib/composite_primary_keys/version.rb

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

data/test/test_habtm.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestHabtm < ActiveSupport::TestCase
-  fixtures :suburbs, :restaurants, :restaurants_suburbs, :products
+  fixtures :suburbs, :restaurants, :restaurants_suburbs, :products, :groups, :employees
 
   def test_no_cpk
     # This test makes sure we don't break anything in standard rails by using CPK

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta1
+  version: 9.0.0
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-16 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -274,9 +274,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1