ar-octopus 0.6.1 → 0.7.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDBkZGI5ZDAzMjU4MzkxZjVlYWZjMGI5ODQ0NDhiYjI1NTM5NjNkOQ==
+  data.tar.gz: !binary |-
+    MGE2MWM1YWZiNDQzNGQ3ZDE2ZTU4ZDljMzA1Nzk5N2Q2YzNjZTBlMA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDM1OTdhNGQwYjZkMjhiMTVmMDRmZmM2NmMyNzAwN2E3NTNhN2ZmM2ZmODZh
+    OGQ3ODUyZjU3ZTNjNzM0NDYzYmNiMjBjOGMxNmI4OTdkYTZjYTZhYzE1Mzgz
+    MmY5NTA1NGFmMTljNmIwNGUxNGY3NTU2ZWEzZTkyZmViNTBiYWY=
+  data.tar.gz: !binary |-
+    YWRmMDc0MjU5YzY1Y2MxNWJiZjRhMzhiMDk3MzAyMzc0NjhmZDk2NTUyNDli
+    MmQxODE2ZmNhM2EwYWQyZWNlZTYwOWYwOWRlMTlkMjlhYzQ5YzBmOWVmNjI1
+    OGM5YzBjOTMwODg0YjEyYzY3YWU1NDY4OWRhOGIwYTY3MjhmYWY=

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3

data/.travis.yml

@@ -4,11 +4,9 @@ env:
 before_script:
   - "bundle exec rake db:prepare"
 rvm:
-  - 1.8.7
   - 1.9.3
 
 gemfile:
-  - gemfiles/rails30.gemfile
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
 

data/Appraisals

@@ -1,8 +1,3 @@
-appraise "rails30" do
-  gem "activerecord", "~> 3.0.11"
-  gem 'mysql2', '< 0.3'
-end
-
 appraise "rails31" do
   gem "activerecord", "~> 3.1.3"
 end

data/ar-octopus.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
                            "Octopus now stores schema version information in each shard and migrations will not " \
                            "work properly unless this task is invoked."
 
-  s.add_dependency 'activerecord', '>= 3.0.0', '< 4.0'
-  s.add_dependency 'activesupport', '>= 3.0.0', '< 4.0'
+  s.add_dependency 'activerecord', '>= 3.1.0', '< 4.0'
+  s.add_dependency 'activesupport', '>= 3.1.0', '< 4.0'
   s.add_development_dependency 'rake', '>= 0.8.7'
   s.add_development_dependency 'rspec', '>= 2.0.0'
   s.add_development_dependency 'mysql2', '> 0.3'
@@ -30,4 +30,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sqlite3', '>= 1.3.4'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'appraisal', '>= 0.3.8'
+
+  s.license = 'MIT'
 end

data/lib/octopus.rb

@@ -64,10 +64,6 @@ module Octopus
     @environments ||= config['environments'] || ['production']
   end
 
-  def self.rails30?
-    ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
-  end
-
   def self.rails31?
     ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 1
   end
@@ -105,20 +101,12 @@ require "octopus/association"
 require "octopus/rails3/persistence"
 require "octopus/rails3/log_subscriber"
 require "octopus/rails3/abstract_adapter"
+require "octopus/rails3/singular_association"
 
 if defined?(::Rails)
   require "octopus/railtie"
 end
 
-if Octopus.rails30?
-  require "octopus/rails3.0/arel"
-  require "octopus/rails3.0/association"
-end
-
-if Octopus.rails31? || Octopus.rails32?
-  require "octopus/rails3.1/singular_association"
-end
-
 if Octopus.rails32?
   require "octopus/rails3.2/persistence"
 end

data/lib/octopus/model.rb

@@ -86,9 +86,7 @@ module Octopus::Model
       base.send(:alias_method, :equality_without_octopus, :==)
       base.send(:alias_method, :==, :equality_with_octopus)
       base.send(:alias_method, :eql?, :==)
-      if !Octopus.rails30? and !Octopus.rails31?
-        base.send(:alias_method_chain, :perform_validations, :octopus)
-      end
+      base.send(:alias_method_chain, :perform_validations, :octopus)
     end
 
     def should_set_current_shard?
@@ -113,15 +111,13 @@ module Octopus::Model
       equality_without_octopus(comparison_object) && comparison_object.current_shard == current_shard
     end
 
-    if !Octopus.rails30? and !Octopus.rails31?
-      def perform_validations_with_octopus(*args)
-        if Octopus.enabled? and should_set_current_shard?
-          Octopus.using(self.current_shard) do
-            perform_validations_without_octopus(*args)
-          end
-        else
+    def perform_validations_with_octopus(*args)
+      if Octopus.enabled? and should_set_current_shard?
+        Octopus.using(self.current_shard) do
           perform_validations_without_octopus(*args)
         end
