ar_mysql_flexmaster 0.4.4 → 0.5.0

data/gemfiles/rails4.0.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem "rake"
+gem "rails", "~> 4.0.0"
+gem "mysql2", "~> 0.3.0", "<= 0.3.11"

data/gemfiles/rails4.0.gemfile.lock

@@ -0,0 +1,92 @@
+PATH
+  remote: ../
+  specs:
+    ar_mysql_flexmaster (0.4.4)
+      activerecord
+      activesupport
+      mysql2
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.0.12)
+      actionpack (= 4.0.12)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.12)
+      activesupport (= 4.0.12)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.12)
+      activesupport (= 4.0.12)
+      builder (~> 3.1.0)
+    activerecord (4.0.12)
+      activemodel (= 4.0.12)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.12)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.12)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    builder (3.1.4)
+    bump (0.5.1)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.11)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.3)
+    minitest (4.7.5)
+    multi_json (1.10.1)
+    mysql2 (0.3.11)
+    mysql_isolated_server (0.5.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.12)
+      actionmailer (= 4.0.12)
+      actionpack (= 4.0.12)
+      activerecord (= 4.0.12)
+      activesupport (= 4.0.12)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.12)
+      sprockets-rails (~> 2.0)
+    railties (4.0.12)
+      actionpack (= 4.0.12)
+      activesupport (= 4.0.12)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (0.3.42)
+    wwtd (0.5.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ar_mysql_flexmaster!
+  bump
+  minitest
+  mysql2 (~> 0.3.0, <= 0.3.11)
+  mysql_isolated_server (~> 0.5)
+  rails (~> 4.0.0)
+  rake
+  wwtd

data/gemfiles/rails4.1.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem "rake"
+gem "rails", "~> 4.1.8"
+gem "mysql2", "~> 0.3.0"

data/gemfiles/rails4.1.gemfile.lock

@@ -0,0 +1,98 @@
+PATH
+  remote: ../
+  specs:
+    ar_mysql_flexmaster (0.4.4)
+      activerecord
+      activesupport
+      mysql2
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
+      arel (~> 5.0.0)
+    activesupport (4.1.8)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    bump (0.5.1)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.11)
+    json (1.8.1)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.3)
+    minitest (5.4.3)
+    multi_json (1.10.1)
+    mysql2 (0.3.17)
+    mysql_isolated_server (0.5.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.1.8)
+      actionmailer (= 4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      activemodel (= 4.1.8)
+      activerecord (= 4.1.8)
+      activesupport (= 4.1.8)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.8)
+      sprockets-rails (~> 2.0)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (0.5.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ar_mysql_flexmaster!
+  bump
+  minitest
+  mysql2 (~> 0.3.0)
+  mysql_isolated_server (~> 0.5)
+  rails (~> 4.1.8)
+  rake
+  wwtd

data/gemfiles/rails4.2.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec :path => "../"
+
+gem "rake"
+gem "rails", "~> 4.2.0.rc2"
+gem "mysql2", "~> 0.3.0"

data/gemfiles/rails4.2.gemfile.lock

@@ -0,0 +1,123 @@
+PATH
+  remote: ../
+  specs:
+    ar_mysql_flexmaster (0.4.4)
+      activerecord
+      activesupport
+      mysql2
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.0.rc2)
+      actionpack (= 4.2.0.rc2)
+      actionview (= 4.2.0.rc2)
+      activejob (= 4.2.0.rc2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0.rc2)
+      actionview (= 4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
+      rack (~> 1.6.0.beta2)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
+      builder (~> 3.1)
+    activerecord (4.2.0.rc2)
+      activemodel (= 4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
+      arel (~> 6.0)
+    activesupport (4.2.0.rc2)
+      i18n (>= 0.7.0.beta1, < 0.8)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    bump (0.5.1)
+    erubis (2.7.0)
+    globalid (0.3.0)
+      activesupport (>= 4.1.0)
+    hike (1.2.3)
+    i18n (0.7.0.beta1)
+    json (1.8.1)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.3)
+    mini_portile (0.6.1)
+    minitest (5.4.3)
+    multi_json (1.10.1)
+    mysql2 (0.3.17)
+    mysql_isolated_server (0.5.3)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    rack (1.6.0.beta2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.2.0.rc2)
+      actionmailer (= 4.2.0.rc2)
+      actionpack (= 4.2.0.rc2)
+      actionview (= 4.2.0.rc2)
+      activejob (= 4.2.0.rc2)
+      activemodel (= 4.2.0.rc2)
+      activerecord (= 4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.0.rc2)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    railties (4.2.0.rc2)
+      actionpack (= 4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.2.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    wwtd (0.5.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ar_mysql_flexmaster!
+  bump
+  minitest
+  mysql2 (~> 0.3.0)
+  mysql_isolated_server (~> 0.5)
+  rails (~> 4.2.0.rc2)
+  rake
+  wwtd

data/test/ar_flexmaster_test.rb

@@ -1,9 +1,13 @@
 require 'bundler/setup'
 require 'ar_mysql_flexmaster'
 require 'active_record'
+require 'minitest/autorun'
+
+if !defined?(Minitest::Test)
+  Minitest::Test = MiniTest::Unit::TestCase
+end
+
 require_relative 'boot_mysql_env'
-require 'test/unit'
-require 'debugger'
 
 File.open(File.dirname(File.expand_path(__FILE__)) + "/database.yml", "w+") do |f|
       f.write <<-EOL
@@ -32,7 +36,7 @@ reconnect_slave:
 end
 
 ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.establish_connection("test")
+ActiveRecord::Base.establish_connection(:test)
 
 class User < ActiveRecord::Base
 end
@@ -57,9 +61,9 @@ end
 
 $original_master_port = $mysql_master.port
 
-class TestArFlexmaster < Test::Unit::TestCase
+class TestArFlexmaster < Minitest::Test
   def setup
-    ActiveRecord::Base.establish_connection("test")
+    ActiveRecord::Base.establish_connection(:test)
 
     $mysql_master.set_rw(true) if $mysql_master
     $mysql_slave.set_rw(false) if $mysql_slave
@@ -103,7 +107,11 @@ class TestArFlexmaster < Test::Unit::TestCase
     end
     User.create(:name => "foo")
     assert_equal $mysql_slave, master_connection
-    assert User.first(:conditions => {:name => "foo"})
+    if ActiveRecord::VERSION::MAJOR >= 4
+      assert User.where(:name => "foo").exists?
+    else
+      assert User.first(:conditions => {:name => "foo"})
+    end
   end
 
   def test_should_hold_implicit_txs_and_then_continue
@@ -152,16 +160,6 @@ class TestArFlexmaster < Test::Unit::TestCase
     end
   end
 
-  def test_should_choose_a_random_slave_connection
-    h = {}
-    10.times do
-      port = UserSlave.connection.execute("show global variables like 'port'").first.last.to_i
-      h[port] = 1
-      UserSlave.connection.reconnect!
-    end
-    assert_equal 2, h.size
-  end
-
   def test_should_expose_the_current_master_and_port
     cx = ActiveRecord::Base.connection
     assert_equal "127.0.0.1", cx.current_host

data/test/boot_mysql_env.rb

@@ -34,6 +34,17 @@ $mysql_master.connection.query("GRANT ALL ON flexmaster_test.* to flex@localhost
 $mysql_master.connection.query("CREATE DATABASE flexmaster_test")
 $mysql_master.connection.query("CREATE TABLE flexmaster_test.users (id INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY, name varchar(20))")
 $mysql_master.connection.query("INSERT INTO flexmaster_test.users set name='foo'")
-
 $mysql_slave.set_rw(false)
+$mysql_slave_2.set_rw(false)
+
+# let replication for the grants and such flow down.  bleh.
+repl_sync = false
+while !repl_sync
+  repl_sync = [[$mysql_master, $mysql_slave], [$mysql_slave, $mysql_slave_2]].all? do |master, slave|
+    master_pos = master.connection.query("show master status").to_a.first["Position"]
+    slave.connection.query("show slave status").to_a.first["Exec_Master_Log_Pos"] == master_pos
+  end
+  sleep 1
+end
+
 sleep if __FILE__ == $0

data/test/integration/no_traffic_test.rb

@@ -1,23 +1,15 @@
-require 'bundler/setup'
-require 'mysql2'
-require_relative '../boot_mysql_env'
-master_cut_script = File.expand_path(File.dirname(__FILE__)) + "/../../bin/master_cut"
+require_relative "../integration_helper"
 
-$mysql_master.connection.query("set GLOBAL READ_ONLY=0")
-$mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
+class NoTrafficTest < Minitest::Test
+  def test_basic_cutover
+    $mysql_master.connection.query("set GLOBAL READ_ONLY=0")
+    $mysql_slave.connection.query("set GLOBAL READ_ONLY=1")
 
-puts "testing basic cutover..."
+    puts "testing basic cutover..."
 
-system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p ''"
-if $mysql_master.connection.query("select @@read_only as ro").first['ro'] != 1
-  puts "Master is not readonly!"
-  exit 1
+    system "#{master_cut_script} 127.0.0.1:#{$mysql_master.port} 127.0.0.1:#{$mysql_slave.port} root -p ''"
+    assert_ro($mysql_master.connection, 'master', true)
+    assert_ro($mysql_slave.connection, 'master', false)
+  end
 end
 
-if $mysql_slave.connection.query("select @@read_only as ro").first['ro'] != 0
-  puts "Slave is not readwrite!"
-  exit 1
-end
-
-puts "everything seemed to go ok..."
-