percona_ar 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c1a24ca584e4a4a1dfeba924dad60cf31142c6
-  data.tar.gz: ef25b39557b377cfc5516f1d04477db9ae3eb446
+  metadata.gz: 346cb4b9523c0748011df09c3b62811a47a05049
+  data.tar.gz: cee3ce9670f95fa150451c208ce6d2d5be58129f
 SHA512:
-  metadata.gz: aaff99016bfc92169d1cc36d55c0b57d46e3d5434f8124df55626ca33b8feec495b0079f081f5bbc0e2daef7312df0b3d381515fbe69b6d921f7b4462fc43245
-  data.tar.gz: 92102722a4bc59ca238c9eb55695de937a1302d5a1687dd12ff793e4a015dab909b169217f8c92a1d8b3f31de981ff691f2676d66f806e27ae1777e2c8d87027
+  metadata.gz: ee6ac997a9128c010ed2fcd586ba8f08d92b81dc21ad9a585095a44911dd938509366d5b3791426bc48b16d71938bd2b2302adf93879630b16cfbe2e3fee29a9
+  data.tar.gz: b1656bbe29212bdacb414296541dfbf016a308b4274b221631bdbf3deaa11f49c82f4e5ee61766985ae15a90b44e56edef0037d8ce3e8b4cc6fc383f45b7a328

data/README.md

@@ -60,7 +60,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/percona_ar_migration. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/jamesmacwilliam/percona_ar. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](CODE_OF_CONDUCT.md) code of conduct.
 
 
 ## License

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "percona_ar_migration"
+require "percona_ar"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/percona_ar/connection.rb

@@ -10,7 +10,7 @@ class PerconaAr::Connection < ActiveRecord::ConnectionAdapters::Mysql2Adapter
 
   def execute(sql, name = nil)
     return super unless sql =~ /^ALTER TABLE.*/
-    PerconaAr::PtOnlineSchemaChangeExecutor.new(sql).call
+    $query_builder.add sql
   end
 
   def not_implemented(*)

data/lib/percona_ar/migration.rb

@@ -3,4 +3,10 @@ class PerconaAr::Migration < ActiveRecord::Migration
     @percona_connection ||=
       PerconaAr::Connection.new(ActiveRecord::Base.connection)
   end
+
+  def migrate(*args)
+    $query_builder = PerconaAr::QueryBuilder.new
+    super
+    $query_builder.execute
+  end
 end

data/lib/percona_ar/pt_online_schema_change_executor.rb

@@ -4,27 +4,21 @@ require 'rake/file_utils'
 class PerconaAr::PtOnlineSchemaChangeExecutor
   include FileUtils
 
-  attr_accessor :sql
+  attr_accessor :sql, :table
 
-  def initialize(sql)
+  def initialize(table, sql)
+    @table = table
     @sql = sql
   end
 
   def call
-    if sql =~ /^ALTER TABLE `([^`]*)` (.*)/i
-      sh "#{boilerplate}#{suffix($1, $2)}"
-    end
+    sh "#{boilerplate}#{suffix(table, sql)}"
   end
 
   private
 
   def suffix(table, cmd)
-    "'#{get_sql_for(cmd)}' --recursion-method none --no-check-alter --execute D=#{config[:database]},t=#{table}"
-  end
-
-  def get_sql_for(cmd)
-    return cmd unless cmd =~ /DROP/i && !(cmd =~ /COLUMN/i)
-    cmd.gsub(/DROP/i, "DROP COLUMN")
+    "'#{cmd}' --recursion-method none --no-check-alter --execute D=#{config[:database]},t=#{table}"
   end
 
   def boilerplate

data/lib/percona_ar/query_builder.rb

@@ -0,0 +1,26 @@
+class PerconaAr::QueryBuilder
+  def initialize
+    @tables = Hash.new {|h, k| h[k] = [] }
+  end
+
+  def execute
+    @tables.each do |table, snippets|
+      PerconaAr::PtOnlineSchemaChangeExecutor.new(table, snippets.join(", ")).call
+    end
+  end
+
+  def add(sql)
+    if sql =~ /^ALTER TABLE `([^`]*)` (.*)/i
+      @tables[$1.to_s] << get_sql_for($2)
+    end
+    self
+  end
+
+  private
+
+  def get_sql_for(cmd)
+    return cmd unless cmd =~ /DROP/i && !(cmd =~ /COLUMN/i)
+    cmd.gsub(/DROP/i, "DROP COLUMN")
+  end
+
+end

data/lib/percona_ar/version.rb

@@ -1,3 +1,3 @@
 module PerconaAr
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/percona_ar.rb

@@ -3,6 +3,7 @@ require "active_record"
 require "active_record/connection_adapters/mysql2_adapter"
 require "percona_ar/version"
 require "percona_ar/pt_online_schema_change_executor"
+require "percona_ar/query_builder"
 require "percona_ar/connection"
 require "percona_ar/migration"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percona_ar
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - James Mac William
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,8 +130,8 @@ files:
 - lib/percona_ar/connection.rb
 - lib/percona_ar/migration.rb
 - lib/percona_ar/pt_online_schema_change_executor.rb
+- lib/percona_ar/query_builder.rb
 - lib/percona_ar/version.rb
-- percona_ar-0.1.0.gem
 - percona_ar.gemspec
 homepage: https://github.com/jamesmacwilliam/percona_ar
 licenses: