fresh_connection 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb0b581ea9aecc3c27b3d32a6a14c93ee3a543f
-  data.tar.gz: 0323e5cd09c34895529a49d339c00797c45cfa07
+  metadata.gz: 0d6bb81775c1ffa074f52f58fad152f9d02d8498
+  data.tar.gz: 622671bc7d23b5a88f92eb8f4430b5b15014d917
 SHA512:
-  metadata.gz: 5163c26ac8a920f5b5f3485d4049b147ae826075ba8cfb6c2b1f6adf2b3e9966c046304932851c2b0b64228892c08569c2b5d81d7ef0bd21ae5db025e2f28bbc
-  data.tar.gz: 71e16efe75624fd56cf02374bb8db2fa5e94c3038c3b044dbb8df1ba689ed797f1e5254bb65fd31a9d4276125c876f13edb3db4d5dc8142ce002ae5ec18f125d
+  metadata.gz: 6a7de0aff8b2b35291005f1236bf5e6d87e4285a5d54b6619eebebf2a1edc5a83f750abfcc2795ee070edc7c97d4aec2796d5e5f3622d7293bdfab58ab829cdb
+  data.tar.gz: 3799709992b9fbd0cb4c8cac11db8db34601fec8333dbe41bd25c51eeddadec36f5153a9fc39aa5548e373e8175e938760e471d11bae77edb04aecb63d63891b

data/lib/fresh_connection/extend/ar_abstract_adapter.rb

@@ -3,12 +3,62 @@ module FreshConnection
     module ArAbstractAdapter
       def self.prepended(base)
         base.send :attr_writer, :replica_group
+        base.send :attr_accessor, :master_connection
       end
 
       def log(*args)
         args[1] = "[#{@replica_group}] #{args[1]}" if defined?(@replica_group)
         super
       end
+
+      def query_cache
+        return @query_cache unless master_connection
+        master_connection.query_cache
+      end
+
+      def query_cache_enabled
+        return @query_cache_enabled unless master_connection
+        master_connection.query_cache_enabled
+      end
+
+      def cache(&block)
+        return super unless master_connection
+        master_connection.cache(&block)
+      end
+
+      def enable_query_cache!
+        return super unless master_connection
+        master_connection.enable_query_cache!
+      end
+
+      def disable_query_cache!
+        return super unless master_connection
+        master_connection.disable_query_cache!
+      end
+
+      def uncached(&block)
+        return super unless master_connection
+        master_connection.uncached(&block)
+      end
+
+      def clear_query_cache
+        return super unless master_connection
+        master_conection.clear_query_cache
+      end
+
+      def select_all(*args)
+        return super unless master_connection
+        @query_cache_enabled = master_connection.query_cache_enabled
+        super
+      end
+
+      private
+
+      def cache_sql(*args)
+        return super unless master_connection
+        @query_cache = master_connection.query_cache
+        super
+      end
     end
   end
 end

data/lib/fresh_connection/extend/ar_base.rb

@@ -6,15 +6,13 @@ module FreshConnection
   module Extend
     module ArBase
       def connection
-        if FreshConnection::AccessControl.replica_access?
-          if logger && logger.debug?
-            replica_connection.tap{|c| c.replica_group = replica_group }
-          else
-            replica_connection
-          end
-        else
-          super
-        end
+        master_c = super
+        return master_c unless FreshConnection::AccessControl.replica_access?
+
+        replica_c = replica_connection
+        replica_c.master_connection = master_c
+        replica_c.replica_group = replica_group if logger && logger.debug?
+        replica_c
       end
 
       def read_master

data/lib/fresh_connection/version.rb

@@ -1,4 +1,4 @@
 module FreshConnection
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: FreshConnection supports connections with configured replica servers.