composite_primary_keys 0.8.6 → 0.9.0

data/lib/composite_primary_keys.rb

@@ -26,7 +26,6 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   begin
-    $:.unshift(File.dirname(__FILE__) + "/../../activerecord/lib")  
     require 'active_record'  
   rescue LoadError
     require 'rubygems'
@@ -40,6 +39,7 @@ require 'composite_primary_keys/associations'
 require 'composite_primary_keys/reflection'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/calculations'
+require 'composite_primary_keys/migration'
 
 ActiveRecord::Base.class_eval do
   include CompositePrimaryKeys::ActiveRecord::Base
@@ -47,7 +47,7 @@ end
 
 Dir[File.dirname(__FILE__) + '/composite_primary_keys/connection_adapters/*.rb'].each do |adapter|
   begin
-    require "composite_primary_keys/connection_adapters/" + adapter.gsub('.rb','')
+    require adapter.gsub('.rb','')
   rescue MissingSourceFile
   end
 end

data/lib/composite_primary_keys/associations.rb

@@ -80,7 +80,8 @@ module ActiveRecord::Associations::ClassMethods
           association = join.instantiate(row)
           collection.target.push(association) unless collection.target.include?(association)
         when :has_one, :belongs_to
-          return if record.id.to_s != join.parent.record_id(row).to_s or row[join.aliased_primary_key].nil?
+          return if record.id.to_s != join.parent.record_id(row).to_s or
+                    join.aliased_primary_key.to_a.any? { |key| row[key].nil? }
           association = join.instantiate(row)
           record.send("set_#{join.reflection.name}_target", association)
         else
@@ -125,17 +126,20 @@ module ActiveRecord::Associations::ClassMethods
       def composite_association_join
         join = case reflection.macro
           when :has_and_belongs_to_many
-            # TODO replace (keys) = (ids), with key1=id1 and key2=id2
-            " LEFT OUTER JOIN %s ON (%s) = (%s) " % [
-               table_alias_for(options[:join_table], aliased_join_table_name),
-               full_keys(aliased_join_table_name, options[:foreign_key] || reflection.active_record.to_s.classify.foreign_key),
-               full_keys(reflection.active_record.table_name, reflection.active_record.primary_key)] +
-           # TODO replace (keys) = (ids), with key1=id1 and key2=id2
-            " LEFT OUTER JOIN %s ON (%s) = (%s) " % [
-               table_name_and_alias, 
-               full_keys(aliased_table_name, klass.primary_key),
-               full_keys(aliased_join_table_name, options[:association_foreign_key] || klass.table_name.classify.foreign_key)
-               ]
+            " LEFT OUTER JOIN %s ON %s " % [
+              table_alias_for(options[:join_table], aliased_join_table_name),
+                composite_join_clause(
+                  full_keys(aliased_join_table_name, options[:foreign_key] || reflection.active_record.to_s.classify.foreign_key),
+                  full_keys(reflection.active_record.table_name, reflection.active_record.primary_key)
+                )
+              ] +
+             " LEFT OUTER JOIN %s ON %s " % [
+                table_name_and_alias,
+                composite_join_clause(
+                  full_keys(aliased_table_name, klass.primary_key),
+                  full_keys(aliased_join_table_name, options[:association_foreign_key] || klass.table_name.classify.foreign_key)
+                )
+              ]
           when :has_many, :has_one
             case
               when reflection.macro == :has_many && reflection.options[:through]
@@ -155,16 +159,19 @@ module ActiveRecord::Associations::ClassMethods
                         second_key = options[:foreign_key] || primary_key
                     end
                     
-                    # TODO replace (keys) = (ids), with key1=id1 and key2=id2
-                    " LEFT OUTER JOIN %s ON (%s) = (%s) "  % [
+                    " LEFT OUTER JOIN %s ON %s "  % [
                       table_alias_for(through_reflection.klass.table_name, aliased_join_table_name), 
-                      full_keys(aliased_join_table_name, through_reflection.primary_key_name),
-                      full_keys(parent.aliased_table_name, parent.primary_key)] +
-                    # TODO replace (keys) = (ids), with key1=id1 and key2=id2
-                    " LEFT OUTER JOIN %s ON (%s) = (%s) " % [
-                      table_name_and_alias,
-                      full_keys(aliased_table_name, first_key), 
-                      full_keys(aliased_join_table_name, second_key)
+                       composite_join_clause(
+                         full_keys(aliased_join_table_name, through_reflection.primary_key_name),
+                         full_keys(parent.aliased_table_name, parent.primary_key)
+                       )
+                     ] +
+                     " LEFT OUTER JOIN %s ON %s " % [
+                       table_name_and_alias,
+                       composite_join_clause(
+                         full_keys(aliased_table_name, first_key), 
+                         full_keys(aliased_join_table_name, second_key)
+                       )
                     ]
                   end
                 end
@@ -175,7 +182,6 @@ module ActiveRecord::Associations::ClassMethods
                 raise AssociationNotSupported, "Polymorphic joins not supported for composite keys"
               else
                 foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
-                # TODO replace (keys) = (ids), with key1=id1 and key2=id2
                 " LEFT OUTER JOIN %s ON %s " % [
                   table_name_and_alias,
                   composite_join_clause(
@@ -184,7 +190,6 @@ module ActiveRecord::Associations::ClassMethods
                 ]
             end
           when :belongs_to
-            # TODO replace (keys) = (ids), with key1=id1 and key2=id2
             " LEFT OUTER JOIN %s ON %s " % [
                table_name_and_alias, 
                composite_join_clause(
@@ -197,7 +202,7 @@ module ActiveRecord::Associations::ClassMethods
         join << %(AND %s.%s = %s ) % [
           aliased_table_name, 
           reflection.active_record.connection.quote_column_name(reflection.active_record.inheritance_column), 
-          klass.quote(klass.name)] unless klass.descends_from_active_record?
+          klass.connection.quote(klass.name)] unless klass.descends_from_active_record?
         join << "AND #{interpolate_sql(sanitize_sql(reflection.options[:conditions]))} " if reflection.options[:conditions]
         join
       end
@@ -273,7 +278,7 @@ module ActiveRecord::Associations
         when @reflection.options[:as]
           @finder_sql = 
             "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
-            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.connection.quote_column_name(@owner.class.base_class.name.to_s)}"
+            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"
           @finder_sql << " AND (#{conditions})" if conditions
             
         else
@@ -292,6 +297,26 @@ module ActiveRecord::Associations
         @counter_sql = @finder_sql
       end
     end
+    
+	def delete_records(records)
+	  if @reflection.options[:dependent]
+		records.each { |r| r.destroy }
+	  else
+		field_names = @reflection.primary_key_name.split(',')
+		field_names.collect! {|n|
+			n + " = NULL"
+		}
+		records.each { |r|
+			where_class = nil
+			if r.quoted_id.include?(',')
+				where_class = [@reflection.klass.primary_key, r.quoted_id].transpose.map {|pair| "(#{pair[0]} = #{pair[1]})"}.join(" AND ")
+			else
+				where_class = @reflection.klass.primary_key + ' = ' +  r.quoted_id
+			end
+			@reflection.klass.update_all(  field_names.join(',') , where_class)
+		}
+	  end
+	end
   end
   
   class HasOneAssociation < BelongsToAssociation #:nodoc:
@@ -300,7 +325,7 @@ module ActiveRecord::Associations
         when @reflection.options[:as]
           @finder_sql = 
             "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + 
-            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.connection.quote_column_name(@owner.class.base_class.name.to_s)}"          
+            "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"          
         else
           @finder_sql = full_columns_equals(@reflection.klass.table_name, 
                                   @reflection.primary_key_name, @owner.quoted_id)
@@ -313,7 +338,7 @@ module ActiveRecord::Associations
     def construct_conditions
       conditions = if @reflection.through_reflection.options[:as]
           "#{@reflection.through_reflection.table_name}.#{@reflection.through_reflection.options[:as]}_id = #{@owner.quoted_id} " + 
-          "AND #{@reflection.through_reflection.table_name}.#{@reflection.through_reflection.options[:as]}_type = #{@owner.class.connection.quote_column_name(@owner.class.base_class.name.to_s)}"
+          "AND #{@reflection.through_reflection.table_name}.#{@reflection.through_reflection.options[:as]}_type = #{@owner.class.quote_value(@owner.class.base_class.name.to_s)}"
       else
         @finder_sql = full_columns_equals(@reflection.through_reflection.table_name, 
                                   @reflection.through_reflection.primary_key_name, @owner.quoted_id)
@@ -334,7 +359,7 @@ module ActiveRecord::Associations
         if @reflection.source_reflection.options[:as]
           polymorphic_join = "AND %s.%s = %s" % [
             @reflection.table_name, "#{@reflection.source_reflection.options[:as]}_type",
-                @owner.class.connection.quote_column_name(@reflection.through_reflection.klass.name)
+                @owner.class.quote_value(@reflection.through_reflection.klass.name)
               ]
             end
           end

data/lib/composite_primary_keys/base.rb

@@ -293,7 +293,10 @@ module CompositePrimaryKeys
           
           conditions = ids.map do |id_set|
             [primary_keys, id_set].transpose.map do |key, id|
-              "#{table_name}.#{key.to_s}=#{sanitize(id)}"
+			   col = columns_hash[key.to_s]
+			   val = quote_value(id, col)
+			   
+              "#{table_name}.#{key.to_s}=#{val}"
               end.join(" AND ")
               end.join(") OR (")
               options.update :conditions => "(#{conditions})"

data/lib/composite_primary_keys/connection_adapters/ibm_db_adapter.rb

@@ -0,0 +1,21 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class IBM_DBAdapter < AbstractAdapter
+      
+      # This mightn't be in Core, but count(distinct x,y) doesn't work for me
+      def supports_count_distinct? #:nodoc:
+        false
+      end
+      
+      alias_method :quote_original, :quote
+      def quote(value, column = nil)
+        if value.kind_of?(String) && column && [:integer, :float].include?(column.type)
+              value = column.type == :integer ? value.to_i : value.to_f
+              value.to_s
+        else
+            quote_original(value, column)
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb

@@ -4,7 +4,7 @@ module ActiveRecord
       
       # This mightn't be in Core, but count(distinct x,y) doesn't work for me
       def supports_count_distinct? #:nodoc:
-        false
+        true
       end
     end
   end

data/lib/composite_primary_keys/migration.rb

@@ -0,0 +1,13 @@
+ActiveRecord::ConnectionAdapters::ColumnDefinition.send(:alias_method, :to_s_without_composite_keys, :to_s)
+
+ActiveRecord::ConnectionAdapters::ColumnDefinition.class_eval <<-'EOF'
+  def to_s
+    if name.is_a? Array
+      "PRIMARY KEY (#{name.join(',')})"
+    else
+      to_s_without_composite_keys
+    end
+  end
+EOF
+
+

data/lib/composite_primary_keys/version.rb

@@ -1,8 +1,8 @@
 module CompositePrimaryKeys
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 8
-    TINY  = 6
+    MINOR = 9
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/loader.rb

@@ -0,0 +1,24 @@
+# Load local config files in /local
+begin
+  local_file_supported = Dir[File.join(PROJECT_ROOT, 'local/*.sample')].map { |path| File.basename(path).sub(".sample","") }
+  local_file_supported.each do |file|
+    require "local/#{file}"
+  end
+rescue LoadError
+  puts <<-EOS
+  This Gem supports local developer extensions in local/ folder. 
+  Supported files:
+    #{local_file_supported.map { |f| "local/#{f}"}.join(', ')}
+
+  Setup default sample files:
+    rake local:setup
+
+  Current warning: #{$!}
+  
+  EOS
+end
+
+
+# Now load Rake tasks from /tasks
+rakefiles = Dir[File.join(File.dirname(__FILE__), "tasks/**/*.rake")]
+rakefiles.each { |rakefile| load File.expand_path(rakefile) }

data/local/database_connections.rb.sample

@@ -0,0 +1,10 @@
+require 'yaml'
+
+ENV['cpk_adapters'] = {
+  "mysql" => {
+    :adapter  => "mysql",
+    :username => "root",
+    :password => "root",
+    # ...
+  }
+}.to_yaml

data/local/paths.rb.sample

@@ -0,0 +1,2 @@
+# location of folder containing activerecord, railties, etc folders for each Rails gem
+ENV['EDGE_RAILS_DIR'] ||= "/path/to/copy/of/edge/rails"

data/local/tasks.rb.sample

@@ -0,0 +1,2 @@
+# This file loaded into Rakefile
+# Place any extra development tasks you want here

data/scripts/console.rb

@@ -0,0 +1,25 @@
+# FIXME:
+# I haven't figured out how to setup an irb console yet.
+# So, from the root, run:
+# irb -f -r scripts/console
+
+PROJECT_ROOT = '.' #File.join(File.dirname(__FILE__), '..')
+
+adapter = 'mysql'
+$:.unshift 'lib'
+
+require "local/database_connections"
+begin
+  require "local/paths" 
+  $:.unshift "#{ENV['EDGE_RAILS_DIR']}/activerecord/lib" if ENV['EDGE_RAILS_DIR']
+  $:.unshift "#{ENV['EDGE_RAILS_DIR']}/activesupport/lib" if ENV['EDGE_RAILS_DIR']
+rescue
+end
+
+require 'active_support'
+require 'active_record'
+
+require "test/connections/native_#{adapter}/connection"
+require 'composite_primary_keys'
+
+Dir[File.join(PROJECT_ROOT,'test/fixtures/*.rb')].each { |model| require model }

data/tasks/activerecord_selection.rake

@@ -0,0 +1,43 @@
+namespace :ar do
+  desc 'Pre-load edge rails ActiveRecord'
+  task :edge do
+    unless path = ENV['EDGE_RAILS_DIR'] || ENV['EDGE_RAILS']
+      puts <<-EOS
+
+Need to define env var EDGE_RAILS_DIR or EDGE_RAILS- root of edge rails on your machine.
+    i)  Get copy of Edge Rails - http://dev.rubyonrails.org
+    ii) Set EDGE_RAILS_DIR to this folder in local/paths.rb - see local/paths.rb.sample for example
+    or
+    a)  Set folder from environment or command line (rake ar:edge EDGE_RAILS_DIR=/path/to/rails)
+  
+      EOS
+      exit
+    end
+    
+    ENV['AR_LOAD_PATH'] = File.join(path, "activerecord/lib")
+  end
+  
+  desc 'Pre-load ActiveRecord using VERSION=X.Y.Z, instead of latest'
+  task :set do
+    unless version = ENV['VERSION']
+      puts <<-EOS
+Usage: rake ar:get_version VERSION=1.15.3
+    Specify the version number with VERSION=X.Y.Z; and make sure you have that activerecord gem version installed.
+    
+      EOS
+    end
+    version = nil if version == "" || version == []
+    begin
+      version ? gem('activerecord', version) : gem('activerecord')
+      require 'active_record'
+      ENV['AR_LOAD_PATH'] = $:.reverse.find { |path| /activerecord/ =~ path }
+    rescue LoadError
+      puts <<-EOS
+Missing: Cannot find activerecord #{version} installed.
+    Install: gem install activerecord -v #{version}
+    
+      EOS
+      exit
+    end
+  end
+end

data/tasks/databases.rake

@@ -0,0 +1,10 @@
+# UNTESTED - firebird sqlserver sqlserver_odbc db2 sybase openbase
+for adapter in %w( mysql sqlite oracle postgresql ibm_db ) 
+  Rake::TestTask.new("test_#{adapter}") { |t|
+    t.libs << "test" << "test/connections/native_#{adapter}"
+    t.pattern = "test/test_*.rb"
+    t.verbose = true
+  }
+end
+
+SCHEMA_PATH = File.join(PROJECT_ROOT, *%w(test fixtures db_definitions))

data/tasks/databases/mysql.rake

@@ -0,0 +1,30 @@
+namespace :mysql do
+  desc 'Build the MySQL test databases'
+  task :build_databases => :load_connection do 
+    puts File.join(SCHEMA_PATH, 'mysql.sql')
+    options_str = ENV['cpk_adapter_options_str']
+    # creates something like "-u#{username} -p#{password} -S#{socket}"
+    sh %{ mysqladmin #{options_str} create "#{GEM_NAME}_unittest" }
+    sh %{ mysql #{options_str} "#{GEM_NAME}_unittest" < #{File.join(SCHEMA_PATH, 'mysql.sql')} }
+  end
+
+  desc 'Drop the MySQL test databases'
+  task :drop_databases => :load_connection do 
+    options_str = ENV['cpk_adapter_options_str']
+    sh %{ mysqladmin #{options_str} -f drop "#{GEM_NAME}_unittest" }
+  end
+
+  desc 'Rebuild the MySQL test databases'
+  task :rebuild_databases => [:drop_databases, :build_databases]
+  
+  task :load_connection do
+    require File.join(PROJECT_ROOT, %w[lib adapter_helper mysql])
+    spec = AdapterHelper::MySQL.load_connection_from_env
+    options = {}
+    options['u'] = spec[:username]  if spec[:username]
+    options['p'] = spec[:password]  if spec[:password]
+    options['S'] = spec[:sock]      if spec[:sock]
+    options_str = options.map { |key, value| "-#{key}#{value}" }.join(" ")
+    ENV['cpk_adapter_options_str'] = options_str
+  end
+end

data/tasks/databases/oracle.rake

@@ -0,0 +1,15 @@
+namespace :oracle do
+  desc 'Build the Oracle test databases'
+  task :build_databases do 
+    puts File.join(SCHEMA_PATH, 'oracle.sql')
+    sh %( sqlplus holstdl/holstdl@test < #{File.join(SCHEMA_PATH, 'oracle.sql')} )
+  end
+
+  desc 'Drop the Oracle test databases'
+  task :drop_databases do 
+    sh %( sqlplus holstdl/holstdl@test < #{File.join(SCHEMA_PATH, 'oracle.drop.sql')} )
+  end
+
+  desc 'Rebuild the Oracle test databases'
+  task :rebuild_databases => [:drop_databases, :build_databases]
+end

data/tasks/databases/postgresql.rake

@@ -0,0 +1,26 @@
+namespace :postgresql do
+  desc 'Build the PostgreSQL test databases'
+  task :build_databases => :load_connection do 
+    sh %{ createdb "#{GEM_NAME}_unittest" }
+    sh %{ psql "#{GEM_NAME}_unittest" -f #{File.join(SCHEMA_PATH, 'postgresql.sql')} }
+  end
+
+  desc 'Drop the PostgreSQL test databases'
+  task :drop_databases => :load_connection do 
+    sh %{ dropdb "#{GEM_NAME}_unittest" }
+  end
+
+  desc 'Rebuild the PostgreSQL test databases'
+  task :rebuild_databases => [:drop_databases, :build_databases]
+
+  task :load_connection do
+    require File.join(PROJECT_ROOT, %w[lib adapter_helper postgresql])
+    spec = AdapterHelper::Postgresql.load_connection_from_env
+    options = {}
+    options['u'] = spec[:username]  if spec[:username]
+    options['p'] = spec[:password]  if spec[:password]
+    options_str = options.map { |key, value| "-#{key}#{value}" }.join(" ")
+    ENV['cpk_adapter_options_str'] = options_str
+  end
+end
+