ridgepole 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b1a22ee6618b697b68c9f0024f17fccf5087e0
-  data.tar.gz: 668ee8448ee3b954de116a02b8749d05c7a57795
+  metadata.gz: 04ff9c0b5b25d5bed40e085992ae9f4a605381e6
+  data.tar.gz: 799269ed647277c33317a16596cbb068498592d6
 SHA512:
-  metadata.gz: ad235b54d5770469f6e8111a81945b91d0c2ca305a28a4b998c29f4d7e43e27ec9d87b1fd59383f90af2db616a7010eab20e501d791490c9540da7299b9dada9
-  data.tar.gz: eb29c85a720959fd535e035d35e9c27b66a715351e796ec5317c682680e78d57c6fa29382211bf6ab424f4443829cc3e724af3cb87ee2674579c00b0ef3d5028
+  metadata.gz: 6717299b01c508286c13ee9dffcfcfb5cc6066a4629de48a0f7000bdcc2b6059b4a480dc7589307036c7fd5eb7be6cb0f761db8b738dc8a54e47b8be60054da4
+  data.tar.gz: 4a82f7ae17dcbdafd2748f22142bdf5986d4005bb7ca6400dd0a57a13e0543c4f4f4cf51f0e14aa5bf27ca14029424221fe4234984f8a739adab64c3ea362ae2

data/README.md

@@ -32,6 +32,8 @@ Usage: ridgepole [options]
         --dry-run
         --table-options OPTIONS
         --bulk-change
+        --pre-query QUERY
+        --post-query QUERY
     -e, --export
         --split
         --split-with-dir

data/bin/ridgepole

@@ -51,6 +51,8 @@ ARGV.options do |opt|
       raise "Cannot use `bulk-change` in `merge`" if options[:merge]
       options[:bulk_change] = true
     }
+    opt.on('',   '--pre-query QUERY')             {|v| options[:pre_query] = v                              }
+    opt.on('',   '--post-query QUERY')            {|v| options[:post_query] = v                             }
     opt.on('-e', '--export')                      {    set_mode[:export]                                    }
     opt.on('',   '--split')                       {|v| split = true                                         }
     opt.on('',   '--split-with-dir')              {|v| split = :with_dir                                    }

data/lib/ridgepole/delta.rb

@@ -59,7 +59,7 @@ class Ridgepole::Delta
         end
 
         Ridgepole::ExecuteExpander.without_operation(callback) do
-          eval_script(script)
+          eval_script(script, buf)
         end
 
         buf.string.strip
@@ -71,14 +71,38 @@ class Ridgepole::Delta
     end
   end
 
-  def eval_script(script)
+  def eval_script(script, out = $stdout)
     begin
-      ActiveRecord::Schema.new.instance_eval(script, SCRIPT_NAME, 1)
+      with_pre_post_query(out) do
+        ActiveRecord::Schema.new.instance_eval(script, SCRIPT_NAME, 1)
+      end
     rescue => e
       raise_exception(script, e)
     end
   end
 
+  def with_pre_post_query(out = $stdout)
+    if (pre_query = @options[:pre_query])
+      if @options[:noop]
+        out.puts(pre_query)
+      else
+        ActiveRecord::Base.connection.execute(pre_query)
+      end
+    end
+
+    retval = yield
+
+    if (post_query = @options[:post_query])
+      if @options[:noop]
+        out.puts(post_query)
+      else
+        ActiveRecord::Base.connection.execute(post_query)
+      end
+    end
+
+    return retval
+  end
+
   def raise_exception(script, org)
     lines = script.each_line
     digit_number = (lines.count + 1).to_s.length

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

data/spec/migrate/migrate_with_pre_post_query_spec.rb

@@ -0,0 +1,165 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'migrate with pre/post query' do
+    let(:actual_dsl) { '' }
+    let(:dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",              null: false
+          t.string  "dept_no",   limit: 4, null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "clubs", force: true do |t|
+          t.string "name", default: "", null: false
+        end
+
+        add_index "clubs", ["name"], name: "idx_name", unique: true, using: :btree
+
+        create_table "departments", primary_key: "dept_no", force: true do |t|
+          t.string "dept_name", limit: 40, null: false
+        end
+
+        add_index "departments", ["dept_name"], name: "dept_name", unique: true, using: :btree
+
+        create_table "dept_emp", id: false, force: true do |t|
+          t.integer "emp_no",              null: false
+          t.string  "dept_no",   limit: 4, null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_emp", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_emp", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "dept_manager", id: false, force: true do |t|
+          t.string  "dept_no",   limit: 4, null: false
+          t.integer "emp_no",              null: false
+          t.date    "from_date",           null: false
+          t.date    "to_date",             null: false
+        end
+
+        add_index "dept_manager", ["dept_no"], name: "dept_no", using: :btree
+        add_index "dept_manager", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "employee_clubs", force: true do |t|
+          t.integer "emp_no",  unsigned: true, null: false
+          t.integer "club_id", unsigned: true, null: false
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+
+        create_table "employees", primary_key: "emp_no", force: true do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 14, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+
+        create_table "post", id: false, force: true do |t|
+          t.integer "id"
+        end
+
+        create_table "pre", id: false, force: true do |t|
+          t.integer "id"
+        end
+
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+
+        create_table "titles", id: false, force: true do |t|
+          t.integer "emp_no",               null: false
+          t.string  "title",     limit: 50, null: false
+          t.date    "from_date",            null: false
+          t.date    "to_date"
+        end
+
+        add_index "titles", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    subject {
+      client(
+        :pre_query  => 'create table pre  (id int)',
+        :post_query => 'create table post (id int)',
+      )
+    }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq expected_dsl.strip_heredoc.strip
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -155,6 +155,7 @@ files:
 - spec/migrate/migrate_skip_rename_column_spec.rb
 - spec/migrate/migrate_skip_rename_table_spec.rb
 - spec/migrate/migrate_with_ignore_tables_spec.rb
+- spec/migrate/migrate_with_pre_post_query_spec.rb
 - spec/migrate/migrate_with_tables_spec.rb
 - spec/ridgepole_test_database.sql
 - spec/ridgepole_test_tables.sql
@@ -217,6 +218,7 @@ test_files:
 - spec/migrate/migrate_skip_rename_column_spec.rb
 - spec/migrate/migrate_skip_rename_table_spec.rb
 - spec/migrate/migrate_with_ignore_tables_spec.rb
+- spec/migrate/migrate_with_pre_post_query_spec.rb
 - spec/migrate/migrate_with_tables_spec.rb
 - spec/ridgepole_test_database.sql
 - spec/ridgepole_test_tables.sql