Permalink
Browse files

Bug fix on getting connection and ruby 1.8.7 compatibility.

  • Loading branch information...
1 parent a91ed0b commit 2af8d35c454baad4d66143aa4c5cc0f81ad42a75 Charlie Savage committed May 7, 2010
Showing with 3 additions and 3 deletions.
  1. +1 −1 Rakefile
  2. +1 −1 lib/composite_primary_keys/association_proxy.rb
  3. +1 −1 loader.rb
View
@@ -62,4 +62,4 @@ hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc'
PROJECT_ROOT = File.expand_path(".")
-require_relative 'loader'
+require 'loader'
@@ -8,7 +8,7 @@ def full_columns_equals(table_name, keys, quoted_ids)
ids = [quoted_ids].flatten
[keys,ids].transpose.map do |key, id|
- "(#{quoted_table_name}.#{connection.quote_column_name(key)} = #{id})"
+ "(#{quoted_table_name}.#{@owner.connection.quote_column_name(key)} = #{id})"
end.join(' AND ')
end
View
@@ -2,7 +2,7 @@
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_relative "local/#{file}"
+ require "local/#{file}"
end
rescue LoadError
puts <<-EOS

0 comments on commit 2af8d35

Please sign in to comment.