rails-sharding 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58f0c90d4f03a5f3aa3d4ff363cdac165c948f8f
-  data.tar.gz: d927face94cf2c001534c1353b322294ab1984b8
+  metadata.gz: 69312525d71ec25b0fa2776aba790c0a0d5e415d
+  data.tar.gz: b3525a64662f70f979fc240068f59c32b7a4e8dc
 SHA512:
-  metadata.gz: aa192b584a7ef8e58be570798c8d35ae04f17134791ed325a272f32dc5c32d3d847e60d06894da35093736d7c29f52bba32414b4d27b6d5107e2390e86c43221
-  data.tar.gz: cd329c1e3473f0f8a11f93bfc15bdd5278ebb041b8fccf6d5e2b7b496fa229919914b4080e4d97913e61ad090c6b67dfdf2a9c22e729cace4129e4f63e92bf95
+  metadata.gz: a6082f3cbebd5f0d3929377e0c0ef8b9420883be249ab1e5b82291b90a3e6212711c85332aae1f0e6b310e8cc60da768aee66d499caa1db1d902e0c54ae95858
+  data.tar.gz: c458509a03e3f32e0dc3f3e213056629d708e236474525726dbd22ee7fa5cad58a304ebc7e6dc59c68d26b7787141913709f002cfb2035fa298296dca7ba2bee

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.3.1
 services:
   - mysql
+  - postgresql
 before_install: gem install bundler -v 1.12.4
 before_script:
   - cp spec/fixtures/shards.yml.travis spec/fixtures/shards.yml

data/README.md

@@ -28,9 +28,13 @@ You can also use the block syntax, where all your queries inside will be directe
 You can also pick and choose which models will be shardable, so that all the models that are not shardable will still be retrieved from the master database, even if inside a using_shard block.
 
 ## Compatibility
-Gem version 1.x.x -> compatible with Rails 5.0
+Gem version 1.x.x:
+* Rails 5.0
+* Databases: MySQL, MariaDB, Postgres
 
-Gem version 0.1.1 -> compatible with Rails 4.2
+Gem version 0.x.x:
+* Rails 4.2
+* Databases: MySQL, MariaDB
 
 
 ## Installation
@@ -155,13 +159,16 @@ Rails::Sharding.setup do |config|
   config.establish_all_connections_on_setup = true
 
   # If true the method #using_shard will be mixed in ActiveRecord scopes. Put this to false if you don't want the gem to modify ActiveRecord
-  config.extend_active_record_scope = true,
+  config.extend_active_record_scope = true
+
+  # If true the query logs of ActiveRecord will be tagged with the corresponding shard you're querying
+  config.add_shard_tag_to_query_logs = true
 
   # Specifies where to find the definition of the shards configurations
-  config.shards_config_file = 'config/shards.yml',
+  config.shards_config_file = 'config/shards.yml'
 
   # Specifies where to find the migrations for each shard group
-  config.shards_migrations_dir = 'db/shards_migrations',
+  config.shards_migrations_dir = 'db/shards_migrations'
 
   # Specifies where to find the schemas for each shard group
   config.shards_schemas_dir = 'db/shards_schemas'
@@ -170,7 +177,15 @@ end
 
 ## Development and Contributing
 
-After checking out the repo, run `bundle` to install gems and run `rake db:test:prepare` to create the test shards. Then, run `rspec` to run the tests.
+After checking out the repo:
+
+1. Run `bundle` to install gems 
+
+1. Create your `spec/fixtures/shards.yml` based on the example on this same folder (you need MySQL and Postgres)
+
+1. Run `rake db:test:prepare` to create the test shards. 
+
+1. Run `rspec` to run the tests.
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/hsgubert/rails-sharding.
 

data/lib/rails/sharding/config.rb

@@ -34,7 +34,7 @@ module Rails::Sharding
     }
 
     DEFAULT_CONFIGS.each do |config_name, default_value|
-      self.cattr_accessor config_name
+      self.cattr_accessor config_name, instance_accessor: false
       self.send(config_name.to_s + '=', default_value)
     end
   end

data/lib/rails/sharding/connection_handler.rb

@@ -18,9 +18,6 @@ module Rails::Sharding
       self.setup unless defined? @@connection_handler
 
       configurations = (environment.nil? ? Core.configurations : Core.configurations(environment))
-      if configurations.nil?
-        raise Errors::ConfigNotFoundError, "Cannot find configuration for environment '#{environment}' in #{Config.shards_config_file}"
-      end
 
       shard_group_configurations = configurations[shard_group.to_s]
       if shard_group_configurations.nil?
@@ -105,14 +102,14 @@ module Rails::Sharding
       connection.singleton_class.send(:attr_accessor, :shard_tag)
       connection.shard_tag = shard_tag
 
-      # create an alias #original_execute, as a copy of the #execute for this connection
-      connection.singleton_class.send(:alias_method, :original_execute, :execute)
+      # create an alias #original_log, as a copy of the #log for this connection
+      connection.singleton_class.send(:alias_method, :original_log, :log)
 
-      # defines a new #execute that adds a tag to the log
+      # defines a new #log that adds a tag to the log
       class << connection
-        def execute(sql, name=nil)
+        def log(sql, name="SQL", binds=[], statement_name=nil, &block)
           name = (name.to_s + " (#{shard_tag})").strip
-          self.original_execute(sql, name)
+          self.original_log(sql, name, binds, statement_name, &block)
         end
       end
 

data/lib/rails/sharding/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Sharding
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/lib/tasks/rails-sharding.rake

@@ -37,7 +37,15 @@ shards_namespace = namespace :shards do
   task drop: [:environment, :check_protected_environments] do
     Rails::Sharding.for_each_shard(ENV["SHARD_GROUP"], ENV["SHARD"]) do |shard_group, shard, configuration|
       puts "== Dropping shard #{shard_group}:#{shard}"
+
+      # closes connections with shard before dropping (postgres requires this, mysql does not but there is no harm)
+      Rails::Sharding::ConnectionHandler.remove_connection(shard_group, shard)
+
       ActiveRecord::Tasks::DatabaseTasks.drop(configuration)
+
+      # reestablishes connection (because we removed before). You can do this even if the database does not exist yet,
+      # you just cannot retrieve the connection yet.
+      Rails::Sharding::ConnectionHandler.establish_connection(shard_group, shard)
     end
   end
 

data/rails-sharding.gemspec

@@ -30,5 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug", '~> 9'
   spec.add_development_dependency "mysql2", '~> 0'
-  spec.add_development_dependency "codeclimate-test-reporter", '~> 0'
+  spec.add_development_dependency "pg" # postgres driver
+  spec.add_development_dependency "codeclimate-test-reporter", '~> 1'
+  spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-sharding
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Henrique Gubert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,18 +94,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |-
@@ -166,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple and robust sharding for Rails, including Migrations and ActiveRecord