pt-osc 0.0.5 → 0.1.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.0
+
+- renamed `PtOscAdapter` -> `MysqlPtOscAdapter` for better compatibility with Rails db Rake tasks.
+
 ## 0.0.5
 
 - remove dependence on ActiveSupport/Rails

data/README.md

@@ -23,7 +23,7 @@ Or install it yourself as:
 
 ## Usage
 
-Set your database adapter to be `pt_osc` in your application's database.yml.
+Set your database adapter to be `mysql_pt_osc` in your application's database.yml.
 Specify `pt-online-schema-change` flags in a `percona` hash in the config.
 e.g.
 ```yaml

data/lib/active_record/connection_adapters/{pt_osc_adapter.rb → mysql_pt_osc_adapter.rb}

@@ -3,7 +3,7 @@ require 'active_record/connection_adapters/mysql2_adapter'
 module ActiveRecord
   class Base
     # Establishes a connection to the database that's used by all Active Record objects.
-    def self.pt_osc_connection(config)
+    def self.mysql_pt_osc_connection(config)
       config[:username] = 'root' if config[:username].nil?
 
       if Mysql2::Client.const_defined? :FOUND_ROWS
@@ -12,13 +12,13 @@ module ActiveRecord
 
       client = Mysql2::Client.new(config.symbolize_keys)
       options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
-      ConnectionAdapters::PtOscAdapter.new(client, logger, options, config)
+      ConnectionAdapters::MysqlPtOscAdapter.new(client, logger, options, config)
     end
   end
 
   module ConnectionAdapters
-    class PtOscAdapter < Mysql2Adapter
-      ADAPTER_NAME = 'pt-osc'
+    class MysqlPtOscAdapter < Mysql2Adapter
+      ADAPTER_NAME = 'mysql-pt-osc'
 
       # Renames a table.
       #

data/lib/active_record/pt_osc_migration.rb

@@ -70,7 +70,7 @@ module ActiveRecord
 
     protected
     def execute_pt_osc
-      return unless @connection.is_a? ActiveRecord::ConnectionAdapters::PtOscAdapter
+      return unless @connection.is_a? ActiveRecord::ConnectionAdapters::MysqlPtOscAdapter
       return if @connection.get_commanded_tables.empty?
 
       database_name = database_config[:database]
@@ -104,7 +104,7 @@ module ActiveRecord
     end
 
     def print_pt_osc
-      return unless @connection.is_a? ActiveRecord::ConnectionAdapters::PtOscAdapter
+      return unless @connection.is_a? ActiveRecord::ConnectionAdapters::MysqlPtOscAdapter
 
       database_name = database_config[:database]
 

data/lib/pt-osc/version.rb

@@ -1,5 +1,5 @@
 module Pt
   module Osc
-    VERSION = '0.0.5'
+    VERSION = '0.1.0'
   end
 end

data/lib/pt-osc.rb

@@ -1,3 +1,3 @@
 require 'pt-osc/version'
-require 'active_record/connection_adapters/pt_osc_adapter'
+require 'active_record/connection_adapters/mysql_pt_osc_adapter'
 require 'active_record/pt_osc_migration'

data/test/functional/{pt_osc_adapter_test.rb → mysql_pt_osc_adapter_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'yaml'
 
-class PtOscAdapterTest < Test::Unit::TestCase
+class MysqlPtOscAdapterTest < Test::Unit::TestCase
   class TestConnection < ActiveRecord::Base; end
 
   def test_connection
@@ -11,6 +11,6 @@ class PtOscAdapterTest < Test::Unit::TestCase
 
     assert_nothing_raised { TestConnection.establish_connection(spec) }
     assert_equal true, TestConnection.connection.in_use
-    assert_kind_of ActiveRecord::ConnectionAdapters::PtOscAdapter, TestConnection.connection
+    assert_kind_of ActiveRecord::ConnectionAdapters::MysqlPtOscAdapter, TestConnection.connection
   end
 end

data/test/test_helper.rb

@@ -14,7 +14,7 @@ Rails.backtrace_cleaner.remove_silencers!
 
 def test_spec
   test_spec = YAML.load_file(Rails.root.join(*%w(.. config database.yml)))['test']
-  test_spec['adapter'] = 'pt_osc'
+  test_spec['adapter'] = 'mysql_pt_osc'
   test_spec
 end
 

data/test/unit/{pt_osc_adapter_test.rb → mysql_pt_osc_adapter_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PtOscAdapterTest < Test::Unit::TestCase
+class MysqlPtOscAdapterTest < Test::Unit::TestCase
   class TestConnection < ActiveRecord::Base; end
 
   context 'a pt-osc adapter' do

data/test/unit/pt_osc_migration_unit_test.rb

@@ -104,7 +104,7 @@ class PtOscMigrationUnitTest < Test::Unit::TestCase
       context 'with a pt-osc connection' do
         setup do
           @mock_connection = mock
-          @mock_connection.stubs(:is_a?).with(ActiveRecord::ConnectionAdapters::PtOscAdapter).returns(true)
+          @mock_connection.stubs(:is_a?).with(ActiveRecord::ConnectionAdapters::MysqlPtOscAdapter).returns(true)
 
           @old_connection = @migration.instance_variable_get(:@connection)
           @migration.instance_variable_set(:@connection, @mock_connection)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pt-osc
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -169,7 +169,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- lib/active_record/connection_adapters/pt_osc_adapter.rb
+- lib/active_record/connection_adapters/mysql_pt_osc_adapter.rb
 - lib/active_record/pt_osc_migration.rb
 - lib/pt-osc.rb
 - lib/pt-osc/version.rb
@@ -210,10 +210,10 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
-- test/functional/pt_osc_adapter_test.rb
+- test/functional/mysql_pt_osc_adapter_test.rb
 - test/functional/pt_osc_migration_functional_test.rb
 - test/test_helper.rb
-- test/unit/pt_osc_adapter_test.rb
+- test/unit/mysql_pt_osc_adapter_test.rb
 - test/unit/pt_osc_migration_unit_test.rb
 homepage: https://github.com/steverice/pt-osc
 licenses: []
@@ -229,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1631463669037670360
+      hash: -1002230832062857032
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1631463669037670360
+      hash: -1002230832062857032
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -282,8 +282,8 @@ test_files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
-- test/functional/pt_osc_adapter_test.rb
+- test/functional/mysql_pt_osc_adapter_test.rb
 - test/functional/pt_osc_migration_functional_test.rb
 - test/test_helper.rb
-- test/unit/pt_osc_adapter_test.rb
+- test/unit/mysql_pt_osc_adapter_test.rb
 - test/unit/pt_osc_migration_unit_test.rb