+      else
+        perform_validations_without_octopus(*args)
       end
     end
   end

data/lib/octopus/proxy.rb

@@ -60,6 +60,7 @@ class Octopus::Proxy
     else
       @fully_replicated = true
     end
+
     @slaves_list = @shards.keys.map {|sym| sym.to_s}.sort
     @slaves_list.delete('master')
     @slave_index = 0
@@ -139,18 +140,20 @@ class Octopus::Proxy
     @groups.fetch(group.to_s, nil)
   end
 
-  def select_connection
-    @shards[shard_name].verify_active_connections! if @verify_connection
-    # Rails 3.1 sets automatic_reconnect to false when it removes
-    # connection pool.  Octopus can potentially retain a reference to a closed
-    # connection pool.  Previously, that would work since the pool would just
-    # reconnect, but in Rails 3.1 the flag prevents this.
+  # Rails 3.1 sets automatic_reconnect to false when it removes
+  # connection pool.  Octopus can potentially retain a reference to a closed
+  # connection pool.  Previously, that would work since the pool would just
+  # reconnect, but in Rails 3.1 the flag prevents this.  
+  def safe_connection(connection_pool)
     if Octopus.rails31? || Octopus.rails32?
-      if !@shards[shard_name].automatic_reconnect
-        @shards[shard_name].automatic_reconnect = true
-      end
+      connection_pool.automatic_reconnect ||= true
     end
-    @shards[shard_name].connection()
+    connection_pool.connection()
+  end
+
+  def select_connection
+    @shards[shard_name].verify_active_connections! if @verify_connection
+    safe_connection(@shards[shard_name])
   end
 
   def shard_name
@@ -224,6 +227,22 @@ class Octopus::Proxy
     return @shards[current_shard]
   end
 
+  def enable_query_cache!
+    @shards.each do |k, v|
+      c = safe_connection(v)
+      c.clear_query_cache_without_octopus
+      c.enable_query_cache!
+    end
+  end
+
+  def disable_query_cache!
+    @shards.each { |k, v| safe_connection(v).disable_query_cache! }
+  end
+
+  def clear_all_query_caches!
+    @shards.each { |k, v| safe_connection(v).clear_query_cache_without_octopus }
+  end
+
   protected
   def connection_pool_for(adapter, config)
     ActiveRecord::ConnectionAdapters::ConnectionPool.new(ActiveRecord::Base::ConnectionSpecification.new(adapter.dup, config))

data/lib/octopus/rails3/abstract_adapter.rb

@@ -21,6 +21,7 @@ module Octopus
 
       def self.included(base)
         base.alias_method_chain :initialize, :octopus_shard
+        base.alias_method_chain :clear_query_cache, :octopus
       end
 
       def octopus_shard
@@ -32,6 +33,16 @@ module Octopus
         @instrumenter = InstrumenterDecorator.new(self, @instrumenter)
       end
 
+      # Intercept calls to clear_query_cache and make sure that all
+      # query caches on all shards are invalidated, just to be safe.
+      def clear_query_cache_with_octopus
+        if Octopus.enabled?
+          ActiveRecord::Base.connection_proxy.clear_all_query_caches!
+        else
+          clear_query_cache_without_octopus
+        end
+      end
+
     end
   end
 end

data/lib/octopus/version.rb

@@ -1,3 +1,3 @@
 module Octopus
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/spec/config/shards.yml

@@ -76,6 +76,14 @@ production_replicated:
       <<: *mysql
 
 
+replicated_with_one_slave:
+  replicated: true
+  shards:
+    slave1:
+      database: octopus_shard_2
+      <<: *mysql
+
+
 production_fully_replicated:
   replicated: true
   shards:

data/spec/octopus/proxy_spec.rb

@@ -239,7 +239,7 @@ describe Octopus::Proxy do
     end
   end
 
-  if !Octopus.rails30? and !Octopus.rails31?
+  if !Octopus.rails31?
     describe "saving multiple sharded objects at once" do
       before :each do
         @p = MmorpgPlayer.using(:alone_shard).create!(:player_name => 'Thiago')

data/spec/octopus/replication_spec.rb

@@ -26,6 +26,28 @@ describe "when the database is replicated" do
     end
   end
 
