ridgepole 0.6.3.beta → 0.6.3.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e0f9257b25ebf5d941734433df6dd1866b5b0e9
-  data.tar.gz: 84097da34f74782d0b1ca02bdd29842ca9167b52
+  metadata.gz: 8de78f0c1a68e3c21972a27b2181a42534920567
+  data.tar.gz: 81b644deea5beba444ad3f4dcd79d9e816a3398f
 SHA512:
-  metadata.gz: d4ba059da276af54510fc6e9b8c7932f3f3060b033e736bb1dfda339fdc26f534f227ae0d5071b263044d83a6aac13dfa95d68d67e79745c3f92c8983d138dce
-  data.tar.gz: b13e98c9181aca062630f96cbd79f4b87e83cb69dcb48cdf8217b90dc1c41bd7a02566851a41c5158f054d3c4d54ac82c6c43beb7907baa803b20854e6e7234d
+  metadata.gz: fe51fa0e32f37492ab00ca349c6102d9e1db6e185c958ccbdca63375194f832ddb194f6d4c3280bf9f85e5de909d87c9b225b685afc0c793d66f096c3c103350
+  data.tar.gz: de8500f55d963d31cf18589dfe238fa1cc6e6b2a327c8707ed6faa2d04cdb8315138d2ef9503b2ed8b8c9e5ae1f7e0cb5ba092f8ebecd17abb3ad07d98fa7bfb

data/lib/ridgepole/diff.rb

@@ -243,9 +243,11 @@ class Ridgepole::Diff
   end
 
   def target?(table_name)
-    if @options[:ignore_tables] and @options[:ignore_tables].any? {|i| i =~ table_name }
+    if @options[:tables] and @options[:tables].include?(table_name)
+      true
+    elsif @options[:ignore_tables] and @options[:ignore_tables].any? {|i| i =~ table_name }
       false
-    elsif @options[:tables] and not @options[:tables].include?(table_name)
+    elsif @options[:tables]
       false
     else
       true

data/lib/ridgepole/dumper.rb

@@ -18,7 +18,7 @@ class Ridgepole::Dumper
 
     if ignore_tables
       conn.tables.each do |tbl|
-        if ignore_tables.any? {|i| i =~ tbl }
+        if ignore_tables.any? {|i| i =~ tbl } and not (target_tables and target_tables.include?(tbl))
           ActiveRecord::SchemaDumper.ignore_tables << tbl
         end
       end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.3.beta'
+  VERSION = '0.6.3.beta2'
 end

data/spec/mysql/migrate/migrate_with_ignore_tables_spec.rb

@@ -153,5 +153,179 @@ describe 'Ridgepole::Client#diff -> migrate' do
       RUBY
     }
   end
+
+  context 'when with ignore tables option (target and ignore)' do
+    let(:current_schema) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: :cascade 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: :cascade 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", ["salary"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 15, 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: :cascade 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
+      RUBY
+    }
+
+    let(:before_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: :cascade 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
+      RUBY
+    }
+
+    let(:after_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 15, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(current_schema).migrate }
+    subject { client(tables: ["employees"], ignore_tables: [/^.+$/] ) }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq before_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq after_dsl.strip_heredoc.strip
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_awesome: true)
+      expect(delta.differ?).to be_truthy
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+        change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :default=>nil, :unsigned=>false})
+      RUBY
+    }
+  end
+
+  context 'when with ignore tables option (target)' do
+    let(:current_schema) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: :cascade 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: :cascade 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", ["salary"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 15, 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: :cascade 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
+      RUBY
+    }
+
+    let(:before_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: :cascade 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
+      RUBY
+    }
+
+    let(:after_dsl) {
+      <<-RUBY
+        create_table "employees", primary_key: "emp_no", force: :cascade do |t|
+          t.date   "birth_date",            null: false
+          t.string "first_name", limit: 15, null: false
+          t.string "last_name",  limit: 16, null: false
+          t.string "gender",     limit: 1,  null: false
+          t.date   "hire_date",             null: false
+        end
+      RUBY
+    }
+
+    before { subject.diff(current_schema).migrate }
+    subject { client(tables: ["employees"]) }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to eq before_dsl.strip_heredoc.strip
+      delta.migrate
+      expect(subject.dump).to eq after_dsl.strip_heredoc.strip
+    }
+
+    it {
+      delta = Ridgepole::Client.diff(current_schema, dsl, ignore_tables: [/^salaries$/], reverse: true, enable_mysql_awesome: true)
+      expect(delta.differ?).to be_truthy
+      expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
+        change_column("employees", "first_name", :string, {:limit=>14, :null=>false, :default=>nil, :unsigned=>false})
+      RUBY
+    }
+  end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.3.beta
+  version: 0.6.3.beta2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord