seamless_database_pool 1.0.11 → 1.0.12

data/lib/active_record/connection_adapters/seamless_database_pool_adapter.rb

@@ -278,12 +278,12 @@ module ActiveRecord
         available = @available_read_connections.last
         if available.expired?
           begin
-            @logger.info("Adding dead database connection back to the pool: #{available.inspect}") if @logger
+            @logger.info("Adding dead database connection back to the pool") if @logger
             available.reconnect!
           rescue => e
             # Couldn't reconnect so try again in a little bit
             if @logger
-              @logger.warn("Failed to reconnect with: #{available.inspect}")
+              @logger.warn("Failed to reconnect to database when adding connection back to the pool")
               @logger.warn(e)
             end
             available.expires = 30.seconds.from_now

data/spec/connection_adapters_spec.rb

@@ -14,7 +14,6 @@ describe "Test connection adapters" do
   
         before(:all) do
           ActiveRecord::Base.establish_connection('adapter' => "sqlite3", 'database' => ":memory:")
-          model.use_database_connection(adapter)
           model.create_tables
         end
   
@@ -143,7 +142,7 @@ describe "Test connection adapters" do
           
           it "should send tables to the read connection" do
             results = connection.tables
-            results.should == ["test_models"]
+            results.should == [model.table_name]
             results.should == master_connection.tables
             results.should be_read_only
           end
@@ -205,6 +204,23 @@ describe "Test connection adapters" do
               end
             end
           end
+          
+          it "should properly dump the schema" do
+            schema = <<-EOS
+              ActiveRecord::Schema.define(:version => 0) do
+                create_table "#{model.table_name}", :force => true do |t|
+                  t.string  "name"
+                  t.integer "value"
+                end
+              end
+            EOS
+            schema = schema.gsub(/^ +/, '').gsub(/ +/, ' ').strip
+            
+            io = StringIO.new
+            ActiveRecord::SchemaDumper.dump(connection, io)
+            generated_schema = io.string.gsub(/^#.*$/, '').gsub(/\n+/, "\n").gsub(/^ +/, '').gsub(/ +/, ' ').strip
+            generated_schema.should == schema
+          end
         end
       end
     end

data/spec/database.yml

@@ -27,6 +27,8 @@ postgresql:
 mysql:
   adapter: seamless_database_pool
   database: seamless_database_pool_test
+  username: root
+  password:
   master:
     adapter: mysql
     pool_weight: 0

data/spec/test_model.rb

@@ -1,5 +1,7 @@
 module SeamlessDatabasePool
   class TestModel < ActiveRecord::Base
+    self.abstract_class = true
+    
     class << self
       def database_configs
         adapters = ENV['TEST_ADAPTERS'].blank? ? [] : ENV['TEST_ADAPTERS'].split(/\s+/)
@@ -15,10 +17,12 @@ module SeamlessDatabasePool
       end
       
       def db_model(db_name)
-        model_class_name = db_name.classify
+        model_class_name = "#{db_name.classify}TestModel"
         unless const_defined?(model_class_name)
           klass = Class.new(self)
           const_set(model_class_name, klass)
+          klass = const_get(model_class_name)
+          klass.use_database_connection(db_name)
         end
         const_get(model_class_name)
       end
@@ -28,10 +32,14 @@ module SeamlessDatabasePool
           t.column :name, :string
           t.column :value, :integer
         end unless table_exists?
+        connection.clear_cache!
+        undefine_attribute_methods
       end
  
       def drop_tables
         connection.drop_table(table_name)
+        connection.clear_cache!
+        undefine_attribute_methods
       end
       
       def cleanup_database!

metadata

@@ -1,94 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: seamless_database_pool
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.12
   prerelease: 
-  version: 1.0.11
 platform: ruby
-authors: 
+authors:
 - Brian Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-21 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70158253976860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70158253976860
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70158253974440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70158253974440
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70158253971880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70158253971880
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70158253970680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70158253970680
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: &70158253960160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: pg
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70158253960160
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: &70158253958100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70158253958100
 description: 
 email: brian@embellishedvisions.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - MIT-LICENSE
 - README.rdoc
-files: 
+files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -107,40 +103,29 @@ files:
 - spec/spec_helper.rb
 - spec/test_adapter/active_record/connection_adapters/read_only_adapter.rb
 - spec/test_model.rb
-has_rdoc: true
 homepage: http://github.com/bdurand/seamless_database_pool
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Add support for master/slave database clusters in ActiveRecord to improve performance.
-test_files: 
-- spec/connection_adapters_spec.rb
-- spec/connection_statistics_spec.rb
-- spec/controller_filter_spec.rb
-- spec/seamless_database_pool_adapter_spec.rb
-- spec/seamless_database_pool_spec.rb
-- spec/spec_helper.rb
-- spec/test_adapter/active_record/connection_adapters/read_only_adapter.rb
-- spec/test_model.rb
+summary: Add support for master/slave database clusters in ActiveRecord to improve
+  performance.
+test_files: []