global_uid 1.3.1 → 1.4.0

data/global_uid.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'global_uid'
-  s.version           = '1.3.1'
-  s.date              = '2012-10-24'
+  s.version           = '1.4.0'
+  s.date              = '2013-04-01'
   s.rubyforge_project = 'global_uid'
 
   ## Make sure your summary is short. The description may be as long

data/lib/global_uid/base.rb

@@ -28,6 +28,8 @@ 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]}" : ""
+
       # TODO it would be nice to be able to set the engine or something to not be MySQL specific
       with_connections do |connection|
         connection.execute("CREATE TABLE IF NOT EXISTS `#{id_table_name}` (
@@ -35,7 +37,7 @@ module GlobalUid
         `stub` char(1) NOT NULL DEFAULT '',
         PRIMARY KEY (`id`),
         UNIQUE KEY `stub` (`stub`)
-        )")
+        ) #{engine_stmt}")
 
         # prime the pump on each server
         connection.execute("INSERT IGNORE INTO `#{id_table_name}` VALUES(#{start_id}, 'a')")

data/test/global_uid_test.rb

@@ -110,6 +110,7 @@ class GlobalUIDTest < ActiveSupport::TestCase
       context "with global-uid enabled" do
         setup do
           GlobalUid::Base.global_uid_options[:disabled] = false
+          GlobalUid::Base.global_uid_options[:storage_engine] = "InnoDB"
           CreateWithNoParams.up
           @create_table = show_create_sql(WithGlobalUID, "with_global_uids").split("\n")
         end
@@ -127,6 +128,14 @@ class GlobalUIDTest < ActiveSupport::TestCase
           end
         end
 
+        should "create tables with the given storage_engine" do
+          GlobalUid::Base.with_connections do |cx|
+            foo = cx.select_all("show create table with_global_uids_ids")
+            assert_match /ENGINE=InnoDB/, foo.first.values.join
+          end
+
+        end
+
         should "tear off the auto_increment part of the primary key from the created table" do
           id_line = @create_table.grep(/\`id\` int/i).first
           assert_no_match /auto_increment/i, id_line

data/test/test_helper.rb

@@ -9,6 +9,7 @@ require "active_record"
 require "active_support"
 require "active_support/test_case"
 require "shoulda"
+require "mocha"
 require "global_uid"
 
 GlobalUid::Base.global_uid_options = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord