percona_migrator 0.1.0.rc.2 → 0.1.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37474e0d339fdbbf66627f96d152780234101e1b
-  data.tar.gz: 399919fee87faf206d71f650e0bc60ff45773d63
+  metadata.gz: 7fe6a75f0b0d56a2d50aab13a8a633347e6aaa3a
+  data.tar.gz: 961dccefa1160b2da61286331390161f6a5a0f65
 SHA512:
-  metadata.gz: d7cbf7b595b676a62582ccf7442aecaadc18ed3378779bd8c0db981b63b8f49a244392be30907c68a2c8a7d8ff93e8ab524f6ad1f12c97155bfaf44eb895225f
-  data.tar.gz: 6add69682f7e4cdea9a3cd92b5693413bf54d58302a69600929bc6da7065cb414123bf2c6b4938e93428c049272b93d1034598e2b58de32f6340b7a18d3cf086
+  metadata.gz: 123bdaea1db477acf87c5fbd4f6a48a8a9466efa21fb993f70fc701323d651ebd87a26c595dedebd9b71b01bb8a06fdd8631e146d0c34c2b1a5fa6e6e643bf18
+  data.tar.gz: 2b84763f317b1f980dc0604bbf44417034b95ae5331ae5bb0636deee98dabdc8f956c9b6090b45922fae15dc27d39d1f327fc2946842a7d4cc8f56ee0c281605

data/CHANGELOG.md

@@ -5,9 +5,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 Please follow the format in [Keep a Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+
+## [0.1.0.rc.3] - 2016-03-10
+
+### Added
+
+- Support #execute. Allows to execute raw SQL from the migration
+
+## [0.1.0.rc.2] - 2016-03-09
+
 ### Added
 
 - VERBOSE env var in tests. Specially useful for integration tests.
+- Fix #create_table migration method. Now it does create the table.
 
 ### Changed
 

data/lib/active_record/connection_adapters/percona_adapter.rb

@@ -130,6 +130,20 @@ module ActiveRecord
         true
       end
 
+      # Executes the passed statement through pt-online-schema-change if it's
+      # an alter statement, or through the mysql adapter otherwise
+      #
+      # @param sql [String]
+      # @param name [String]
+      def percona_execute(sql, name)
+        if alter_statement?(sql)
+          command = cli_generator.parse_statement(sql)
+          runner.execute(command)
+        else
+          mysql_adapter.execute(sql, name)
+        end
+      end
+
       # This abstract method leaves up to the connection adapter freeing the
       # result, if it needs to. Check out: https://github.com/rails/rails/blob/330c6af05c8b188eb072afa56c07d5fe15767c3c/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L247
       #
@@ -142,6 +156,14 @@ module ActiveRecord
       private
 
       attr_reader :mysql_adapter, :logger, :runner, :cli_generator
+
+      # Checks whether the sql statement is an ALTER TABLE
+      #
+      # @param sql [String]
+      # @return [Boolean]
+      def alter_statement?(sql)
+        sql =~ /alter table/i
+      end
     end
   end
 end

data/lib/percona_migrator/alter_argument.rb

@@ -3,6 +3,7 @@ module PerconaMigrator
   # Represents the '--alter' argument of Percona's pt-online-schema-change
   # See https://www.percona.com/doc/percona-toolkit/2.0/pt-online-schema-change.html
   class AlterArgument
+    ALTER_TABLE_REGEX = /ALTER TABLE `(\w+)` /
 
     # Constructor
     #
@@ -17,6 +18,13 @@ module PerconaMigrator
       "--alter \"#{parsed_statement}\""
     end
 
+    # Returns the name of the table the alter statement refers to
+    #
+    # @return [String]
+    def table_name
+      statement.match(ALTER_TABLE_REGEX).captures[0]
+    end
+
     private
 
     attr_reader :statement
@@ -26,7 +34,7 @@ module PerconaMigrator
     # @return [String]
     def parsed_statement
       @parsed_statement ||= statement
-        .gsub(/ALTER TABLE `(\w+)` /, '')
+        .gsub(ALTER_TABLE_REGEX, '')
         .gsub('`','\\\`')
     end
   end

data/lib/percona_migrator/cli_generator.rb

@@ -56,8 +56,23 @@ module PerconaMigrator
     # @param statement [String] MySQL statement
     # @return [String]
     def generate(table_name, statement)
+      alter_argument = AlterArgument.new(statement)
       dsn = DSN.new(database, table_name)
+
+      "#{to_s} #{dsn} #{alter_argument}"
+    end
+
+    # Generates the percona command for a raw MySQL statement. Fills all the
+    # connection credentials from the current AR connection, but that can
+    # amended via ENV-vars: PERCONA_DB_HOST, PERCONA_DB_USER,
+    # PERCONA_DB_PASSWORD, PERCONA_DB_NAME Table name can't not be amended, it
+    # populates automatically from the migration data
+    #
+    # @param statement [String] MySQL statement
+    # @return [String]
+    def parse_statement(statement)
       alter_argument = AlterArgument.new(statement)
+      dsn = DSN.new(database, alter_argument.table_name)
 
       "#{to_s} #{dsn} #{alter_argument}"
     end
@@ -79,6 +94,8 @@ module PerconaMigrator
     end
 
     # Returns the command as a string that can be executed in a shell
+    #
+    # @return [String]
     def to_s
       @command.join(' ')
     end

data/lib/percona_migrator/railtie.rb

@@ -37,6 +37,18 @@ module PerconaMigrator
               connection_config.merge(adapter: 'percona')
             )
           end
+
+          # It executes the passed statement through the PerconaAdapter if it's
+          # an alter statement. It uses the mysql adapter otherwise.
+          #
+          # This is because +pt-online-schema-change+ is intended for alter
+          # statements only.
+          #
+          # @param sql [String]
+          # @param name [String] optional
+          def execute(sql, name = nil)
+            percona_execute(sql, name)
+          end
         end
       end
     end

data/lib/percona_migrator/version.rb

@@ -1,3 +1,3 @@
 module PerconaMigrator
-  VERSION = '0.1.0.rc.2'.freeze
+  VERSION = '0.1.0.rc.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percona_migrator
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc.2
+  version: 0.1.0.rc.3
 platform: ruby
 authors:
 - Ilya Zayats
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails