composite_primary_keys 12.0.4 → 12.0.10

data/lib/composite_primary_keys/relation/predicate_builder/association_query_value.rb

@@ -1,20 +1,20 @@
-module ActiveRecord
-  class PredicateBuilder
-    class AssociationQueryValue
-      def queries
-        # CPK
-        if associated_table.association_join_foreign_key.is_a?(Array)
-          if ids.is_a?(ActiveRecord::Relation)
-            ids.map do |id|
-              associated_table.association_join_foreign_key.zip(id.id).to_h
-            end
-          else
-            [associated_table.association_join_foreign_key.zip(ids).to_h]
-          end
-        else
-          [associated_table.association_join_foreign_key.to_s => ids]
-        end
-      end
-    end
-  end
-end
+module ActiveRecord
+  class PredicateBuilder
+    class AssociationQueryValue
+      def queries
+        # CPK
+        if associated_table.association_join_foreign_key.is_a?(Array)
+          if ids.is_a?(ActiveRecord::Relation)
+            ids.map do |id|
+              associated_table.association_join_foreign_key.zip(id.id).to_h
+            end
+          else
+            [associated_table.association_join_foreign_key.zip(ids).to_h]
+          end
+        else
+          [associated_table.association_join_foreign_key.to_s => ids]
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/relation/query_methods.rb

@@ -1,43 +1,43 @@
-module CompositePrimaryKeys
-  module ActiveRecord
-    module QueryMethods
-      def reverse_sql_order(order_query)
-        if order_query.empty?
-          # CPK
-          # return [arel_attribute(primary_key).desc] if primary_key
-
-          if primary_key
-            # break apart CPKs
-            return primary_key.map do |key|
-              arel_attribute(key).desc
-            end
-          else
-            raise IrreversibleOrderError,
-                  "Relation has no current order and table has no primary key to be used as default order"
-          end
-        end
-
-        order_query.flat_map do |o|
-          order_query.flat_map do |o|
-            case o
-            when Arel::Attribute
-              o.desc
-            when Arel::Nodes::Ordering
-              o.reverse
-            when String
-              if does_not_support_reverse?(o)
-                raise IrreversibleOrderError, "Order #{o.inspect} can not be reversed automatically"
-              end
-              o.split(",").map! do |s|
-                s.strip!
-                s.gsub!(/\sasc\Z/i, " DESC") || s.gsub!(/\sdesc\Z/i, " ASC") || (s << " DESC")
-              end
-            else
-              o
-            end
-          end
-        end
-      end
-    end
-  end
+module CompositePrimaryKeys
+  module ActiveRecord
+    module QueryMethods
+      def reverse_sql_order(order_query)
+        if order_query.empty?
+          # CPK
+          # return [arel_attribute(primary_key).desc] if primary_key
+
+          if primary_key
+            # break apart CPKs
+            return primary_key.map do |key|
+              arel_attribute(key).desc
+            end
+          else
+            raise IrreversibleOrderError,
+                  "Relation has no current order and table has no primary key to be used as default order"
+          end
+        end
+
+        order_query.flat_map do |o|
+          order_query.flat_map do |o|
+            case o
+            when Arel::Attribute
+              o.desc
+            when Arel::Nodes::Ordering
+              o.reverse
+            when String
+              if does_not_support_reverse?(o)
+                raise IrreversibleOrderError, "Order #{o.inspect} can not be reversed automatically"
+              end
+              o.split(",").map! do |s|
+                s.strip!
+                s.gsub!(/\sasc\Z/i, " DESC") || s.gsub!(/\sdesc\Z/i, " ASC") || (s << " DESC")
+              end
+            else
+              o
+            end
+          end
+        end
+      end
+    end
+  end
 end

data/lib/composite_primary_keys/relation/where_clause.rb

@@ -1,24 +1,24 @@
-module ActiveRecord
-  class Relation
-    class WhereClause
-      def to_h(table_name = nil)
-        equalities = equalities(predicates)
-
-        # CPK Adds this line, because ours are coming in with AND->{EQUALITY, EQUALITY}
-        equalities = predicates.grep(Arel::Nodes::And).map(&:children).flatten.grep(Arel::Nodes::Equality) if equalities.empty?
-
-        if table_name
-          equalities = equalities.select do |node|
-            node.left.relation.name == table_name
-          end
-        end
-
-        equalities.map { |node|
-          name = node.left.name.to_s
-          value = extract_node_value(node.right)
-          [name, value]
-        }.to_h
-      end
-    end
-  end
+module ActiveRecord
+  class Relation
+    class WhereClause
+      def to_h(table_name = nil)
+        equalities = equalities(predicates)
+
+        # CPK Adds this line, because ours are coming in with AND->{EQUALITY, EQUALITY}
+        equalities = predicates.grep(Arel::Nodes::And).map(&:children).flatten.grep(Arel::Nodes::Equality) if equalities.empty?
+
+        if table_name
+          equalities = equalities.select do |node|
+            node.left.relation.name == table_name
+          end
+        end
+
+        equalities.map { |node|
+          name = node.left.name.to_s
+          value = extract_node_value(node.right)
+          [name, value]
+        }.to_h
+      end
+    end
+  end
 end

data/lib/composite_primary_keys/version.rb

@@ -1,8 +1,8 @@
-module CompositePrimaryKeys
-  module VERSION
-    MAJOR = 12
-    MINOR = 0
-    TINY  = 4
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end
+module CompositePrimaryKeys
+  module VERSION
+    MAJOR = 12
+    MINOR = 0
+    TINY  = 10
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+end

data/test/abstract_unit.rb

@@ -1,114 +1,114 @@
-spec_name = ENV['ADAPTER'] || 'sqlite'
-require 'bundler'
-require 'minitest/autorun'
-
-Bundler.setup(:default, spec_name.to_sym)
-Bundler.require(:default, spec_name.to_sym)
-require 'composite_primary_keys'
-
-# Require the connection spec
-PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
-spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
-puts "Loaded #{spec_name}"
-
-# And now connect to the database
-ActiveRecord::Base.establish_connection(spec)
-
-# Tell active record about the configuration
-ActiveRecord::Base.configurations = {test: spec}
-
-# Tell ActiveRecord where to find models
-ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
-
-I18n.config.enforce_available_locales = true
-
-class ActiveSupport::TestCase
-  include ActiveRecord::TestFixtures
-
-  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
-  self.use_instantiated_fixtures = false
-  self.use_transactional_tests = true
-  self.test_order = :random
-
-  def assert_date_from_db(expected, actual, message = nil)
-    # SQL Server doesn't have a separate column type just for dates,
-    # so the time is in the string and incorrectly formatted
-    if current_adapter?(:SQLServerAdapter)
-      assert_equal expected.strftime('%Y/%m/%d 00:00:00'), actual.strftime('%Y/%m/%d 00:00:00')
-    elsif current_adapter?(:SybaseAdapter)
-      assert_equal expected.to_s, actual.to_date.to_s, message
-    else
-      assert_equal expected.to_s, actual.to_s, message
-    end
-  end
-
-  def assert_queries(num = 1)
-    ActiveRecord::Base.connection.class.class_eval do
-      self.query_count = 0
-      alias_method :execute, :execute_with_query_counting
-    end
-    yield
-  ensure
-    ActiveRecord::Base.connection.class.class_eval do
-      alias_method :execute, :execute_without_query_counting
-    end
-    assert_equal num, ActiveRecord::Base.connection.query_count, '#{ActiveRecord::Base.connection.query_count} instead of #{num} queries were executed.'
-  end
-
-  def assert_no_queries(&block)
-    assert_queries(0, &block)
-  end
-
-  cattr_accessor :classes
-
-  protected
-
-  def testing_with(&block)
-    classes.keys.each do |key_test|
-      @key_test = key_test
-      @klass_info = classes[@key_test]
-      @klass, @primary_keys = @klass_info[:class], @klass_info[:primary_keys]
-      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
-      @first = @klass.order(order).first
-      yield
-    end
-  end
-
-  def first_id
-    ids = (1..@primary_keys.length).map {|num| 1}
-    composite? ? ids.to_composite_ids : ids.first
-  end
-
-  def composite?
-    @key_test != :single
-  end
-
-  # Oracle metadata is in all caps.
-  def with_quoted_identifiers(s)
-    s.gsub(/'(\w+)'/) { |m|
-      if ActiveRecord::Base.configurations[:test]['adapter'] =~ /oracle/i
-        m.upcase
-      else
-        m
-      end
-    }
-  end
-end
-
-def current_adapter?(type)
-  ActiveRecord::ConnectionAdapters.const_defined?(type) &&
-    ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
-end
-
-ActiveRecord::Base.connection.class.class_eval do
-  cattr_accessor :query_count
-  alias_method :execute_without_query_counting, :execute
-  def execute_with_query_counting(sql, name = nil)
-    self.query_count += 1
-    execute_without_query_counting(sql, name)
-  end
-end
-
-ActiveRecord::Base.logger = Logger.new(ENV['CPK_LOGFILE'] || STDOUT)
+spec_name = ENV['ADAPTER'] || 'sqlite'
+require 'bundler'
+require 'minitest/autorun'
+
+Bundler.setup(:default, spec_name.to_sym)
+Bundler.require(:default, spec_name.to_sym)
+require 'composite_primary_keys'
+
+# Require the connection spec
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
+
+spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
+puts "Loaded #{spec_name}"
+
+# And now connect to the database
+ActiveRecord::Base.establish_connection(spec)
+
+# Tell active record about the configuration
+ActiveRecord::Base.configurations = {test: spec}
+
+# Tell ActiveRecord where to find models
+ActiveSupport::Dependencies.autoload_paths << File.join(PROJECT_ROOT, 'test', 'fixtures')
+
+I18n.config.enforce_available_locales = true
+
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+
+  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
+  self.use_instantiated_fixtures = false
+  self.use_transactional_tests = true
+  self.test_order = :random
+
+  def assert_date_from_db(expected, actual, message = nil)
+    # SQL Server doesn't have a separate column type just for dates,
+    # so the time is in the string and incorrectly formatted
+    if current_adapter?(:SQLServerAdapter)
+      assert_equal expected.strftime('%Y/%m/%d 00:00:00'), actual.strftime('%Y/%m/%d 00:00:00')
+    elsif current_adapter?(:SybaseAdapter)
+      assert_equal expected.to_s, actual.to_date.to_s, message
+    else
+      assert_equal expected.to_s, actual.to_s, message
+    end
+  end
+
+  def assert_queries(num = 1)
+    ActiveRecord::Base.connection.class.class_eval do
+      self.query_count = 0
+      alias_method :execute, :execute_with_query_counting
+    end
+    yield
+  ensure
+    ActiveRecord::Base.connection.class.class_eval do
+      alias_method :execute, :execute_without_query_counting
+    end
+    assert_equal num, ActiveRecord::Base.connection.query_count, '#{ActiveRecord::Base.connection.query_count} instead of #{num} queries were executed.'
+  end
+
+  def assert_no_queries(&block)
+    assert_queries(0, &block)
+  end
+
+  cattr_accessor :classes
+
+  protected
+
+  def testing_with(&block)
+    classes.keys.each do |key_test|
+      @key_test = key_test
+      @klass_info = classes[@key_test]
+      @klass, @primary_keys = @klass_info[:class], @klass_info[:primary_keys]
+      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
+      @first = @klass.order(order).first
+      yield
+    end
+  end
+
+  def first_id
+    ids = (1..@primary_keys.length).map {|num| 1}
+    composite? ? ids.to_composite_ids : ids.first
+  end
+
+  def composite?
+    @key_test != :single
+  end
+
+  # Oracle metadata is in all caps.
+  def with_quoted_identifiers(s)
+    s.gsub(/'(\w+)'/) { |m|
+      if ActiveRecord::Base.configurations[:test]['adapter'] =~ /oracle/i
+        m.upcase
+      else
+        m
+      end
+    }
+  end
+end
+
+def current_adapter?(type)
+  ActiveRecord::ConnectionAdapters.const_defined?(type) &&
+    ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters.const_get(type))
+end
+
+ActiveRecord::Base.connection.class.class_eval do
+  cattr_accessor :query_count
+  alias_method :execute_without_query_counting, :execute
+  def execute_with_query_counting(sql, name = nil)
+    self.query_count += 1
+    execute_without_query_counting(sql, name)
+  end
+end
+
+ActiveRecord::Base.logger = Logger.new(ENV['CPK_LOGFILE'] || STDOUT)

data/test/connections/databases.ci.yml

@@ -1,19 +1,22 @@
-mysql:
-  adapter: mysql2
-  username: travis
-  password: ""
-  encoding: utf8mb4
-  charset: utf8mb4
-  collation: utf8mb4_bin
-  database: composite_primary_keys_unittest
-
-postgresql:
-  adapter: postgresql
-  database: composite_primary_keys_unittest
-  username: postgres
-  host: localhost
-
-sqlite:
-  adapter: sqlite3
-  database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
-
+mysql:
+  adapter: mysql2
+  username: github
+  password: github
+  host: 127.0.0.1
+  port: 3306
+  encoding: utf8mb4
+  charset: utf8mb4
+  collation: utf8mb4_bin
+  database: composite_primary_keys_unittest
+
+postgresql:
+  adapter: postgresql
+  database: composite_primary_keys_unittest
+  username: postgres
+  password: postgres
+  host: localhost
+
+sqlite:
+  adapter: sqlite3
+  database: <%= File.join(project_root, 'db', 'composite_primary_keys_unittest.sqlite') %>
+