master_slave_adapter 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,25 +1,30 @@
+# 1.1.1 (November 17, 2012)
+
+  * [BUGFIX] Fix activerecord 3.2 compatibility
+  * Fix setup of mysql integration servers
+
 # 1.1.0 (November 15, 2012)
 
-* [BUGFIX] Don't raise MasterUnavailable if a slave is unavailable
+  * [BUGFIX] Don't raise MasterUnavailable if a slave is unavailable
 
 # 1.0.0 (July 24, 2012)
 
-* Add support for unavailable master connection
-* Restrict the public interface. Removed the following methods:
-  * all class methods from ActiveRecord::ConnectionAdapters::MasterSlaveAdapter
-  * #current_connection=
-  * #current_clock=
-  * #slave_consistent?
-  * ActiveRecord::Base.on_commit and ActiveRecord::Base.on_rollback
-* Fix 1.8.7 compliance
-* Fix bug which led to infinitely connection stack growth
-* Add ActiveRecord 3.x compatibility
-* Add support for Mysql2
+  * Add support for unavailable master connection
+  * Restrict the public interface. Removed the following methods:
+    * all class methods from ActiveRecord::ConnectionAdapters::MasterSlaveAdapter
+    * #current_connection=
+    * #current_clock=
+    * #slave_consistent?
+    * ActiveRecord::Base.on_commit and ActiveRecord::Base.on_rollback
+  * Fix 1.8.7 compliance
+  * Fix bug which led to infinitely connection stack growth
+  * Add ActiveRecord 3.x compatibility
+  * Add support for Mysql2
 
 # 0.2.0 (April 2, 2012)
 
-* Add support for ActiveRecord's query cache
+  * Add support for ActiveRecord's query cache
 
 # 0.1.10 (March 06, 2012)
 
-* Delegate #visitor to master connection
+  * Delegate #visitor to master connection

data/lib/active_record/connection_adapters/master_slave_adapter/shared_mysql_adapter_behavior.rb

@@ -17,7 +17,7 @@ module ActiveRecord
 
         def master_clock
           conn = master_connection
-          if status = conn.uncached { select_hash(conn, "SHOW MASTER STATUS") }
+          if status = conn.uncached { conn.select_one("SHOW MASTER STATUS") }
             Clock.new(status['File'], status['Position'])
           else
             Clock.infinity
@@ -29,7 +29,7 @@ module ActiveRecord
         end
 
         def slave_clock(conn)
-          if status = conn.uncached { select_hash(conn, "SHOW SLAVE STATUS") }
+          if status = conn.uncached { conn.select_one("SHOW SLAVE STATUS") }
             Clock.new(status['Relay_Master_Log_File'], status['Exec_Master_Log_Pos'])
           else
             Clock.zero

data/lib/active_record/connection_adapters/master_slave_adapter/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module MasterSlaveAdapter
-      VERSION = "1.1.0"
+      VERSION = "1.1.1"
     end
   end
 end

data/lib/active_record/connection_adapters/mysql2_master_slave_adapter.rb

@@ -18,10 +18,6 @@ module ActiveRecord
 
     private
 
-      def select_hash(conn, sql)
-        conn.select_one(sql)
-      end
-
       CONNECTION_ERRORS = {
         2002 => "query: not connected",                         # CR_CONNECTION_ERROR
         2003 => "Can't connect to MySQL server on",             # CR_CONN_HOST_ERROR

data/lib/active_record/connection_adapters/mysql_master_slave_adapter.rb

@@ -17,19 +17,6 @@ module ActiveRecord
 
     private
 
-      if MysqlAdapter.instance_methods.map(&:to_sym).include?(:exec_without_stmt)
-        # The MysqlAdapter in ActiveRecord > v3.1 uses prepared statements which
-        # don't return any results for queries like "SHOW MASTER/SLAVE STATUS",
-        # so we have to use normal queries here.
-        def select_hash(conn, sql)
-          conn.exec_without_stmt(sql).first
-        end
-      else
-        def select_hash(conn, sql)
-          conn.select_one(sql)
-        end
-      end
-
       CONNECTION_ERRORS = [
         Mysql::Error::CR_CONNECTION_ERROR,  # query: not connected
         Mysql::Error::CR_CONN_HOST_ERROR,   # Can't connect to MySQL server on '%s' (%d)

data/spec/common/support/mysql_consistency_examples.rb

@@ -11,22 +11,12 @@ shared_examples_for 'mysql consistency' do
     Clock.new('', pos)
   end
 
-  def supports_prepared_statements?
-    described_class == ActiveRecord::ConnectionAdapters::MysqlMasterSlaveAdapter &&
-    ActiveRecord::ConnectionAdapters::MysqlAdapter.instance_methods.map(&:to_sym).include?(:exec_without_stmt)
-  end
-
-  def select_method
-    supports_prepared_statements? ? :exec_without_stmt : :select_one
-  end
-
   def should_report_clock(pos, connection, log_file, log_pos, sql)
     pos = Array(pos)
     values = pos.map { |p| { log_file => '', log_pos => p } }
-    values.map! { |result| [ result ] } if supports_prepared_statements?
 
     connection.
-      should_receive(select_method).exactly(pos.length).times.
+      should_receive(:select_one).exactly(pos.length).times.
       with(sql).
       and_return(*values)
   end

data/spec/integration/support/mysql_setup_helper.rb

@@ -73,14 +73,13 @@ module MysqlSetupHelper
     [:master, :slave].each do |name|
       path        = location(name)
       config_path = File.join(path, "my.cnf")
-      data_path   = File.join(path, "data")
       base_dir    = File.dirname(File.dirname(`which mysql_install_db`))
 
       FileUtils.rm_rf(path)
       FileUtils.mkdir_p(path)
       File.open(config_path, "w") { |file| file << config(name) }
 
-      `mysql_install_db --basedir='#{base_dir}' --datadir='#{data_path}'`
+      `mysql_install_db --defaults-file='#{config_path}' --basedir='#{base_dir}' --user=''`
     end
   end
 
@@ -160,15 +159,17 @@ private
 
     <<-EOS
 [mysqld]
-pid-file = #{path}/mysqld.pid
-socket = #{path}/mysqld.sock
-port = #{port(name)}
-log-error = #{path}/error.log
-datadir = #{path}/data
-log-bin = #{name}-bin
-log-bin-index = #{name}-bin.index
-server-id = #{server_id(name)}
-lower_case_table_names = 1
+pid-file                = #{path}/mysqld.pid
+socket                  = #{path}/mysqld.sock
+port                    = #{port(name)}
+log-error               = #{path}/error.log
+datadir                 = #{path}/data
+log-bin                 = #{name}-bin
+log-bin-index           = #{name}-bin.index
+server-id               = #{server_id(name)}
+lower_case_table_names  = 1
+sql-mode                = ''
+replicate-ignore-db     = mysql
     EOS
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: master_slave_adapter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord