ridgepole 0.6.6.beta2 → 0.6.6.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df6fb1b72b3ab0c234c0f8b72c216dcff83b8c8
-  data.tar.gz: bf7df0782ede514d34dfaa0338b208b25b70005c
+  metadata.gz: 69e07383f631bfa85f0f2e3fa67b41f14d643796
+  data.tar.gz: cfdcf4c62c27f9e65734596bb865464c53f824bf
 SHA512:
-  metadata.gz: dc45bcdfc390d0f8fb556ca0e3fd8c3825cfea3de88acf76e5436fc96288aea717e141b97a4afd1ff61a17655b9636bf5e57aecef5f2f90cb14460e674610c64
-  data.tar.gz: '088b3823dcdd796f3f8b1d49b78135f37a0afe8c479552ca63ddd33983fe37c9f5697e38b85cb7024e0d7ee773e8c32bafc20a850674046c584f818f770fb4a8'
+  metadata.gz: 2b9bbaace20b8d21a8d1923dc3e5ba9d7a70296a24ff3e185640745aba8344e537eefa8feac5cc78f0eff62003b924a0909e09cf775952e2097c7d0661a7e8c5
+  data.tar.gz: 8a1280a097d513e46769250a90401952bb49678425dc6ef4b24b4581db049c01e6adbf7fb6e969b08b5ab04c61d934d2ae3fd7d8822b0062761961a1c5c059dd

data/Appraisals

@@ -4,5 +4,5 @@ appraise "activerecord-4.2" do
 end
 
 appraise 'activerecord-5.0' do
-  gem 'activerecord', '>= 5.0.0'
+  gem 'activerecord', '~> 5.0.0'
 end

data/gemfiles/activerecord_4.2.gemfile

@@ -5,4 +5,4 @@ source "https://rubygems.org"
 gem "activerecord", "~> 4.2.0"
 gem "activerecord-mysql-awesome", ">= 0.0.7"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/activerecord_5.0.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/ridgepole/diff.rb

@@ -55,6 +55,8 @@ class Ridgepole::Diff
       next unless target?(table_name)
 
       if (from_table_name = (to_attrs[:options] || {}).delete(:renamed_from))
+        from_table_name = from_table_name.to_s if from_table_name
+
         # Already renamed
         next if from[table_name]
 
@@ -195,6 +197,8 @@ class Ridgepole::Diff
   def scan_column_rename(from, to, definition_delta)
     to.dup.each do |column_name, to_attrs|
       if (from_column_name = (to_attrs[:options] || {}).delete(:renamed_from))
+        from_column_name = from_column_name.to_s if from_column_name
+
         # Already renamed
         next if from[column_name]
 

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.6.beta2'
+  VERSION = '0.6.6.beta3'
 end

data/spec/mysql/migrate/migrate_rename_table_spec.rb

@@ -127,14 +127,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
         <%= add_index "salaries", ["emp_no"], name: "emp_no", using: :btree %>
 
-        create_table "titles", id: false, force: :cascade do |t|
+        create_table "titles2", id: false, force: :cascade, renamed_from: :titles do |t|
           t.integer "emp_no",    <%= i limit(4) + {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 %>
+        <%= add_index "titles2", ["emp_no"], name: "emp_no", using: :btree %>
       EOS
     }
 
@@ -146,7 +146,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to match_fuzzy actual_dsl
       delta.migrate
-      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/, renamed_from: 'employees'/, '')
+      expect(subject.dump).to match_fuzzy expected_dsl.gsub(/, renamed_from: ('employees'|:titles)/, '')
     }
 
     it {
@@ -154,6 +154,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy <<-EOS
         rename_table("employees2", "employees")
+        rename_table("titles2", "titles")
       EOS
     }
   end
@@ -170,6 +171,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         <%= add_index "employees", ["first_name"], name: "first_name", using: :btree %>
+
+        create_table "employees3", primary_key: "emp_no", <%= i unsigned(true) + {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
+
+        <%= add_index "employees3", ["first_name"], name: "first_name", using: :btree %>
       EOS
     }
 
@@ -184,6 +195,16 @@ describe 'Ridgepole::Client#diff -> migrate' do
         end
 
         <%= add_index "employees2", ["first_name"], name: "first_name", using: :btree %>
+
+        create_table "employees4", primary_key: "emp_no", <%= i unsigned(true) + {force: :cascade} %>, renamed_from: :employees3 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
+
+        <%= add_index "employees4", ["first_name"], name: "first_name", using: :btree %>
       EOS
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.6.beta2
+  version: 0.6.6.beta3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord