composite_primary_keys 9.0.4 → 9.0.5

data/lib/composite_primary_keys/sanitization.rb

@@ -1,59 +1,43 @@
 module ActiveRecord
   module Sanitization
     module ClassMethods
-
       protected
-      # Accepts a hash of SQL conditions and replaces those attributes
-      # that correspond to a {#composed_of}[rdoc-ref:Aggregations::ClassMethods#composed_of]
-      # relationship with their expanded aggregate attribute values.
-      #
-      # Given:
-      #
-      #   class Person < ActiveRecord::Base
-      #     composed_of :address, class_name: "Address",
-      #       mapping: [%w(address_street street), %w(address_city city)]
-      #   end
-      #
-      # Then:
-      #
-      #   { address: Address.new("813 abc st.", "chicago") }
-      #   # => { address_street: "813 abc st.", address_city: "chicago" }
-      silence_warnings do
-        def expand_hash_conditions_for_aggregates(attrs)
-          expanded_attrs = {}
-          attrs.each do |attr, value|
-            # CPK
-            # if aggregation = reflect_on_aggregation(attr.to_sym)
-            if attr.is_a?(CompositePrimaryKeys::CompositeKeys)
-              attr.each_with_index do |key,i|
-                expanded_attrs[key] = value.respond_to?(:flatten) ? value.flatten[i] : value
-              end
-            elsif aggregation = reflect_on_aggregation(attr.to_sym)
-              mapping = aggregation.mapping
-              mapping.each do |field_attr, aggregate_attr|
-                if mapping.size == 1 && !value.respond_to?(aggregate_attr)
-                  expanded_attrs[field_attr] = value
-                else
-                  expanded_attrs[field_attr] = value.send(aggregate_attr)
-                end
+
+      def expand_hash_conditions_for_aggregates(attrs)
+        expanded_attrs = {}
+        attrs.each do |attr, value|
+          # CPK
+          # if aggregation = reflect_on_aggregation(attr.to_sym)
+          if attr.is_a?(CompositePrimaryKeys::CompositeKeys)
+            value = value.split('/') if value.is_a?(String)
+            attr.each_with_index do |key,i|
+              expanded_attrs[key] = value.respond_to?(:flatten) ? value.flatten[i] : value
+            end
+          elsif aggregation = reflect_on_aggregation(attr.to_sym)
+            mapping = aggregation.mapping
+            mapping.each do |field_attr, aggregate_attr|
+              if mapping.size == 1 && !value.respond_to?(aggregate_attr)
+                expanded_attrs[field_attr] = value
+              else
+                expanded_attrs[field_attr] = value.send(aggregate_attr)
               end
-            else
-              expanded_attrs[attr] = value
             end
+          else
+            expanded_attrs[attr] = value
           end
-          expanded_attrs
         end
+        expanded_attrs
+      end
 
-        def quoted_id
-          # CPK
-          # self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
-          if self.composite?
-            [self.class.primary_keys, ids].transpose.map { |attr_name,id|
-              self.class.quote_value(@attributes[attr_name].value_for_database)
-            }
-          else
-            self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
-          end
+      def quoted_id
+        # CPK
+        # self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
+        if self.composite?
+          [self.class.primary_keys, ids].transpose.map { |attr_name,id|
+            self.class.quote_value(@attributes[attr_name].value_for_database)
+          }
+        else
+          self.class.quote_value(@attributes[self.class.primary_key].value_for_database)
         end
       end
     end

data/lib/composite_primary_keys/version.rb

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

data/tasks/databases/mysql.rake

@@ -1,42 +1,40 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
-namespace :mysql do
-  desc 'Create the MySQL test database'
-  task :create_database do
-    ActiveRecord::Base.clear_all_connections!
-    spec = CompositePrimaryKeys::ConnectionSpec['mysql'].dup
-    database_name = spec.delete('database')
-    connection = ActiveRecord::Base.establish_connection(spec)
-    ActiveRecord::Base.connection.create_database(database_name)
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Build the MySQL test database'
-  task :build_database => [:create_database] do
-    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
-    sql = File.open(path, 'rb') do |file|
-      file.read
-    end
-
-    Rake::Task['mysql:load_connection'].reenable
-    Rake::Task['mysql:load_connection'].invoke
-    #puts %(ActiveRecord::Base.connection.instance_variable_get(:@config)=#{(ActiveRecord::Base.connection.instance_variable_get(:@config)).inspect})
-    sql.split(";").each do |statement|
-      ActiveRecord::Base.connection.execute(statement) unless statement.strip.length == 0
-    end
-  end
-
-  desc 'Drop the MySQL test database'
-  task :drop_database => :load_connection do
-    ActiveRecord::Base.connection.drop_database(SPEC['database'])
-  end
-
-  desc 'Rebuild the MySQL test database'
-  task :rebuild_database => [:drop_database, :build_database]
-  
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_mysql", "connection")
-    establish_connection
-  end
-end
+namespace :mysql do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :mysql)
+  end
+
+  task :create_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
+    ActiveRecord::Base.clear_all_connections!
+    new_spec = spec.dup
+    new_spec.delete('database')
+    connection = ActiveRecord::Base.establish_connection(new_spec)
+    ActiveRecord::Base.connection.create_database(spec['database'])
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Build the MySQL test database'
+  task :build_database => [:create_database] do
+    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'mysql.sql')
+    sql = File.open(path, 'rb') do |file|
+      file.read
+    end
+
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
+    connection = ActiveRecord::Base.establish_connection(spec)
+    sql.split(";").each do |statement|
+      ActiveRecord::Base.connection.execute(statement) unless statement.strip.length == 0
+    end
+  end
+
+  desc 'Drop the MySQL test database'
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['mysql']
+    connection = ActiveRecord::Base.establish_connection(spec)
+    ActiveRecord::Base.connection.drop_database(spec['database'])
+  end
+
+  desc 'Rebuild the MySQL test database'
+  task :rebuild_database => [:drop_database, :build_database]
+end

data/tasks/databases/oracle.rake

@@ -1,27 +1,41 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
 namespace :oracle do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :oracle)
+  end
+
   desc 'Build the Oracle test database'
-  task :build_database => :load_connection do
-    options_str = connection_string
+  task :build_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec)
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
+    sql = File.read(schema)
+
+    sql.split(';').each do |command|
+      ActiveRecord::Base.connection.execute(command)
+    end
 
-    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.sql')
-    sh %( sqlplus #{options_str} < #{sql} )
+    ActiveRecord::Base.clear_all_connections!
   end
 
   desc 'Drop the Oracle test database'
-  task :drop_database => :load_connection do
-    options_str = connection_string
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['oracle']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec)
 
-    sql = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
-    sh %( sqlplus #{options_str} < #{sql} )
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'oracle.drop.sql')
+    sql = File.read(schema)
+
+    sql.split(';').each do |command|
+      ActiveRecord::Base.connection.execute(command)
+    end
+
+    ActiveRecord::Base.clear_all_connections!
   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", "connection")
-  end
 end

data/tasks/databases/postgresql.rake

@@ -1,48 +1,39 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
-namespace :postgresql do
-  desc 'Create the PostgreSQL test database'
-  task :create_database do
-    ActiveRecord::Base.clear_all_connections!
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
-    database_name = spec.delete('database')
-    spec['database'] = 'postgres'
-    connection = ActiveRecord::Base.establish_connection(spec)
-    ActiveRecord::Base.connection.create_database(database_name)
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Build the PostgreSQL test database'
-  task :build_database => [:create_database] do
-    ActiveRecord::Base.clear_all_connections!
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
-    connection = ActiveRecord::Base.establish_connection(spec)
-
-    path = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
-    sql = File.open(path, 'rb') do |file|
-      file.read
-    end
-
-    Rake::Task['postgresql:load_connection'].invoke
-    ActiveRecord::Base.connection.execute(sql)
-  end
-
-  desc 'Drop the PostgreSQL test database'
-  task :drop_database => :load_connection do
-    ActiveRecord::Base.clear_all_connections!
-    spec = CompositePrimaryKeys::ConnectionSpec['postgresql'].dup
-    database_name = spec.delete('database')
-    spec['database'] = 'postgres'
-    connection = ActiveRecord::Base.establish_connection(spec)
-    ActiveRecord::Base.connection.drop_database(SPEC['database'])
-    ActiveRecord::Base.clear_all_connections!
-  end
-
-  desc 'Rebuild the PostgreSQL test database'
-  task :rebuild_database => [:drop_database, :build_database]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_postgresql", "connection")
-  end
+namespace :postgresql do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :postgresql)
+  end
+
+  task :create_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec.dup.merge('database' => 'postgres'))
+    ActiveRecord::Base.connection.create_database(spec['database'])
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Build the Postgresql test database'
+  task :build_database => :create_database do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
+    ActiveRecord::Base.clear_all_connections!
+    connection = ActiveRecord::Base.establish_connection(spec)
+
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'postgresql.sql')
+    sql = File.read(schema)
+
+    ActiveRecord::Base.connection.execute(sql)
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Drop the Postgresql test database'
+  task :drop_database  => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['postgresql']
+    ActiveRecord::Base.clear_all_connections!
+    connection = ActiveRecord::Base.establish_connection(spec.merge('database' => 'postgres'))
+    ActiveRecord::Base.connection.drop_database(spec['database'])
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  desc 'Rebuild the PostgreSQL test database'
+  task :rebuild_database => [:drop_database, :build_database]
 end

data/tasks/databases/sqlite.rake

@@ -0,0 +1,25 @@
+namespace :sqlite do
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :sqlite)
+  end
+
+  desc 'Build the sqlite test database'
+  task :build_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlite']
+    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlite.sql')
+    FileUtils.mkdir_p(File.dirname(spec['database']))
+    cmd = "sqlite3 #{spec['database']} < #{schema}"
+    puts cmd
+    sh %{ #{cmd} }
+  end
+
+  desc 'Drop the sqlite test database'
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlite']
+    sh %{ rm -f #{spec['database']} }
+  end
+
+  desc 'Rebuild the sqlite test database'
+  task :rebuild_database => [:drop_database, :build_database]
+end

data/tasks/databases/sqlserver.rake

@@ -1,27 +1,43 @@
-require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys')
-require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
-
 namespace :sqlserver do
-  desc 'Build the SQL Server test database'
-  task :build_database => :load_connection do
-    options_str = connection_string
+  task :setup do
+    require 'bundler'
+    Bundler.require(:default, :sqlserver)
+  end
+
+  task :create_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlserver']
+    database = spec.delete('database')
+    ActiveRecord::Base.clear_all_connections!
+
+    ActiveRecord::Base.establish_connection(spec)
+    ActiveRecord::Base.connection.execute("CREATE DATABASE [#{database}]")
+    ActiveRecord::Base.clear_all_connections!
+  end
+
+  task :build_database => :create_database do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlserver']
+    ActiveRecord::Base.establish_connection(spec)
 
     schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlserver.sql')
-    sh %( sqsh #{options_str} -i #{schema} )
+    sql = File.read(schema)
+    ActiveRecord::Base.connection.execute(sql)
+    ActiveRecord::Base.clear_all_connections!
   end
 
   desc 'Drop the SQL Server test database'
-  task :drop_database => :load_connection do 
-    options_str = connection_string
-    
-    schema = File.join(PROJECT_ROOT, 'test', 'fixtures', 'db_definitions', 'sqlserver.drop.sql')
-    sh %( sqsh #{options_str} -i #{schema} )
+  task :drop_database => :setup do
+    spec = CompositePrimaryKeys::ConnectionSpec['sqlserver']
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(spec)
+    database = spec.delete('database')
+    ActiveRecord::Base.connection.execute(<<-SQL)
+      USE master;
+      ALTER DATABASE [#{database}] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;
+      DROP DATABASE [#{database}];
+    SQL
+    ActiveRecord::Base.clear_all_connections!
   end
 
   desc 'Rebuild the SQL Server test database'
   task :rebuild_database => [:drop_database, :build_database]
-
-  task :load_connection do
-    require File.join(PROJECT_ROOT, "test", "connections", "native_sqlserver", "connection")
-  end
 end

data/test/abstract_unit.rb

@@ -1,6 +1,6 @@
-ENV["TESTING_CPK"] = "true"
-
-PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+spec_name = ENV['ADAPTER'] || 'postgresql'
+require 'bundler'
+Bundler.require(:default, spec_name.to_sym)
 
 # To make debugging easier, test within this source tree versus an installed gem
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
@@ -8,14 +8,15 @@ require 'composite_primary_keys'
 require 'minitest/autorun'
 require 'active_support/test_case'
 
-# Now load the connection spec
-require File.join(PROJECT_ROOT, "test", "connections", "connection_spec")
+# Require the connection spec
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+require File.join(PROJECT_ROOT, 'test', 'connections', 'connection_spec')
 
-spec_name = ENV['ADAPTER'] || 'postgresql'
 spec = CompositePrimaryKeys::ConnectionSpec[spec_name]
+puts "Loaded #{spec_name}"
 
 # And now connect to the database
-require File.join(PROJECT_ROOT, "test", "connections", "native_#{spec_name}", "connection")
+ActiveRecord::Base.establish_connection(spec)
 
 # Tell active record about the configuration
 ActiveRecord::Base.configurations[:test] = spec
@@ -28,7 +29,7 @@ I18n.config.enforce_available_locales = true
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
 
-  self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
+  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
   self.use_instantiated_fixtures = false
   self.use_transactional_tests = true
   self.test_order = :random
@@ -37,7 +38,7 @@ class ActiveSupport::TestCase
     # 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")
+      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
@@ -55,7 +56,7 @@ class ActiveSupport::TestCase
     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."
+    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)
@@ -88,7 +89,7 @@ class ActiveSupport::TestCase
 
   # Oracle metadata is in all caps.
   def with_quoted_identifiers(s)
-    s.gsub(/"(\w+)"/) { |m|
+    s.gsub(/'(\w+)'/) { |m|
       if ActiveRecord::Base.configurations[:test]['adapter'] =~ /oracle/i
         m.upcase
       else