+  describe "When enabling the query cache" do
+    include_context "with query cache enabled"
+
+    it "should do the queries with cache" do
+      OctopusHelper.using_environment :replicated_with_one_slave  do
+        cat1 = Cat.using(:master).create!(:name => "Master Cat 1")
+        cat2 = Cat.using(:master).create!(:name => "Master Cat 2")
+        Cat.using(:master).find(cat1.id).should eq(cat1)
+        Cat.using(:master).find(cat1.id).should eq(cat1)
+        Cat.using(:master).find(cat1.id).should eq(cat1)
+
+        cat3 = Cat.using(:slave1).create!(:name => "Slave Cat 3")
+        cat4 = Cat.using(:slave1).create!(:name => "Slave Cat 4")
+        Cat.find(cat3.id).id.should eq(cat3.id)
+        Cat.find(cat3.id).id.should eq(cat3.id)
+        Cat.find(cat3.id).id.should eq(cat3.id)
+
+        counter.query_count.should eq(16)
+      end
+    end
+  end
+
   it "should allow #using syntax to send queries to master" do
     Cat.create!(:name => "Master Cat")
 
@@ -40,6 +62,13 @@ describe "when the database is replicated" do
       Cat.count.should == 0
     end
   end
+
+  def active_support_subscribed(callback, *args, &block)
+    subscriber = ActiveSupport::Notifications.subscribe(*args, &callback)
+    yield
+  ensure
+    ActiveSupport::Notifications.unsubscribe(subscriber)
+  end
 end
 
 

data/spec/support/query_count.rb

@@ -0,0 +1,19 @@
+module ActiveRecord
+  class QueryCounter
+
+    attr_accessor :query_count
+
+    def initialize
+      @query_count = 0
+    end
+
+    def to_proc
+      lambda(&method(:callback))
+    end
+
+    def callback(name, start, finish, message_id, values)
+      @query_count += 1 unless %w(CACHE SCHEMA).include?(values[:name])
+    end
+
+  end
+end

data/spec/support/shared_contexts.rb

@@ -0,0 +1,21 @@
+shared_context "with query cache enabled" do
+  let!(:counter) { ActiveRecord::QueryCounter.new }
+
+  before(:each) do
+    ActiveRecord::Base.connection.enable_query_cache!
+    counter.query_count = 0
+  end
+
+  after(:each) do 
+    ActiveRecord::Base.connection.disable_query_cache!
+  end
+
+  around(:each) do |example|
+    # TODO - Support Rails 3.0
+    if Octopus.rails31? || Octopus.rails32?
+      active_support_subscribed(counter.to_proc, 'sql.active_record') do 
+        example.run
+      end
+    end
+  end
+end

metadata

@@ -1,193 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ar-octopus
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
+version: !ruby/object:Gem::Version
+  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - Thiago Pradi
 - Mike Perham
 - Gabriel Sobrinho
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-10-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
-  prerelease: false
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
-  prerelease: false
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: mysql2
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
   name: pg
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 11
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.11.0
-  prerelease: false
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.4
-  prerelease: false
   type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: pry
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: appraisal
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 3
-        - 8
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.8
-  prerelease: false
   type: :development
-  requirement: *id009
-description: This gem allows you to use sharded databases with ActiveRecord. This also provides a interface for replication and for running migrations with multiples shards.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+description: This gem allows you to use sharded databases with ActiveRecord. This
+  also provides a interface for replication and for running migrations with multiples
+  shards.
+email:
 - tchandy@gmail.com
 - mperham@gmail.com
 - gabriel.sobrinho@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .ruby-version
 - .travis.yml
 - Appraisals
 - Gemfile
@@ -195,7 +171,6 @@ files:
 - Rakefile
 - TODO.txt
 - ar-octopus.gemspec
-- gemfiles/rails30.gemfile
 - gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
 - init.rb
@@ -207,13 +182,11 @@ files:
 - lib/octopus/migration.rb
 - lib/octopus/model.rb
 - lib/octopus/proxy.rb
-- lib/octopus/rails3.0/arel.rb
-- lib/octopus/rails3.0/association.rb
-- lib/octopus/rails3.1/singular_association.rb
 - lib/octopus/rails3.2/persistence.rb
 - lib/octopus/rails3/abstract_adapter.rb
 - lib/octopus/rails3/log_subscriber.rb
 - lib/octopus/rails3/persistence.rb
+- lib/octopus/rails3/singular_association.rb
 - lib/octopus/railtie.rb
 - lib/octopus/scope_proxy.rb
 - lib/octopus/version.rb
@@ -323,45 +296,41 @@ files:
 - spec/support/database_connection.rb
 - spec/support/database_models.rb
 - spec/support/octopus_helper.rb
+- spec/support/query_count.rb
+- spec/support/shared_contexts.rb
 - spec/tasks/octopus.rake_spec.rb
 homepage: https://github.com/tchandy/octopus
-licenses: []
+licenses:
+- MIT
+metadata: {}
+post_install_message: ! 'Important: If you are upgrading from < Octopus 0.5.0 you
+  need to run:
 
-post_install_message: |-
-  Important: If you are upgrading from < Octopus 0.5.0 you need to run:
   $ rake octopus:copy_schema_versions
-  
-  Octopus now stores schema version information in each shard and migrations will not work properly unless this task is invoked.
-rdoc_options: []
 
-require_paths: 
+
+  Octopus now stores schema version information in each shard and migrations will
+  not work properly unless this task is invoked.'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy Database Sharding for ActiveRecord
-test_files: 
+test_files:
 - spec/config/shards.yml
 - spec/migrations/10_create_users_using_replication.rb
 - spec/migrations/11_add_field_in_all_slaves.rb
@@ -391,4 +360,6 @@ test_files:
 - spec/support/database_connection.rb
 - spec/support/database_models.rb
 - spec/support/octopus_helper.rb
+- spec/support/query_count.rb
+- spec/support/shared_contexts.rb
 - spec/tasks/octopus.rake_spec.rb

data/gemfiles/rails30.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.0.11"
-gem "mysql2", "< 0.3"
-
-gemspec :path=>"../"

data/lib/octopus/rails3.0/arel.rb

@@ -1,13 +0,0 @@
-class Arel::Visitors::ToSql
-  def quote value, column = nil
-    @connection.quote value, column
-  end
-
-  def quote_table_name name
-    @connection.quote_table_name(name)
-  end
-
-  def quote_column_name name
-    Arel::Nodes::SqlLiteral === name ? name : @connection.quote_column_name(name)
-  end
-end

data/lib/octopus/rails3.0/association.rb

@@ -1,86 +0,0 @@
-module Octopus
-  module Rails3
-    module Association
-      def association_accessor_methods(reflection, association_proxy_class)
-        super
-
-        define_method("#{reflection.name}_with_octopus") do |*params|
-          reload_connection
-          send("#{reflection.name}_without_octopus", *params)
-        end
-
-        define_method("loaded_#{reflection.name}_with_octopus?") do
-          reload_connection
-          send("loaded_#{reflection.name}_without_octopus?")
-        end
-
-        define_method("#{reflection.name}_with_octopus=") do |new_value|
-          reload_connection
-          send("#{reflection.name}_without_octopus=", new_value)
-        end
-
-        define_method("set_#{reflection.name}_target_with_octopus") do |target|
-          reload_connection
-          send("set_#{reflection.name}_target_without_octopus", target)
-        end
-
-        alias_method_chain reflection.name, "octopus"
-        alias_method_chain "loaded_#{reflection.name}?", "octopus"
-        alias_method_chain "#{reflection.name}=", "octopus"
-        alias_method_chain "set_#{reflection.name}_target", "octopus"
-      end
-
-      def collection_reader_method(reflection, association_proxy_class)
-        super
-
-        define_method("#{reflection.name}_with_octopus") do |*params|
-          reload_connection
-          send("#{reflection.name}_without_octopus", *params)
-        end
-
-        define_method("#{reflection.name.to_s.singularize}_ids_with_octopus") do
-          reload_connection
-          send("#{reflection.name.to_s.singularize}_ids_without_octopus")
-        end
-
-        alias_method_chain reflection.name, "octopus"
-        alias_method_chain "#{reflection.name.to_s.singularize}_ids", "octopus"
-      end
-
-      def collection_accessor_methods(reflection, association_proxy_class, writer = true)
-        super
-
-        if writer
-          define_method("#{reflection.name}_with_octopus=") do |new_value|
-            reload_connection
-            send("#{reflection.name}_without_octopus=", new_value)
-          end
-
-          define_method("#{reflection.name.to_s.singularize}_ids_with_octopus=") do |new_value|
-            reload_connection
-            send("#{reflection.name.to_s.singularize}_ids_without_octopus=", new_value)
-          end
-
-          alias_method_chain "#{reflection.name}=", "octopus"
-          alias_method_chain "#{reflection.name.to_s.singularize}_ids=", "octopus"
-        end
-      end
-
-      def association_constructor_method(constructor, reflection, association_proxy_class)
-        super
-
-        define_method("#{constructor}_#{reflection.name}_with_octopus") do |*params|
-          reload_connection
-          result = send("#{constructor}_#{reflection.name}_without_octopus", *params)
-
-          result.current_shard = current_shard if should_set_current_shard?
-          result
-        end
-
-        alias_method_chain "#{constructor}_#{reflection.name}", "octopus"
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.extend(Octopus::Rails3::Association)