active_record_shards 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e366fb2641df4dbf79bf6dc6a586dab121426eb7
-  data.tar.gz: 9f9a8a1c0f15c4796b9c7b41ca7286f84d8d0966
+  metadata.gz: cca0634041dcb99ffe8ace1ac4376f10d2f716e6
+  data.tar.gz: e4620fa793c96ba1c94808ac96bf00fb55304cec
 SHA512:
-  metadata.gz: f8e914d91a0ecd064a64f11458b9577789577e74eaafe0f1672fb88a763e84bc01553fbe87423caaf30d9512d90d91e10fda1d731c47b304257b4e0904d920c2
-  data.tar.gz: 4e3e5201d46a32ba780329f8f170dafcdc0da5e493a03b0e2781afc0519ce5dba0a1eaeb289929a1499dd3a6632ac4443cd5e57f88d12e1ff664d2535c374304
+  metadata.gz: 6c9d8698dd41d4cba95a361bf828f130165a84e1ae3f513b48a22729f6c9cda49324798ab2ba32a547db8363682e33bc835b791a390621790b6894a4eb057b24
+  data.tar.gz: da9be40c70b4840c099d059f8d10b6fe3b08ae74490b1735a0bcc15e7aa007727f39758a89890e9054993e1e2df756229be9b77f0c3095ecc21605abcdbb3280

data/README.md

@@ -3,7 +3,7 @@
 ActiveRecord Shards is an extension for ActiveRecord that provides support for sharded database and slaves. Basically it is just a nice way to
 switch between database connections. We've made the implementation very small, and have tried not to reinvent any wheels already present in ActiveRecord.
 
-ActiveRecord Shards has used and tested on Rails 3.0.x, 3.2.x, and 4.1.x and has in some form or another been used in production on a large rails app for
+ActiveRecord Shards has used and tested on Rails 3.0.x, 3.2.x, 4.0.x, and 4.1.x and has in some form or another been used in production on a large rails app for
 more than a year.
 
 ## Installation
@@ -43,7 +43,7 @@ basically connections inherit configuration from the parent configuration file.
 ## Usage
 
 Normally you have some models that live on a shared database, and you might need to query this data in order to know what shard to switch to.
-All the model that live on the shared database must be marked as not\_sharded:
+All the models that live on the shared database must be marked as not\_sharded:
 
     class Account < ActiveRecord::Base
       not_sharded
@@ -55,7 +55,7 @@ All the model that live on the shared database must be marked as not\_sharded:
       belongs_to :account
     end
 
-So in this setup the accounts live on the shared database, but the projects are sharded. If accounts had a shard\_id column, you could lookup the account
+So in this setup the accounts live on the shared database, but the projects are sharded. If accounts have a shard\_id column, you could lookup the account
 in a rack middleware and switch to the right shard:
 
     class AccountMiddleware
@@ -80,7 +80,7 @@ in a rack middleware and switch to the right shard:
       end
     end
 
-Any where in your app, you can switch to the slave databases, by wrapping you code an on\_slave block:
+You can switch to the slave databases at any point by wrapping your code in an on\_slave block:
 
     ActiveRecord::Base.on_slave do
       Account.find_by_big_expensive_query

data/lib/active_record_shards.rb

@@ -51,6 +51,7 @@ module ActiveRecordShards
     env = Rails.env if defined?(Rails.env)
     env ||= RAILS_ENV if Object.const_defined?(:RAILS_ENV)
     env ||= ENV['RAILS_ENV']
+    env ||= 'development'
   end
 end
 

data/lib/active_record_shards/tasks.rb

@@ -1,18 +1,17 @@
 require 'active_record_shards'
 
-%w[db:drop db:create db:abort_if_pending_migrations db:reset].each do |name|
+%w[db:drop db:create db:abort_if_pending_migrations db:reset db:test:purge].each do |name|
   Rake::Task[name].clear
 end
 
 namespace :db do
   desc 'Drops the database for the current RAILS_ENV including shards'
   task :drop => :load_config do
-    env_name = defined?(Rails.env) ? Rails.env : RAILS_ENV || 'development'
     ActiveRecord::Base.configurations.each do |key, conf|
-      if key.starts_with?(env_name) && !key.ends_with?("_slave")
+      if key.starts_with?(ActiveRecordShards.rails_env) && !key.ends_with?("_slave")
         begin
           if ActiveRecord::VERSION::MAJOR >= 4
-            ActiveRecord::Tasks::DatabaseTasks.drop(conf)
+            ActiveRecordShards::Tasks.root_connection(conf).drop_database(conf['database'])
           else
             drop_database(conf)
           end
@@ -30,17 +29,24 @@ namespace :db do
 
   desc "Create the database defined in config/database.yml for the current RAILS_ENV including shards"
   task :create => :load_config do
-    env_name = defined?(Rails.env) ? Rails.env : RAILS_ENV || 'development'
     ActiveRecord::Base.configurations.each do |key, conf|
-      if key.starts_with?(env_name) && !key.ends_with?("_slave")
+      if key.starts_with?(ActiveRecordShards.rails_env) && !key.ends_with?("_slave")
         if ActiveRecord::VERSION::MAJOR >= 4
-          ActiveRecord::Tasks::DatabaseTasks.create(conf)
+          begin
+            ActiveRecordShards::Tasks.root_connection(conf).create_database(conf['database'])
+          rescue ActiveRecord::StatementInvalid => ex
+            if ex.message.include?('database exists')
+              puts "#{conf['database']} already exists"
+            else
+              raise ex
+            end
+          end
         else
           create_database(conf)
         end
       end
     end
-    ActiveRecord::Base.establish_connection(env_name)
+    ActiveRecord::Base.establish_connection(ActiveRecordShards.rails_env)
   end
 
   desc "Raises an error if there are pending migrations"
@@ -61,4 +67,26 @@ namespace :db do
       end
     end
   end
+
+  namespace :test do
+    desc 'Purges the test databases by dropping and creating'
+    task :purge do
+      begin
+        saved_env = Rails.env
+        Rails.env = 'test'
+        Rake::Task['db:drop'].invoke
+        Rake::Task['db:create'].invoke
+      ensure
+        Rails.env = saved_env
+      end
+    end
+  end
+end
+
+module ActiveRecordShards
+  module Tasks
+    def self.root_connection(conf)
+      ActiveRecord::Base.send("#{conf['adapter']}_connection", conf.merge('database' => nil))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord