global_uid 1.4.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 60e2ff56778cf4d67aa04abeb8a6993b5f8255f8
+  data.tar.gz: 2e5a5fc7ce6c1e96805b7d5455f58ec2f9ef233f
+SHA512:
+  metadata.gz: 6aeec90fe60593600f2309326c8e53467a704d84bdb2a2d6b5afae9b3712c16bc708000fa0d92b1b4923b27314ea4055b28b07e93229c33229822bbfaec19ee9
+  data.tar.gz: 05e7b31c19b354c93bba6a2d891acd9f3a8a8a6d1e84d4a0bfbe4ce8d121a60f017f25765efd2d8f81319978b205c16ee2777d31a2383629d333d58270bfe462

data/lib/global_uid.rb

@@ -1,6 +1,7 @@
 require "global_uid/base"
 require "global_uid/active_record_extension"
 require "global_uid/migration_extension"
+require "global_uid/schema_dumper_extension"
 
 module GlobalUid
   VERSION = "1.4.1"
@@ -14,4 +15,6 @@ end
 
 ActiveRecord::Base.send(:include, GlobalUid::ActiveRecordExtension)
 ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, GlobalUid::MigrationExtension)
-
+if ActiveRecord::VERSION::MAJOR == 4
+  ActiveRecord::SchemaDumper.send(:prepend, GlobalUid::SchemaDumperExtension)
+end

data/lib/global_uid/base.rb

@@ -28,7 +28,7 @@ module GlobalUid
       type     = options[:uid_type] || "bigint(21) UNSIGNED"
       start_id = options[:start_id] || 1
 
-      engine_stmt = global_uid_options[:storage_engine] ? "ENGINE=#{global_uid_options[:storage_engine]}" : ""
+      engine_stmt = "ENGINE=#{global_uid_options[:storage_engine] || "MyISAM"}"
 
       # TODO it would be nice to be able to set the engine or something to not be MySQL specific
       with_connections do |connection|
@@ -195,6 +195,10 @@ module GlobalUid
           connection.transaction do
             start_id = connection.select_value("SELECT id from #{klass.global_uid_table} where stub='a' FOR UPDATE").to_i
             connection.execute("update #{klass.global_uid_table} set id = id + #{n} * @@auto_increment_increment where stub='a'")
+            if self.global_uid_options[:storage_engine] =~ /InnoDB/i
+              # This is needed to reset the auto_increment counter on an InnoDB table.
+              connection.execute("ALTER TABLE #{klass.global_uid_table} AUTO_INCREMENT = 1")
+            end
             end_res = connection.select_one("SELECT id, @@auto_increment_increment as inc from #{klass.global_uid_table} where stub='a'")
             increment_by = end_res['inc'].to_i
             end_id = end_res['id'].to_i

data/lib/global_uid/migration_extension.rb

@@ -38,6 +38,5 @@ module GlobalUid
       end
       drop_table_without_global_uid(name)
     end
-
   end
 end

data/lib/global_uid/schema_dumper_extension.rb

@@ -0,0 +1,27 @@
+module GlobalUid
+  module SchemaDumperExtension
+    def table(table, stream)
+      io = super(table, StringIO.new)
+      schema = io.string
+
+      pk = get_pk(table)
+      columns = @connection.columns(table)
+
+      pkcol = columns.detect { |c| c.name == pk }
+      use_global_uid = !(pkcol.extra =~ /auto/i)
+
+      schema.sub!(/(create_table.*) do/, "\\1, use_global_uid: #{use_global_uid.inspect} do")
+      stream.write(schema)
+      stream
+    end
+
+    def get_pk(table)
+      if @connection.respond_to?(:pk_and_sequence_for)
+        pk, _ = @connection.pk_and_sequence_for(table)
+      elsif @connection.respond_to?(:primary_key)
+        pk = @connection.primary_key(table)
+      end
+      pk
+    end
+  end
+end

metadata

@@ -1,160 +1,161 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 1.4.1
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: bump
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 description: GUIDs for sharded models
 email: ben@zendesk.com
 executables: []
@@ -165,30 +166,30 @@ files:
 - lib/global_uid/active_record_extension.rb
 - lib/global_uid/base.rb
 - lib/global_uid/migration_extension.rb
+- lib/global_uid/schema_dumper_extension.rb
 - lib/global_uid/server_variables.rb
 homepage: https://github.com/zendesk/global_uid
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: GUID
 test_files: []