master_slave 3.0.0 → 3.2.0

data/lib/master_slave/connection_handler.rb

@@ -25,20 +25,27 @@ module MasterSlave
       def setup_connection
         ActiveRecord::Base.slave_connection_names ||= []
         MasterSlave.config.slave_names.each do |slave_name|
+          # activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +128
           ActiveRecord::Base.slave_connection_names << slave_name.to_s.strip
           configuration = MasterSlave.config.slave_config(slave_name).symbolize_keys
-          unless configuration.key?(:adapter) then raise AdapterNotSpecified, "database configuration does not specify adapter" end
 
-          adapter_method = "#{configuration[:adapter]}_connection"
-          unless ActiveRecord::Base.respond_to?(adapter_method)
+          resolver = ActiveRecord::Base::ConnectionSpecification::Resolver.new(configuration, nil)
+
+          spec = resolver.spec
+
+          unless ActiveRecord::Base.respond_to?(spec.adapter_method)
             raise AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"
           end
 
-          # remove_connection 时会调用方法内部 ar_proxy.name
           ar_proxy = ArProxy.new(connection_pool_name(slave_name))
+
+          # activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb +179
+          # activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +424
+          # remove_connection 时会调用方法内部 ar_proxy.name
           ActiveRecord::Base.remove_connection(ar_proxy)
 
-          spec = ActiveRecord::Base::ConnectionSpecification.new(configuration, adapter_method)
+          # activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +373
+          # establish_connection 时，使用 ar_proxy.name
           ActiveRecord::Base.connection_handler.establish_connection ar_proxy.name, spec
         end
       end

data/lib/master_slave/railtie.rb

@@ -3,13 +3,13 @@ module MasterSlave
 
     config.after_initialize do
       if File.exist?(MasterSlave::Configuration.config_file)
-        puts "\033[32mmaster_slave is on!\033[0m"
+        Rails.logger.info "\033[32mmaster_slave is on!\033[0m"
         ActiveRecord::Base.send :include, MasterSlave::Base
         MasterSlave::ConnectionHandler.setup
       else
-        puts "\033[31mNo such file #{MasterSlave::Configuration.config_file}\033[0m"
-        puts "\033[31mPlease execute `rails g master_slave:config`\033[0m"
-        puts "\033[31mmaster_slave is off!\033[0m"
+        Rails.logger.error "\033[31mNo such file #{MasterSlave::Configuration.config_file}\033[0m"
+        Rails.logger.error "\033[31mPlease execute `rails g master_slave:config`\033[0m"
+        Rails.logger.error "\033[31mmaster_slave is off!\033[0m"
       end
     end
 

data/lib/master_slave/version.rb

@@ -1,3 +1,3 @@
 module MasterSlave
-  VERSION = '3.0.0'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: master_slave
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -16,10 +16,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
@@ -27,10 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
 description: mysql separate read and write.