database_slave 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTczMzQxYWIxMjcxMjkxZmMxY2JjOTA2YWRlMDAwYWJkNTgwOWE2ZA==
+    Yzc1MGJlZjI3YWQ5M2VmNzEwNGNjZjFiNWVkMjRhMjQ1NjE3NjI3Nw==
   data.tar.gz: !binary |-
-    ZjEwZGY2NGRkZjViY2E2MmU3YjVjM2QxMjE5ZjYzMzJhNTFlMTJhYw==
+    ODE2NzI0MTNkYTdiMTQxYThmM2M0MjRjMDg4Y2EwOTg1ZjFhNWJkMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGEzMjczMzJlYWE1MmFlNjY1MDdlMGJkNDc4NGZlZGMzZDc3NzQ4NWFiMjJm
-    ZjBlODc3NjBiYTZmZTAwOThkZjc5YTYwNWVkZWNkYjM0ZWE5MjdlODM4NjY1
-    MGE2MzMwOGQ5OWRlZTFlN2EzODJhOTMxYmEwNDVhY2NiMjk3Y2E=
+    NDVhNjBiOGNjMzRmZTYyY2VjYjM3NTU5NmE5N2EyMDQxOGYxZGUxZTAwM2Nl
+    ZjJjMjIzN2Y2OGQyZmFlOGM0NWQ0ZWE3YWM5ZWRhOTM5Njk2MzZhOGY4ZDUw
+    ZTU5NzQ1MzM3N2FiOGFkZDQ5NThjZTBkNDNkM2ZmZDVhZWM5YWE=
   data.tar.gz: !binary |-
-    NGExMzQ4ZGY5MGU2YjRhZWYxNWEyMGI2MDM4MWU5MzEzYmM4M2Q1MGVmMTdk
-    NjZkMjc3ZTdjYmY3OWMzZDAxYjUwMjViNTJiODc2ODM1NjAwOTA0YzA0MWY0
-    ODJlNTVhOTUwZjZmZDAzMWQwMjcwOWUwOTQ4ODFlODRmN2RkN2U=
+    NmRiYmZmYThmN2RjODdiZWE2OTc4YWJhNGI3MGMwNWJiMjU0NDYxNjY4OWE4
+    MzAyM2VmOGZhMjhlYmQxZTMxMTE5NWVhNTU5YjhlYzk1ZDI0NjJmZmI0ZTUy
+    NmY3MTk5YmNlZjhlZjcxYjQzZjM3MmU0ZjI3ZjYwNjM4NDA1ZTY=

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.1.4 - 2015-11-03
+  * support Kaminari#paginate
+  * support ActiveRecord::Relation#except
+  * support execute pure SQL:
+      ActiveRecord::Base.using(:slave_name) do
+        ActiveRecord::Base.connection.execute()
+      end
 0.1.3 - 2015-04-01
   * bug fixed: raised error if Settings.using_slave is nil/false and using block
 0.1.2 - 2015-03-31

data/lib/database_slave/connection_handler.rb

@@ -14,7 +14,7 @@ module DatabaseSlave
     #   查看源码可知原方法传入的是self, 即当前调用类; 类自带了name方法.
     #
     #   同理, 这里我们也应该传入一个类名, 但self不是所期望的, 于是这里使用了
-    #   
+    #
     #     self.const_set(slave_name.to_s.strip.camelize, Class.new)
     #
     #   的方式动态地创建了一个类.
@@ -42,7 +42,7 @@ module DatabaseSlave
   end
 
   # === Description
-  # 
+  #
   # 当真正要执行一条SQL语句的时候, Rails会调用
   #   ActiveRecord::Base.connection
   #

data/lib/database_slave/relation.rb

@@ -24,8 +24,14 @@ module DatabaseSlave
     def using_slave(slave_name)
       if Settings.using_slave
         if block_given?
-          name = "DatabaseSlave::ConnectionHandler::#{slave_name.to_s.strip.camelize}"
-          ActiveRecord::Relation.class_variable_set(:@@slave_block_given, name)
+          db_name = "DatabaseSlave::ConnectionHandler::#{slave_name.to_s.strip.camelize}"
+          unless ActiveRecord::Base.slave_connections.include? db_name
+            raise DatabaseSlave::SlaveConnectionNotExists,
+              "#{slave_name} is not exists."
+          end
+
+          ActiveRecord::Relation.class_variable_set(:@@slave_block_given, db_name)
+          DatabaseSlave::RuntimeRegistry.current_slave_name ||= db_name
           begin
             yield
           ensure
@@ -154,6 +160,16 @@ module DatabaseSlave
         super
       end
     end if defined?(Rails)
+
+    # junk hack:
+    #   except会重新生成一个ActiveRecord::Relation对象, 所以except之前的using_slave就会失效,
+    # 这里hack一下添加进来.
+    #   (主要是为了解决kaminari分页时total_count仍然查询的是主库的问题.)
+    def except(*skips)
+      slave_name_snake = slave_name.to_s.underscore.split('/').last
+      return super if slave_name_snake.blank?
+      using_slave? ? super.using(slave_name_snake.to_sym) : super
+    end
   end
 
   def self.prepended(klass)

data/lib/database_slave/version.rb

@@ -1,3 +1,3 @@
 module DatabaseSlave
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_slave
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Hayden Wei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies: []
 description: Provide master and slave databases support for Rails applications.
 email: haidongrun@gmail.com