global_uid 1.0.3 → 1.1.0

data/lib/global_uid/base.rb

@@ -1,5 +1,6 @@
 require "active_record"
-require "system_timer" if Gem.available?("system_timer")
+require "active_support/all"
+
 require "timeout"
 
 module GlobalUid

data/test/config/database.yml

@@ -0,0 +1,20 @@
+test:
+  adapter: mysql
+  encoding: utf8
+  database: global_uid_test
+  username: root
+  password:
+
+test_id_server_1:
+  adapter: mysql
+  encoding: utf8
+  database: global_uid_test_id_server_1
+  username: root
+  password:
+
+test_id_server_2:
+  adapter: mysql
+  encoding: utf8
+  database: global_uid_test_id_server_2
+  username: root
+  password:

data/test/config/database.yml.example

@@ -1,19 +1,19 @@
 test:
-  adapter: mysql2
+  adapter: mysql
   encoding: utf8
   database: global_uid_test
   username: root
   password:
 
 test_id_server_1:
-  adapter: mysql2
+  adapter: mysql
   encoding: utf8
   database: global_uid_test_id_server_1
   username: root
   password:
 
 test_id_server_2:
-  adapter: mysql2
+  adapter: mysql
   encoding: utf8
   database: global_uid_test_id_server_2
   username: root

data/test/global_uid_test.rb

@@ -200,7 +200,7 @@ class GlobalUIDTest < ActiveSupport::TestCase
       setup do
         reset_connections!
         @old_size = GlobalUid::Base.get_connections.size # prime them
-        GlobalUid::Base.get_connections.first.stubs(:execute).raises(GlobalUid::TimeoutException)
+        GlobalUid::Base.get_connections.first.stubs(:insert).raises(GlobalUid::TimeoutException)
         # trigger the failure -- have to do it it a bunch of times, as one call might not hit the server
         # Even so there's a 1/(2^32) possibility of this test failing.
         32.times do WithGlobalUID.create! end
@@ -227,7 +227,7 @@ class GlobalUIDTest < ActiveSupport::TestCase
         # would prefer to do the below, but need Mocha 0.9.10 to do so
         # ActiveRecord::ConnectionAdapters::MysqlAdapter.any_instance.stubs(:execute).raises(ActiveRecord::StatementInvalid)
         GlobalUid::Base.with_connections do |cx|
-          cx.stubs(:execute).raises(ActiveRecord::StatementInvalid)
+          cx.stubs(:insert).raises(ActiveRecord::StatementInvalid)
         end
       end
 
@@ -355,7 +355,7 @@ class GlobalUIDTest < ActiveSupport::TestCase
   end
 
   def show_create_sql(klass, table)
-    klass.connection.select_all("show create table #{table}")[0]["Create Table"]
+    klass.connection.select_rows("show create table #{table}")[0][1]
   end
 end