pt-osc 0.2.4 → 0.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 99c1ea4748db0541d8a8b7498d46dade6872599c
+  data.tar.gz: ce1bf7394309e17f504a34f39a75bf588c43502e
+SHA512:
+  metadata.gz: 628180e46c7e0d2965aa8942429c6a9cf041f8b1fcb0926bc5295ff5f8b3865c47c6cca83af4635144b82d51189da6eb14811cd2f47a689751e0b0b09defceec
+  data.tar.gz: d7fe01bebb0fca9247c6d9dd51966bb19c3bd59f0ff074a78443e9b474b3066f2cd4b752c06f415ef5dac6eda29929df067a411e3ad833d1b6597616430f6c80

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+.idea/*

data/.travis.yml

@@ -22,6 +22,8 @@ cache:
   - bundler
   - apt
 bundler_args: --binstubs --retry=5
+before_install:
+  - gem install bundler -v 1.12.4
 before_script:
   - $TRAVIS_BUILD_DIR/test/travisci/install_pt_osc.sh
   - unset RAILS_ENV

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.5
+
+- added version requirement to mysql2 gem to keep things from breaking (thanks @taavi!) [#15]
+- prevent potentially dangerous usage of `execute` within a pt-osc (thanks @taavi!) [#16]
+- reconnect to MySQL if connection timed out during pt-osc execution (thanks @jongrieman!) [#17]
+
 ## 0.2.4
 
 - relaxed version requirements for bundler and activerecord-import

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2015 Steve Rice
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -42,7 +42,7 @@ Additional/modified options for the `percona` hash include:
   - `check-alter`: When set to `false`, `ALTER` commands will not be checked when executing (same as [`--no-check-alter`](http://www.percona.com/doc/percona-toolkit/2.1/pt-online-schema-change.html#cmdoption-pt-online-schema-change--%5Bno%5Dcheck-alter))
   - `run_mode`: Specify `'execute'` to actually run `pt-online-schema-change` when the migration runs. Specify `'print'` to output the commands to run to STDOUT instead. Default is `'print'`.
   - `log`: Specify the file used for logging activity. Can be a relative or absolute path.
-  - `username`: By default, the command will use the username given in your standard database config. Specify a username here to override. Specify `false` to omit username (such as when using a `defaults-file`.
+  - `user`: By default, the command will use the username given in your standard database config. Specify a username here to override. Specify `false` to omit username (such as when using a `defaults-file`.
   - `password`: By default, the command will use the password given in your standard database config. Specify a password here to override. Specify `false` to omit password (such as when using a `defaults-file`.
 
 #### Migrations
@@ -82,17 +82,3 @@ Support for other versions of these tools is unknown and not guaranteed.
 `pt-osc` requires the use of `pt-online-schema-change` 2.0 or later. Some options may not work with all versions.
 
 `pt-osc` is compatible with versions 0.5.0 and later of [zdennis/activerecord-import](https://github.com/zdennis/activerecord-import). It will not work with earlier versions.
-
-#License and Copyright
-Copyright (c) 2014, PagerDuty
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of [project] nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/active_record/pt_osc_migration.rb

@@ -3,6 +3,18 @@ require 'active_record/connection_adapters/mysql_pt_osc_adapter'
 require 'shellwords'
 
 module ActiveRecord
+  class Migrator
+    alias_method :record_version_state_after_migrating_without_reconnect, :record_version_state_after_migrating
+
+    def record_version_state_after_migrating(version)
+      ActiveRecord::Base.logger.debug 'Verifying active connections prior to recording version' if ActiveRecord::Base.logger
+      ActiveRecord::Base.verify_active_connections! # Reconnect to DB if it's gone away while we were migrating.
+      record_version_state_after_migrating_without_reconnect(version)
+    end
+  end
+
+  class UnsupportedMigrationError < ActiveRecordError; end
+
   class PtOscMigration < Migration
     # @TODO whitelist all valid pt-osc flags
     PERCONA_FLAGS = {
@@ -263,5 +275,9 @@ module ActiveRecord
         flag
       end
     end
+
+    def execute(sql)
+      raise ActiveRecord::UnsupportedMigrationError.new("Raw `execute` isn't supported by the pt-osc gem.")
+    end
   end
 end

data/lib/pt-osc/version.rb

@@ -1,5 +1,5 @@
 module Pt
   module Osc
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
   end
 end

data/pt-osc.gemspec

@@ -7,7 +7,8 @@ Gem::Specification.new do |spec|
   spec.name          = 'pt-osc'
   spec.version       = Pt::Osc::VERSION
   spec.authors       = ['Steve Rice']
-  spec.email         = ['steve@pagerduty.com']
+  spec.email         = ['steve@steverice.org']
+  spec.license       = 'MIT'
   spec.summary       = 'Rails migrations via pt-online-schema-change'
   spec.description   = 'Runs regular Rails/ActiveRecord migrations via the Percona Toolkit pt-online-schema-change tool.'
   spec.homepage      = 'https://github.com/steverice/pt-osc'
@@ -17,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '>= 1.6'
+  spec.add_development_dependency 'bundler', '>= 1.10'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'shoulda'
   spec.add_development_dependency 'faker'
@@ -29,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'activerecord-import', '>= 0.5.0'
 
   spec.add_runtime_dependency 'activerecord', '~> 3.2'
-  spec.add_runtime_dependency 'mysql2'
+  spec.add_runtime_dependency 'mysql2', '~> 0.3.10'
 end

data/test/functional/pt_osc_migration_functional_test.rb

@@ -38,6 +38,31 @@ class PtOscMigrationFunctionalTest < ActiveRecord::TestCase
           ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS `#{@table_name}`;"
         end
 
+        context 'a raw SQL execute migration' do
+          setup do
+            TestMigration.class_eval <<-EVAL
+            def up
+              execute 'SELECT 1'
+            end
+            EVAL
+            @migration.expects(:print_pt_osc).never
+            @migration.expects(:execute_pt_osc).never
+            @migration.connection.expects(:execute).never
+          end
+
+          teardown do
+            @migration.unstub(:print_pt_osc)
+            @migration.unstub(:execute_pt_osc)
+            @migration.connection.unstub(:execute)
+          end
+
+          should 'throw an exception' do
+            assert_raise ActiveRecord::UnsupportedMigrationError do
+              @migration.migrate(:up)
+            end
+          end
+        end
+
         context 'a migration with only ALTER statements' do
           setup do
             @renamed_column_name = 'foobar'
@@ -154,3 +179,18 @@ class PtOscMigrationFunctionalTest < ActiveRecord::TestCase
     end
   end
 end
+
+class PtOscMigrationMigratorFunctionalTest < ActiveRecord::TestCase
+  class TestMigrator < ActiveRecord::Migrator; end
+
+  context 'updating version post migration' do
+    setup do
+      @migrator = TestMigrator.new(nil, nil)
+    end
+
+    should 'verify connections before recording version' do
+      ActiveRecord::Base.connection.raw_connection.close
+      @migrator.send(:record_version_state_after_migrating, 0)
+    end
+  end
+end

metadata

@@ -1,188 +1,168 @@
 --- !ruby/object:Gem::Specification
 name: pt-osc
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.2.5
 platform: ruby
 authors:
 - Steve Rice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.10
 description: Runs regular Rails/ActiveRecord migrations via the Percona Toolkit pt-online-schema-change
   tool.
 email:
-- steve@pagerduty.com
+- steve@steverice.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/active_record/connection_adapters/mysql_pt_osc_adapter.rb
@@ -235,34 +215,28 @@ files:
 - test/unit/mysql_pt_osc_adapter_test.rb
 - test/unit/pt_osc_migration_unit_test.rb
 homepage: https://github.com/steverice/pt-osc
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3289951028780613662
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3289951028780613662
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails migrations via pt-online-schema-change
 test_files:
 - test/config/database.yml