active_record_shards 3.0.0.beta3 → 3.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17dba82c91deb75e0c4f6e1af01452c600040ed3
-  data.tar.gz: 96c14a1742d6845e5e254994333ac11f4fc83db5
+  metadata.gz: 6e2b0d1263e6c2ba07f208b1c46f252e254cd341
+  data.tar.gz: b5e951385e67395baaf4e6408441fda6350afc1f
 SHA512:
-  metadata.gz: f96beccd8cb2ac6c9e16593be652d1584b6861691a1fc32a27b89cadd779c3502c43f3a9f25836ef60353791e2f9b03796dbd462012554a604678eb11d468395
-  data.tar.gz: e0ae006b57c59fc73c188bd92b59e88a236a9d2dad6b4a5f32d06dc85b200e742972e6917ee80e7012af4e4d09b6aba2a487605f317d84474a7caad973868e5f
+  metadata.gz: f194e8c0726304edff05e03f501b8edf42dff62ea28bdbe90293b93d10cae94499471934387401682dcb7b69f63f5c4eeb428b14ea91da11d3c54a78d964a4e5
+  data.tar.gz: c87fd04a0217d32e9399f58b9f45d6f9e483444e21285c0d1ad29bf4baad3c6c165d988c3b3fd7800db7a950f63efa8a4f0d829a9c13290fec381230573661bc

data/lib/active_record_shards/configuration_parser.rb

@@ -1,8 +1,12 @@
+require 'active_support/core_ext'
+
 module ActiveRecordShards
   module ConfigurationParser
     module_function
 
     def explode(conf)
+      conf = conf.deep_dup
+
       conf.to_a.each do |env_name, env_config|
         if shards = env_config.delete('shards')
           env_config['shard_names'] = shards.keys

data/lib/active_record_shards/connection_switcher.rb

@@ -203,7 +203,7 @@ module ActiveRecordShards
     end
 
     def columns_with_default_shard
-      if is_sharded? && current_shard_id.nil?
+      if is_sharded? && current_shard_id.nil? && table_name != ActiveRecord::Migrator.schema_migrations_table_name
         on_first_shard { columns_without_default_shard }
       else
         columns_without_default_shard

data/lib/active_record_shards/tasks.rb

@@ -5,13 +5,17 @@ require 'active_record_shards'
 end
 
 namespace :db do
-  desc 'Drops the database for the current RAILS_ENV including shards and slaves'
+  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")
         begin
-          drop_database(conf)
+          if ActiveRecord::VERSION::MAJOR >= 4
+            ActiveRecord::Tasks::DatabaseTasks.drop(conf)
+          else
+            drop_database(conf)
+          end
         rescue Exception => e
           puts "Couldn't drop #{conf['database']} : #{e.inspect}"
         end
@@ -24,14 +28,19 @@ namespace :db do
     Rake::Task["db:setup"].invoke
   end
 
-  desc "Create the database defined in config/database.yml for the current RAILS_ENV including shards and slaves"
+  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")
-        create_database(conf)
+        if ActiveRecord::VERSION::MAJOR >= 4
+          ActiveRecord::Tasks::DatabaseTasks.create(conf)
+        else
+          create_database(conf)
+        end
       end
     end
+    ActiveRecord::Base.establish_connection(env_name)
   end
 
   desc "Raises an error if there are pending migrations"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta3
+  version: 3.0.0.beta4
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord