janus-ar 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c569e79520f7bb9b717f510e846d92be2ece788e5a435877490caf446bb6f88
-  data.tar.gz: 6989399531b92524bd8ed5e23422a2c9e619bb2c074f244c7ab74c55c208c0f1
+  metadata.gz: 02c92206a54d203c923936849e6fd8c5621c8da702c4f0e327680a6084f86a75
+  data.tar.gz: b0e4746b02cf9e1bdf123cf7ad8b0e5ec0485bbb1433d6e9b6e98483b2afd132
 SHA512:
-  metadata.gz: 4245ff2a4dfb38364e61eacd0482831e1767d60c9300eb167e8bda22b765531121876de5190c58ac8cc0ea5fccaedd0adf8b21791add9e311d86e35ea9172c44
-  data.tar.gz: 6e2d88feb5bae96f25c6ef9685f2c310db92c9098728ca9eb0af63f53fb2a6c981ab17a51b1797e4d2ba625ac931d127d05838cae095526c7f588b4b08bd1998
+  metadata.gz: 228491371a233938062950c382d31e5a68bbf6e60c20c659ffd97920e2b2b8beaab5df874ddc6d4ce5eee15a7efab7776eae5fe6e547e60a91173ba72341d654
+  data.tar.gz: 9bd2c0749f350bfe663d4d64b2125c6fcc7bb10293b712178b2a6361f6f5a7ae4178b3651c0bca332e35a9180e555af9fb6c7f6e618a1f5911eb8427daf3b34b

data/.gitignore

@@ -0,0 +1 @@
+janus-ar-*.gem

data/.rubocop.yml

@@ -9,4 +9,7 @@ Rails/Delegate:
 
 Metrics/BlockLength:
   Exclude:
-    - spec/**/*
+    - spec/**/*
+
+Metrics/AbcSize:
+  Max: 22

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    janus-ar (0.3.0)
+    janus-ar (0.4.0)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -35,10 +35,10 @@ Update your **database.yml** as follows:
 ```yml
 development:
   adapter: janus_mysql2
+  database: database_name
   janus:
     primary:
       <<: *default
-      database: database_name
       host: primary-host.local
     replica:
       <<: *default

data/lib/active_record/connection_adapters/janus_mysql2_adapter.rb

@@ -30,7 +30,6 @@ module ActiveRecord
 
         @replica_config = args[0][:janus]['replica']
         args[0] = args[0][:janus]['primary']
-
         super(*args)
         @connection_parameters ||= args[0]
         update_config
@@ -89,11 +88,14 @@ module ActiveRecord
       end
 
       def can_go_to_replica?(sql)
-        return false if Janus::Context.use_primary? ||
-                        open_transactions.positive? ||
-                        SQL_PRIMARY_MATCHERS.any? { |matcher| sql =~ matcher }
+        !should_go_to_primary?(sql)
+      end
 
-        true
+      def should_go_to_primary?(sql)
+        Janus::Context.use_primary? ||
+          write_query?(sql) ||
+          open_transactions.positive? ||
+          SQL_PRIMARY_MATCHERS.any? { |matcher| sql =~ matcher }
       end
 
       def send_to_replica(sql, connection: nil, method: :exec_query)
@@ -106,7 +108,7 @@ module ActiveRecord
       end
 
       def write_query?(sql)
-        %w[INSERT UPDATE DELETE LOCK].include?(sql.split(' ').first)
+        %w[INSERT UPDATE DELETE LOCK CREATE GRANT].include?(sql.split(' ').first)
       end
 
       def replica_connection

data/lib/janus/version.rb

@@ -4,7 +4,7 @@ module Janus
   unless defined?(::Janus::VERSION)
     module VERSION
       MAJOR = 0
-      MINOR = 4
+      MINOR = 6
       PATCH = 0
       PRE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: janus-ar
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Lloyd Watkin
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
+- ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md