First-cut at ActiveRecord 3.1.x compatibility. This is a massive chan…

…geset due to all the differences between AR 3.0.x and 3.1.x.

History.txt

@@ -1,8 +1,10 @@
-== 3.1.7 2011-05-?
+== 3.1.7 2011-05-19
 * Support regular AR models having one or many composite models (Jacques Fuentes)
 * Minor test cleanup
 * Make version requirements more explicit
 * Remove Arel extensions used for calculations
+* Fix test that included wrong error constant
+
 
 == 3.1.6 2011-04-03
 * Updated belongs_to association to be a bit more flexible with non-CPK
@@ -11,12 +13,14 @@
 * Fix write issue when one of they keys in a composite key is
   called id (Tom Hughes)
 
+
 == 3.1.5 2011-03-24
 * Fix simple calculation methods
 * Fix instantiation of cpk records via associations.
 * Fix Relation#delete
 * Fix Relation#destroy
 
+
 == 3.1.4 2011-03-06
 * Support ActiveRecord 3.0.5 (interpolate_sql was removed and
   replaced by interpolate_and_sanitize_sql)

composite_primary_keys.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.required_ruby_version = '>= 1.8.7'
-  s.add_dependency('arel', '~> 2.0.0')
-  s.add_dependency('activerecord', '>= 3.0.5', '~> 3.0.0')
-  s.add_development_dependency "rspec"
+  s.add_dependency('arel', '~> 2.1.0')
+  s.add_dependency('activerecord', '~> 3.1.0')
 end

lib/composite_primary_keys.rb

@@ -25,43 +25,56 @@
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 unless defined?(ActiveRecord)
-  gem 'arel', '~> 2.0.0'
-  gem 'activerecord', '>= 3.0.5', '~> 3.0.0'
+  require "bundler/setup"
+  #gem 'arel', '~> 2.1.0'
+  #gem 'rails', '~> 3.1.0'
   require 'active_record'
 end
 
-require 'active_record/associations.rb'
-require 'active_record/associations/association_proxy.rb'
-require 'active_record/associations/association_collection'
-require 'active_record/associations/association_proxy'
+require 'active_record/associations/association_scope'
 require 'active_record/associations/belongs_to_association'
 require 'active_record/associations/belongs_to_polymorphic_association'
+require 'active_record/associations/collection_association'
+require 'active_record/associations/collection_proxy.rb'
 require 'active_record/associations/has_and_belongs_to_many_association'
 require 'active_record/associations/has_many_association'
 require 'active_record/associations/has_one_association'
 require 'active_record/associations/has_one_through_association'
-require 'active_record/associations/through_association_scope'
+require 'active_record/associations/join_dependency/join_part'
+require 'active_record/associations/join_dependency/join_association'
+require 'active_record/associations/preloader/association'
 require 'active_record/persistence'
 require 'active_record/relation/query_methods'
 require 'active_record/attribute_methods/primary_key'
 require 'active_record/fixtures'
 
+Dir[File.dirname(__FILE__) + '/composite_primary_keys/connection_adapters/*.rb'].each do |adapter|
+  begin
+    basename = File.basename(adapter).gsub('.rb','')
+    require "active_record/connection_adapters/#{basename}"
+  rescue MissingSourceFile
+  end
+end
+
 require 'composite_primary_keys/composite_arrays'
 require 'composite_primary_keys/associations'
-require 'composite_primary_keys/associations/association_proxy'
+require 'composite_primary_keys/associations/association_scope'
 require 'composite_primary_keys/associations/has_one_association'
 require 'composite_primary_keys/associations/has_many_association'
 require 'composite_primary_keys/associations/has_and_belongs_to_many_association'
 require 'composite_primary_keys/associations/through_association_scope'
+require 'composite_primary_keys/associations/join_dependency/join_part'
+require 'composite_primary_keys/associations/join_dependency/join_association'
 require 'composite_primary_keys/association_preload'
+require 'composite_primary_keys/associations/preloader/association'
+require 'composite_primary_keys/named_scope'
 require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/reflection'
 require 'composite_primary_keys/relation'
 require 'composite_primary_keys/read'
 require 'composite_primary_keys/write'
 require 'composite_primary_keys/finder_methods'
 require 'composite_primary_keys/base'
-require 'composite_primary_keys/calculations'
 require 'composite_primary_keys/validations/uniqueness'
 require 'composite_primary_keys/query_methods'
 require 'composite_primary_keys/primary_key'