composite_primary_keys 9.0.6 → 9.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f68e1e5f247cfca5284cf7c4beee35386fefd396
-  data.tar.gz: 0532ee35ef717e91580af50068588e4d4b623809
+  metadata.gz: 935a14ecfff54210eda1de87a8c012555dd8800b
+  data.tar.gz: aeeecd538f8856ca32f969cfade0dd6124164a34
 SHA512:
-  metadata.gz: 5577302f2ee234fcc8511bf83606bfed415973b3c84fcb8d9d5fc1d26b5545c634c1d671f7dbc5aaf82e636a531d17831bf46f4126198c575f8ef436cbc54d99
-  data.tar.gz: 452fa7ead38c8a096ac1c4ed106dd4280e77be768d379860c8b790b9ee26d97c79e87de384d86229c689c88e9209037b6d3d59ec173c555d9620ff4c4def5ba9
+  metadata.gz: a00381d95c99145e0a03e0e51051dfe69e09ac699316cfd9e9d2767103db7fa38ba40e00045d257bae284e1875a3dbcdb70e555c4d964b4f3f84ab6583c8e6ab
+  data.tar.gz: 7eb7dd0107eaa96f8c8adabcd04fe806bf9f40b2aef56469effbd7de01f338f32bed54be8dde25b02cea65364b3c3e3ac38d6f4f4060bdaa12d64c1297d5372b

data/History.rdoc

@@ -1,3 +1,15 @@
+== 9.0.7 (2017-05-22)
+
+* Update sqlite3 to support deletes and updates (Charlie Savage)
+* Specify version for sql server gem so it works with Rails 5.0 (Charlie Savage)
+* Use `datetime` datatype to address Invalid default value for updated_at (Yasuo Honda)
+* Fix ORA-00900 error when it attempts to execute blank statement (pustomytnyk)
+* Override ActiveRecord::Associations::CollectionAssociation#ids_reader (pustomytnyk)
+* Only define #primary_keys if #primary_keys=(value) is called (Charlie Savage)
+* Change `timestamp` to `datetime` for MySQL as ActiveRecord timestamps type does (Oriol Collel)
+* Fix incorrect case statement to get PK for SQLServer (Oriol Collel)
+* Fixes random failures in test_preload_of_polymorphic_association (Boris Peterbarg)
+
 == 9.0.6 (2017-01-08)
 
 * Uncomment tests (Sammy Larbi)

data/lib/composite_primary_keys/arel/sqlserver.rb

@@ -26,9 +26,9 @@ module Arel
               t[name]
             end
           when NilClass
-            [t[column_name]]
-          else
             nil
+          else
+            [t[column_name]]
         end
       end
     end

data/lib/composite_primary_keys/associations/collection_association.rb

@@ -6,6 +6,23 @@ module CompositePrimaryKeys
       super
     end
 
+    def ids_reader
+      if loaded?
+        load_target.map do |record|
+          if reflection.association_primary_key.is_a?(Array)
+            reflection.association_primary_key.map { |key| record.send(key) }
+          else
+            record.send(reflection.association_primary_key)
+          end
+        end
+      else
+        @association_ids ||= (
+        column = "#{reflection.quoted_table_name}.#{reflection.association_primary_key}"
+        scope.pluck(column)
+        )
+      end
+    end
+
     def ids_writer(ids)
       pk_type = reflection.primary_key_type
       ids = Array(ids).reject(&:blank?)

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -18,29 +18,29 @@ module ActiveRecord
         update_counter(-delete_count(method, scope))
       end
 
-        def delete_count(method, scope)
-          if method == :delete_all
-            scope.delete_all
-          else
-            # CPK
-            # scope.update_all(reflection.foreign_key => nil)
-            conds = Array(reflection.foreign_key).inject(Hash.new) do |mem, key|
-              mem[key] = nil
-              mem
-            end
-            scope.update_all(conds)
+      def delete_count(method, scope)
+        if method == :delete_all
+          scope.delete_all
+        else
+          # CPK
+          # scope.update_all(reflection.foreign_key => nil)
+          conds = Array(reflection.foreign_key).inject(Hash.new) do |mem, key|
+            mem[key] = nil
+            mem
           end
+          scope.update_all(conds)
         end
+      end
 
-        def foreign_key_present?
-          if reflection.klass.primary_key
-            # CPK
-            # owner.attribute_present?(reflection.association_primary_key)
-            Array(reflection.klass.primary_key).all? {|key| owner.attribute_present?(key)}
-          else
-            false
-          end
+      def foreign_key_present?
+        if reflection.klass.primary_key
+          # CPK
+          # owner.attribute_present?(reflection.association_primary_key)
+          Array(reflection.klass.primary_key).all? {|key| owner.attribute_present?(key)}
+        else
+          false
         end
       end
     end
+  end
 end

data/lib/composite_primary_keys/base.rb

@@ -7,20 +7,6 @@ module ActiveRecord
     NOT_IMPLEMENTED_YET        = 'Not implemented for composite primary keys yet'
 
     class << self
-      def primary_keys
-        unless defined?(@primary_keys)
-          reset_primary_keys
-        end
-        @primary_keys
-      end
-
-      # Don't like this method name, but its modeled after how AR does it
-      def reset_primary_keys
-        if self != base_class
-          self.primary_keys = base_class.primary_keys
-        end
-      end
-
       alias_method :primary_key_without_composite_key_support=, :primary_key=
       def primary_key=(keys)
         unless keys.kind_of?(Array)
@@ -60,6 +46,20 @@ module ActiveRecord
     end
 
     module CompositeClassMethods
+      def primary_keys
+        unless defined?(@primary_keys)
+          reset_primary_keys
+        end
+        @primary_keys
+      end
+
+      # Don't like this method name, but its modeled after how AR does it
+      def reset_primary_keys
+        if self != base_class
+          self.primary_keys = base_class.primary_keys
+        end
+      end
+
       def primary_key
         primary_keys
       end

data/lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb

@@ -0,0 +1,23 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class SQLite3Adapter
+      def join_to_update(update, select, key)
+        if key.is_a?(::CompositePrimaryKeys::CompositeKeys)
+          subselect = subquery_for(key, select)
+          subselect_aliased = Arel::Nodes::TableAlias.new(subselect, 'cpk_inner')
+          cpk_subselect = Arel::SelectManager.new(subselect_aliased)
+          cpk_subselect.project('*')
+          key.each do |a_key|
+            where_expr = subselect_aliased[a_key.name].eq(update.ast.relation[a_key.name])
+            cpk_subselect.where(where_expr)
+          end
+          where_clause = Arel::Nodes::SqlLiteral.new("EXISTS (#{cpk_subselect.to_sql})")
+          update.where(where_clause)
+        else
+          super
+        end
+      end
+      alias join_to_delete join_to_update
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases/oracle.rake

@@ -14,7 +14,7 @@ namespace :oracle do
     sql = File.read(schema)
 
     sql.split(';').each do |command|
-      ActiveRecord::Base.connection.execute(command)
+      ActiveRecord::Base.connection.execute(command) unless command.blank?
     end
 
     ActiveRecord::Base.clear_all_connections!

data/test/abstract_unit.rb

@@ -18,6 +18,10 @@ puts "Loaded #{spec_name}"
 # And now connect to the database
 ActiveRecord::Base.establish_connection(spec)
 
+if defined?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
+  require 'composite_primary_keys/connection_adapters/sqlite3_adapter'
+end
+
 # Tell active record about the configuration
 ActiveRecord::Base.configurations[:test] = spec
 

data/test/fixtures/db_definitions/mysql.sql

@@ -39,8 +39,8 @@ create table tariffs (
     tariff_id int not null,
     start_date date not null,
     amount integer(11) default null,
-    created_at timestamp,
-    updated_at timestamp,
+    created_at datetime,
+    updated_at datetime,
     primary key (tariff_id, start_date)
 );
 

data/test/fixtures/employees.yml

@@ -1,19 +1,19 @@
-steve:
-  id: 1
-  department_id: 1
-  location_id: 1
-
-jill:
-  id: 2
-  department_id: 1
-  location_id: 1
-
-sarah:
-  id: 3
-  department_id: 2
-  location_id: 1
-
-robert:
-  id: 4
-  department_id: 2
+steve:
+  id: 1
+  department_id: 1
+  location_id: 1
+
+jill:
+  id: 2
+  department_id: 1
+  location_id: 1
+
+sarah:
+  id: 3
+  department_id: 2
+  location_id: 1
+
+robert:
+  id: 4
+  department_id: 2
   location_id: 1

data/test/test_preload.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestPreload < ActiveSupport::TestCase
-  fixtures :comments, :users, :employees, :groups
+  fixtures :comments, :users, :employees, :groups, :hacks
 
   class UserForPreload < User
     has_many :comments_with_include_condition, -> { where('person_type = ?', 'User')},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 9.0.6
+  version: 9.0.7
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-08 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -113,6 +113,7 @@ files:
 - lib/composite_primary_keys/composite_relation.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
 - lib/composite_primary_keys/connection_adapters/abstract_mysql_adapter.rb
+- lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
 - lib/composite_primary_keys/connection_adapters/sqlserver_adapter.rb
 - lib/composite_primary_keys/core.rb
 - lib/composite_primary_keys/fixtures.rb
@@ -270,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord