composite_primary_keys 9.0.4 → 9.0.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 9.0.4
+  version: 9.0.5
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -92,6 +92,7 @@ files:
 - Rakefile
 - lib/composite_primary_keys.rb
 - lib/composite_primary_keys/arel/in.rb
+- lib/composite_primary_keys/arel/sqlserver.rb
 - lib/composite_primary_keys/arel/to_sql.rb
 - lib/composite_primary_keys/associations/association.rb
 - lib/composite_primary_keys/associations/association_scope.rb
@@ -102,7 +103,6 @@ files:
 - lib/composite_primary_keys/associations/join_dependency/join_association.rb
 - lib/composite_primary_keys/associations/preloader/association.rb
 - lib/composite_primary_keys/associations/preloader/belongs_to.rb
-- lib/composite_primary_keys/associations/singular_association.rb
 - lib/composite_primary_keys/attribute_methods.rb
 - lib/composite_primary_keys/attribute_methods/primary_key.rb
 - lib/composite_primary_keys/attribute_methods/read.rb
@@ -112,12 +112,10 @@ files:
 - lib/composite_primary_keys/composite_arrays.rb
 - lib/composite_primary_keys/composite_predicates.rb
 - lib/composite_primary_keys/composite_relation.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/connection_adapters/abstract_mysql_adapter.rb
 - lib/composite_primary_keys/connection_adapters/sqlserver_adapter.rb
 - lib/composite_primary_keys/core.rb
-- lib/composite_primary_keys/dirty.rb
 - lib/composite_primary_keys/fixtures.rb
 - lib/composite_primary_keys/locking/optimistic.rb
 - lib/composite_primary_keys/nested_attributes.rb
@@ -130,16 +128,14 @@ files:
 - lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/relation/where_clause.rb
 - lib/composite_primary_keys/sanitization.rb
-- lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
 - scripts/console.rb
 - scripts/txt2html
 - scripts/txt2js
 - tasks/databases/mysql.rake
 - tasks/databases/oracle.rake
-- tasks/databases/oracle_enhanced.rake
 - tasks/databases/postgresql.rake
-- tasks/databases/sqlite3.rake
+- tasks/databases/sqlite.rake
 - tasks/databases/sqlserver.rake
 - tasks/website.rake
 - test/README_tests.rdoc
@@ -148,13 +144,6 @@ files:
 - test/connections/databases.ci.yml
 - test/connections/databases.example.yml
 - test/connections/databases.yml
-- test/connections/native_ibm_db/connection.rb
-- test/connections/native_mysql/connection.rb
-- test/connections/native_oracle/connection.rb
-- test/connections/native_oracle_enhanced/connection.rb
-- test/connections/native_postgresql/connection.rb
-- test/connections/native_sqlite3/connection.rb
-- test/connections/native_sqlserver/connection.rb
 - test/db_test.rb
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
@@ -169,7 +158,6 @@ files:
 - test/fixtures/db_definitions/oracle.sql
 - test/fixtures/db_definitions/postgresql.sql
 - test/fixtures/db_definitions/sqlite.sql
-- test/fixtures/db_definitions/sqlserver.drop.sql
 - test/fixtures/db_definitions/sqlserver.sql
 - test/fixtures/department.rb
 - test/fixtures/departments.yml
@@ -185,6 +173,8 @@ files:
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
 - test/fixtures/memberships.yml
+- test/fixtures/pk_called_id.rb
+- test/fixtures/pk_called_ids.yml
 - test/fixtures/product.rb
 - test/fixtures/product_tariff.rb
 - test/fixtures/product_tariffs.yml
@@ -239,7 +229,6 @@ files:
 - test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
-- test/test_delete_all.rb
 - test/test_dumpable.rb
 - test/test_dup.rb
 - test/test_enum.rb
@@ -254,6 +243,7 @@ files:
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb
+- test/test_preload.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
 - test/test_suite.rb
@@ -281,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
@@ -300,7 +290,6 @@ test_files:
 - test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
-- test/test_delete_all.rb
 - test/test_dumpable.rb
 - test/test_dup.rb
 - test/test_enum.rb
@@ -315,6 +304,7 @@ test_files:
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb
+- test/test_preload.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
 - test/test_suite.rb

data/lib/composite_primary_keys/associations/singular_association.rb

@@ -1,14 +0,0 @@
-module CompositePrimaryKeys
-  module SingularAssociation
-    def get_records
-      cpk_applies = (target && target.composite?) ||
-        (owner && owner.composite?) ||
-        (options[:primary_key] && options[:primary_key].kind_of?(Array)) ||
-        (options[:foreign_key] && options[:foreign_key].kind_of?(Array))
-      return scope.limit(1).to_a if cpk_applies
-      super
-    end
-  end
-end
-
-ActiveRecord::Associations::SingularAssociation.prepend CompositePrimaryKeys::SingularAssociation

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

@@ -1,71 +0,0 @@
-module ActiveRecord
-  class Base
-    def self.load_cpk_adapter(adapter)
-      if adapter.to_s =~ /postgresql/ || adapter.to_s =~ /postgis/
-        require "composite_primary_keys/connection_adapters/postgresql_adapter.rb"
-      end
-      if adapter.to_s =~ /sqlserver/
-        require "composite_primary_keys/connection_adapters/sqlserver_adapter.rb"
-      end
-    end
-
-    def self.establish_connection(spec = nil)
-      spec     ||= ActiveRecord::ConnectionHandling::DEFAULT_ENV.call.to_sym
-      resolver =   ConnectionAdapters::ConnectionSpecification::Resolver.new configurations
-      spec     =   resolver.spec(spec, self == Base ? "primary" : name)
-      self.connection_specification_name = spec.name
-
-      # CPK
-      load_cpk_adapter(spec.config[:adapter])
-
-      unless respond_to?(spec.adapter_method)
-        raise AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"
-      end
-
-      remove_connection
-      connection_handler.establish_connection spec
-    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(connection_specification_name)
-      end
-
-      def retrieve_connection
-        connection_handler.retrieve_connection(connection_specification_name)
-      end
-
-      # Returns true if Active Record is connected.
-      def connected?
-        connection_handler.connected?(connection_specification_name)
-      end
-
-      def remove_connection(id = connection_specification_name)
-        connection_handler.remove_connection(id)
-      end
-
-      def clear_active_connections!
-        connection_handler.clear_active_connections!
-      end
-
-      delegate :clear_reloadable_connections!, :clear_all_connections!, :to => :connection_handler
-    end
-  end
-end

data/lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb

@@ -1,50 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    class PostgreSQLAdapter
-      def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
-        unless pk
-          # Extract the table from the insert sql. Yuck.
-          table_ref = extract_table_ref_from_insert_sql(sql)
-          pk = primary_key(table_ref) if table_ref
-        end
-
-        if pk && use_insert_returning?
-          # CPK
-          # select_value("#{sql} RETURNING #{quote_column_names(pk)}")
-          select_value("#{sql} RETURNING #{quote_column_names(pk)}")
-        elsif pk
-          super
-          last_insert_id_value(sequence_name || default_sequence_name(table_ref, pk))
-        else
-          super
-        end
-      end
-      alias :create :insert
-
-      def sql_for_insert(sql, pk, id_value, sequence_name, binds)
-        unless pk
-          # Extract the table from the insert sql. Yuck.
-          table_ref = extract_table_ref_from_insert_sql(sql)
-          pk = primary_key(table_ref) if table_ref
-        end
-
-        if pk && use_insert_returning?
-          # CPK
-          # sql = "#{sql} RETURNING #{quote_column_names(pk)}"
-          sql = "#{sql} RETURNING #{quote_column_names(pk)}"
-        end
-
-        [sql, binds]
-      end
-
-      # Returns a single value if query returns a single element
-      # otherwise returns an array corresponding to the composite keys
-      def last_inserted_id(result)
-        row = result && result.rows.first
-        if Array === row
-          row.size == 1 ? row[0] : row
-        end
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/dirty.rb

@@ -1,19 +0,0 @@
-module ActiveModel
-  module Dirty
-    def can_change_primary_key?
-      true
-    end
-
-    def primary_key_changed?
-      !!changed.detect { |key| ids_hash.keys.include?(key.to_s) }
-    end
-
-    def primary_key_was
-      ids_hash.keys.inject(Hash.new) do |result, attribute_name|
-        result[attribute_name] = attribute_was(attribute_name.to_s)
-        result
-      end
-    end
-    alias_method :ids_hash_was, :primary_key_was
-  end
-end

data/lib/composite_primary_keys/validations/uniqueness.rb

@@ -1,41 +0,0 @@
-module ActiveRecord
-  module Validations
-    # class UniquenessValidator
-    #   def validate_each(record, attribute, value)
-    #     finder_class = find_finder_class_for(record)
-    #     table = finder_class.arel_table
-    #     value = map_enum_attribute(finder_class, attribute, value)
-    #
-    #     begin
-    #       relation = build_relation(finder_class, table, attribute, value)
-    #       # CPK
-    #       # relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id)) if record.persisted?
-    #       if record.persisted?
-    #         not_eq_conditions = Array(finder_class.primary_key).zip(Array(record.send(:id))).map do |name, value|
-    #           table[name.to_sym].not_eq(value)
-    #         end
-    #
-    #         condition = not_eq_conditions.shift
-    #         not_eq_conditions.each do |not_eq_condition|
-    #           condition = condition.or(not_eq_condition)
-    #         end
-    #         relation = relation.and(condition)
-    #       end
-    #       # End CPK
-    #       relation = scope_relation(record, table, relation)
-    #       relation = finder_class.unscoped.where(relation)
-    #       relation = relation.merge(options[:conditions]) if options[:conditions]
-    #     rescue RangeError
-    #       relation = finder_class.none
-    #     end
-    #
-    #     if relation.exists?
-    #       error_options = options.except(:case_sensitive, :scope, :conditions)
-    #       error_options[:value] = value
-    #
-    #       record.errors.add(attribute, :taken, error_options)
-    #     end
-    #   end
-    # end
-  end
-end

data/tasks/databases/oracle_enhanced.rake

@@ -1,27 +0,0 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
-namespace :oracle_enhanced do
-  desc 'Build the Oracle test database'
-  task :build_database => :load_connection do
-    options_str = connection_string
-
-    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
-    sh %( sqlplus #{options_str} < #{sql} )
-  end
-
-  desc 'Drop the Oracle test database'
-  task :drop_database => :load_connection do
-    options_str = connection_string
-
-    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
-    sh %( sqlplus #{options_str} < #{sql} )
-  end
-
-  desc 'Rebuild the Oracle test database'
-  task :rebuild_database => [:drop_database, :build_database]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_oracle_enhanced", "connection")
-  end
-end

data/tasks/databases/sqlite3.rake

@@ -1,27 +0,0 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
-namespace :sqlite3 do
-  desc 'Build the sqlite test database'
-  task :build_database => :load_connection do
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlite.sql')
-    dbfile = File.join(PROJECT_ROOT, connection_string)
-    FileUtils.mkdir_p(File.dirname(dbfile))
-    cmd = "sqlite3 #{dbfile} < #{schema}"
-    puts cmd
-    sh %{ #{cmd} }
-  end
-
-  desc 'Drop the sqlite test database'
-  task :drop_database => :load_connection do 
-    dbfile = connection_string
-    sh %{ rm -f #{dbfile} }
-  end
-
-  desc 'Rebuild the sqlite test database'
-  task :rebuild_database => [:drop_database, :build_database]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlite3", "connection")
-  end
-end

data/test/connections/native_ibm_db/connection.rb

@@ -1,19 +0,0 @@
-print "Using IBM2 \n"
-
-gem 'ibm_db'
-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 = {
-  :adapter  => "ibm_db",
-  :database => "ocdpdev",
-  :username => "db2inst1",
-  :password => "password",                      
-  :host => '192.168.2.21'
-}
-
-ActiveRecord::Base.configurations = { db1 => connection_options }
-ActiveRecord::Base.establish_connection(connection_options)

data/test/connections/native_mysql/connection.rb

@@ -1,17 +0,0 @@
-print "Using native MySQL\n"
-
-def connection_string
-  options = {}
-  options['u'] = SPEC['username']  if SPEC['username']
-  options['p'] = SPEC['password']  if SPEC['password']
-  options['S'] = SPEC['sock']      if SPEC['sock']
-  options.map { |key, value| "-#{key}#{value}" }.join(" ")
-end
-
-# Adapter config setup in test/connections/databases.yml
-SPEC = CompositePrimaryKeys::ConnectionSpec['mysql']
-
-def establish_connection
-  ActiveRecord::Base.establish_connection(SPEC)
-end
-establish_connection