global_uid 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc0bc131f043570b57245aa1b807b4f7e74dd87aefc17db5b403d2d7e615f5e5
-  data.tar.gz: a0048d1ebec4af921f0fee12db3ade0e37bfcc5af282f94e61f197fdb182ff17
+  metadata.gz: 98380377dabc356230fb10d765ea683777d64e89626597fd030c848f4e3e2048
+  data.tar.gz: c361fed08769004591c58f40ca4b79d67f6aec19e0e1f22d2bb357f9392edc55
 SHA512:
-  metadata.gz: df66f3a63d4b00c946e76f41cb18817e3790ba229be243ba1abf6cbc555cec1d778316782afdb87ac9769d47cef151b41e3a3b0f47b8640b0ccc6fb9e5f0dcbe
-  data.tar.gz: 987393d901a7d49897a4362c58a88d851695af84fdc137c307781acdc3b21dd00537608d241814d7293e4d12e3c26fe3ad96dfa085228ecbcff6d6edfb69fe1f
+  metadata.gz: '0298584b7b7a01105723caffe1770b4c1a448798335f38a2de67cce712031d9232267f4fdefba1fc7e2d642ec624c750e5b6b24d5ea1c0e57639fc40af588015'
+  data.tar.gz: 7f69e85213c62c30b14679993fc86eedf58e737b31557812a3de53a607f246b755287ddf9ded039836069cf3ed41572acf341ed298bfba56f23c5ccc84d76f92

data/lib/global_uid/server.rb

@@ -93,11 +93,7 @@ module GlobalUid
     end
 
     def mysql2_connection(name)
-      raise "No id server '#{name}' configured in database.yml" unless ActiveRecord::Base.configurations.to_h.has_key?(name)
-      config = ActiveRecord::Base.configurations.to_h[name]
-      c = config.symbolize_keys
-
-      raise "No global_uid support for adapter #{c[:adapter]}" if c[:adapter] != 'mysql2'
+      config = mysql2_config(name)
 
       Timeout.timeout(connection_timeout, ConnectionTimeoutException) do
         ActiveRecord::Base.mysql2_connection(config)
@@ -110,6 +106,27 @@ module GlobalUid
       nil
     end
 
+    if ActiveRecord.version < Gem::Version.new('6.1.0')
+      def mysql2_config(name)
+        raise "No id server '#{name}' configured in database.yml" unless ActiveRecord::Base.configurations.to_h.has_key?(name)
+        config = ActiveRecord::Base.configurations.to_h[name]
+
+        c = config.symbolize_keys
+        raise "No global_uid support for adapter #{c[:adapter]}" if c[:adapter] != 'mysql2'
+
+        config
+      end
+    else
+      def mysql2_config(name)
+        config = ActiveRecord::Base.configurations.configs_for(env_name: name, name: 'primary')
+
+        raise "No id server '#{name}' configured in database.yml" if config.nil?
+        raise "No global_uid support for adapter #{config.adapter}" if config.adapter != 'mysql2'
+
+        config.configuration_hash
+      end
+    end
+
     def validate_connection_increment
       db_increment = connection.select_value("SELECT @@auto_increment_increment")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,7 +22,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.2
 signing_key:
 specification_version: 4
 summary: GUID