composite_primary_keys 11.3.1 → 12.0.0.rc1

data/test/test_update.rb

@@ -28,7 +28,7 @@ class TestUpdate < ActiveSupport::TestCase
 
   def test_update_attributes
     testing_with do
-      assert(@first.update_attributes(@klass_info[:update]))
+      assert(@first.update(@klass_info[:update]))
       assert(@first.reload)
       @klass_info[:update].each_pair do |attr_name, new_value|
         assert_equal(new_value, @first[attr_name])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 11.3.1
+  version: 12.0.0.rc1
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,9 +112,7 @@ files:
 - lib/composite_primary_keys/composite_relation.rb
 - lib/composite_primary_keys/connection_adapters/abstract/database_statements.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/postgresql/database_statements.rb
-- lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
 - lib/composite_primary_keys/connection_adapters/sqlserver/database_statements.rb
 - lib/composite_primary_keys/core.rb
 - lib/composite_primary_keys/counter_cache.rb
@@ -147,14 +145,13 @@ files:
 - test/connections/databases.ci.yml
 - test/connections/databases.example.yml
 - test/connections/databases.yml
+- test/db_test.rb
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
 - test/fixtures/capitol.rb
 - test/fixtures/capitols.yml
 - test/fixtures/comment.rb
 - test/fixtures/comments.yml
-- test/fixtures/cpk_with_default_value.rb
-- test/fixtures/cpk_with_default_values.yml
 - test/fixtures/db_definitions/db2-create-tables.sql
 - test/fixtures/db_definitions/db2-drop-tables.sql
 - test/fixtures/db_definitions/mysql.sql
@@ -269,16 +266,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
 - test/abstract_unit.rb
+- test/db_test.rb
 - test/README_tests.rdoc
 - test/setup.rb
 - test/test_aliases.rb

data/lib/composite_primary_keys/connection_adapters/abstract_mysql_adapter.rb

@@ -1,20 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractMysqlAdapter
-      def subquery_for(key, select)
-        subselect = select.clone
-        subselect.projections = [key]
-
-        # Materialize subquery by adding distinct
-        # to work with MySQL 5.7.6 which sets optimizer_switch='derived_merge=on'
-        subselect.distinct unless select.limit || select.offset || select.orders.any?
-
-        # CPK
-        #key_name = quote_column_name(key.name)
-        key_name = Array(key).map {|a_key| quote_column_name(a_key.name)}.join(',')
-
-        Arel::SelectManager.new(subselect.as("__active_record_temp")).project(Arel.sql(key_name))
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb

@@ -1,23 +0,0 @@
-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/test/fixtures/cpk_with_default_value.rb

@@ -1,3 +0,0 @@
-class CpkWithDefaultValue < ActiveRecord::Base
-  self.primary_keys = :record_id, :record_version
-end

data/test/fixtures/cpk_with_default_values.yml

@@ -1,7 +0,0 @@
-first:
-  record_id: 1
-  record_version: First
-  
-second:
-  record_id: 1
-  record_version: Second