global_uid 4.0.0.beta1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a02789fdd302a6dbc207c590c60ce5b5909f8430e3432813af90d0373efd71b
-  data.tar.gz: 4cf5cd96f7b8855b546a1741c67dac5db6bb9b42cca3105bbe741423a2f2e66e
+  metadata.gz: f572a1f8e4c4e113bbe071eedc10d0311a89827adfa318dd577e3ec0b0fc12bd
+  data.tar.gz: 5075c514fbbb2f7fef0c38534ae094779d98b536924dcb5e19bb031f9273877e
 SHA512:
-  metadata.gz: 9e36b732bbea40d81423498b9ec9365e39688601691524b615a9b1cc0955b5dbcbf7b9788128bcb5673b08ccd37c49b44a7990d8a62f578358cd9ca8116d17fb
-  data.tar.gz: 73b1d6ff9808d94c14e1618b7da2137e0ad9c2b02442941b788519ebdc77daec7bfc8be67715ec16294062ea8ae334c1b437a198342f096623bd4f124585385c
+  metadata.gz: 7e2cdf576215f37dfdf18e132b86d80f088d6c40f7a751bdf0ed95965596389cfc61df046fa1aa0136b7f0f56c091a9cf8d869a3c2f06395bb44a4bf4362d5f1
+  data.tar.gz: c8f1c21a6259983780c860298b9ab119aeea9f9d4c5541940a78b5433dab9df6a01b26ca0567fb4b395cf375a84fe027a8c0efaaeb9feb77dc3ca9f63631fe84

data/lib/global_uid.rb

@@ -23,6 +23,22 @@ module GlobalUid
     yield configuration if block_given?
   end
 
+  def self.disable!
+    self.configuration.disabled = true
+  end
+
+  def self.enable!
+    self.configuration.disabled = false
+  end
+
+  def self.enabled?
+    !self.disabled?
+  end
+
+  def self.disabled?
+    self.configuration.disabled
+  end
+
   # @private
   def self.reset_configuration
     @configuration = nil

data/lib/global_uid/active_record_extension.rb

@@ -8,7 +8,7 @@ module GlobalUid
     end
 
     def global_uid_before_create
-      return if GlobalUid.configuration.disabled?
+      return if GlobalUid.disabled?
       return if self.class.global_uid_disabled
 
       self.id = self.class.generate_uid

data/lib/global_uid/configuration.rb

@@ -11,7 +11,6 @@ module GlobalUid
     attr_accessor :suppress_increment_exceptions
     attr_accessor :storage_engine
 
-    alias_method :disabled?, :disabled
     alias_method :connection_shuffling?, :connection_shuffling
     alias_method :suppress_increment_exceptions?, :suppress_increment_exceptions
 

data/lib/global_uid/migration_extension.rb

@@ -3,7 +3,7 @@ module GlobalUid
   module MigrationExtension
 
     def create_table(name, options = {}, &blk)
-      uid_enabled = !(GlobalUid.configuration.disabled? || options[:use_global_uid] == false)
+      uid_enabled = GlobalUid.enabled? && options[:use_global_uid] != false
 
       # rules for stripping out auto_increment -- enabled and not a "PK-less" table
       remove_auto_increment = uid_enabled && !(options[:id] == false)
@@ -20,9 +20,8 @@ module GlobalUid
         GlobalUid::Base.with_servers do |server|
           server.create_uid_table!(
             name: id_table_name,
-            uid_type: options[:uid_type] || "bigint(21) UNSIGNED",
-            start_id: options[:start_id] || 1,
-            storage_engine: GlobalUid.configuration.storage_engine
+            uid_type: options[:uid_type],
+            start_id: options[:start_id]
           )
         end
       end
@@ -30,7 +29,7 @@ module GlobalUid
     end
 
     def drop_table(name, options = {})
-      if !GlobalUid.configuration.disabled? && options[:use_global_uid] == true
+      if GlobalUid.enabled? && options[:use_global_uid] == true
         id_table_name = options[:global_uid_table] || GlobalUid::Base.id_table_from_name(name)
         GlobalUid::Base.with_servers do |server|
           server.drop_uid_table!(name: id_table_name)

data/lib/global_uid/server.rb

@@ -45,13 +45,16 @@ module GlobalUid
       @allocator = nil
     end
 
-    def create_uid_table!(name:, uid_type:, start_id:, storage_engine:)
+    def create_uid_table!(name:, uid_type: nil, start_id: nil)
+      uid_type ||= "bigint(21) UNSIGNED"
+      start_id ||= 1
+
       connection.execute("CREATE TABLE IF NOT EXISTS `#{name}` (
       `id` #{uid_type} NOT NULL AUTO_INCREMENT,
       `stub` char(1) NOT NULL DEFAULT '',
       PRIMARY KEY (`id`),
       UNIQUE KEY `stub` (`stub`)
-      ) ENGINE=#{storage_engine}")
+      ) ENGINE=#{GlobalUid.configuration.storage_engine}")
 
       # prime the pump on each server
       connection.execute("INSERT IGNORE INTO `#{name}` VALUES(#{start_id}, 'a')")

data/lib/global_uid/test_support.rb

@@ -0,0 +1,44 @@
+module GlobalUid
+  module TestSupport
+    # Tables should be created through the MigrationExtension but
+    # if you want to manually create and drop the '_id' tables,
+    # you can do so via this module
+    class << self
+      def create_uid_tables(tables: [], uid_type: nil, start_id: nil)
+        return if GlobalUid.disabled?
+
+        GlobalUid::Base.with_servers do |server|
+          tables.each do |table|
+            server.create_uid_table!(
+              name: GlobalUid::Base.id_table_from_name(table),
+              uid_type: uid_type,
+              start_id: start_id
+            )
+          end
+        end
+      end
+
+      def drop_uid_tables(tables: [])
+        return if GlobalUid.disabled?
+
+        GlobalUid::Base.with_servers do |server|
+          tables.each do |table|
+            server.drop_uid_table!(
+              name: GlobalUid::Base.id_table_from_name(table)
+            )
+          end
+        end
+      end
+
+      def recreate_uid_tables(tables: [], uid_type: nil, start_id: nil)
+        return if GlobalUid.disabled?
+
+        drop_uid_tables(tables: tables)
+        create_uid_tables(tables: tables, uid_type: nil, start_id: start_id)
+
+        # Reset the servers, clearing any allocations from memory
+        GlobalUid::Base.disconnect!
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -220,6 +220,7 @@ files:
 - lib/global_uid/migration_extension.rb
 - lib/global_uid/schema_dumper_extension.rb
 - lib/global_uid/server.rb
+- lib/global_uid/test_support.rb
 homepage: https://github.com/zendesk/global_uid
 licenses:
 - MIT