ridgepole 0.6.5.beta10 → 0.6.5.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 145c30f16a0e8c3c7aa2a56ded6db3bbbabded5f
-  data.tar.gz: 577cacc926ed818f403cc066cc6f299f8faea54c
+  metadata.gz: 9d9f5c2109909e6a196908e0a0990e62a5b00030
+  data.tar.gz: 30a539a691cf72848afa5ba2ef81c9ce8a7dc2ce
 SHA512:
-  metadata.gz: cefea2b7ea2341fe5dd3155b81c34ea947fe4fd5e1b71ebf5436aa43d27e688d6f596b1834526617d13af74e2d8e94395ff7d9dbd63506221b49f18ebb48bd3f
-  data.tar.gz: 9d8070a7d1cad32919673def208f8bf66956fccb3c86fe4973272d5c82ae1444dfc12dd32b2cff1e7ccf499943b77300366f2b8a135405fed9e52b6ff76c8682
+  metadata.gz: a404a78077b95bd8feeac8e3cabc25910440784f9b9c1db0fa144332a9352a47465b86e0f24df5f08ecc9003e405db9e73b282cb4abd085a8fc595f22763d9c6
+  data.tar.gz: 597e212b753edf77db08483b1b827951dd893c5b129b75a7fd509ac317c3b49241f3797324774de04283faac3b2527ae1640c838e70e9899430b6062c45bbb71

data/lib/ridgepole/diff.rb

@@ -147,6 +147,18 @@ class Ridgepole::Diff
       priv_column_name = column_name
     end
 
+    if self.class.postgresql?
+      added_size = 0
+      to.reverse_each.with_index do |(column_name, to_attrs), i|
+        if to_attrs[:options].delete(:after)
+          if added_size != i
+            @logger.warn("[WARNING] PostgreSQL doesn't support adding a new column except for the last position. #{table_name}.#{column_name} will be added to the last.")
+          end
+          added_size += 1
+        end
+      end
+    end
+
     unless @options[:merge]
       from.each do |column_name, from_attrs|
         definition_delta[:delete] ||= {}
@@ -382,4 +394,8 @@ class Ridgepole::Diff
 
     diffy.to_s(:text).gsub(/\s+\z/m, '')
   end
+
+  def self.postgresql?
+    defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+  end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.5.beta10'
+  VERSION = '0.6.5.beta11'
 end

data/spec/postgresql/diff/diff_spec.rb

@@ -1,4 +1,8 @@
 describe 'Ridgepole::Client.diff' do
+  before do
+    allow(Ridgepole::Diff).to receive(:postgresql?).and_return(true)
+  end
+
   context 'when change column' do
     let(:actual_dsl) {
       <<-EOS
@@ -148,4 +152,57 @@ describe 'Ridgepole::Client.diff' do
       EOS
     }
   end
+
+  describe 'column position warning' do
+    subject { Ridgepole::Client }
+
+    context 'when adding a column to the last' do
+      let(:actual_dsl) { <<-EOS }
+      create_table "users", force: :cascade do |t|
+        t.string "name", null: false
+      end
+      EOS
+
+      let(:expected_dsl) { <<-EOS }
+      create_table "users", force: :cascade do |t|
+        t.string "name", null: false
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+      end
+      EOS
+
+      it "doesn't warn anything" do
+        expect(Ridgepole::Logger.instance).to_not receive(:warn)
+        delta = subject.diff(actual_dsl, expected_dsl)
+        expect(delta).to be_differ
+        expect(delta.script).to_not include('after')
+      end
+    end
+
+    context 'when adding a column to the middle' do
+      let(:actual_dsl) { <<-EOS }
+      create_table "users", force: :cascade do |t|
+        t.datetime "created_at", null: false
+      end
+      EOS
+
+      let(:expected_dsl) { <<-EOS }
+      create_table "users", force: :cascade do |t|
+        t.string "name", null: false
+        t.integer "age", null: false
+        t.datetime "created_at", null: false
+        t.datetime "updated_at", null: false
+      end
+      EOS
+
+      it 'warns position' do
+        expect(Ridgepole::Logger.instance).to receive(:warn).with(/PostgreSQL doesn't support adding a new column .* users\.name/)
+        expect(Ridgepole::Logger.instance).to receive(:warn).with(/PostgreSQL doesn't support adding a new column .* users\.age/)
+        expect(Ridgepole::Logger.instance).to_not receive(:warn)
+        delta = subject.diff(actual_dsl, expected_dsl)
+        expect(delta).to be_differ
+        expect(delta.script).to_not include('after')
+      end
+    end
+  end
 end

data/spec/postgresql/migrate/migrate_add_column_spec.rb

@@ -163,12 +163,12 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to match_fuzzy actual_dsl
       expect(delta.script).to match_fuzzy <<-EOS
         change_table("employee_clubs", {:bulk => true}) do |t|
-          t.column("any_col", :string, {:limit=>255, :null=>false, :after=>"club_id"})
+          t.column("any_col", :string, {:limit=>255, :null=>false})
         end
 
         change_table("employees", {:bulk => true}) do |t|
-          t.column("age", :integer, {:null=>false, :after=>"hire_date"})
-          t.column("updated_at", :date, {:after=>"age"})
+          t.column("age", :integer, {:null=>false})
+          t.column("updated_at", :date, {})
         end
       EOS
       delta.migrate

data/spec/postgresql/migrate/migrate_drop_column_spec.rb

@@ -145,14 +145,14 @@ describe 'Ridgepole::Client#diff -> migrate' do
       delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to match_fuzzy <<-EOS
-        add_column("dept_emp", "from_date", :date, {:null=>false, :after=>"dept_no"})
-        add_column("dept_emp", "to_date", :date, {:null=>false, :after=>"from_date"})
+        add_column("dept_emp", "from_date", :date, {:null=>false})
+        add_column("dept_emp", "to_date", :date, {:null=>false})
 
-        add_column("dept_manager", "from_date", :date, {:null=>false, :after=>"emp_no"})
-        add_column("dept_manager", "to_date", :date, {:null=>false, :after=>"from_date"})
+        add_column("dept_manager", "from_date", :date, {:null=>false})
+        add_column("dept_manager", "to_date", :date, {:null=>false})
 
-        add_column("employees", "last_name", :string, {:limit=>16, :null=>false, :after=>"first_name"})
-        add_column("employees", "hire_date", :date, {:null=>false, :after=>"last_name"})
+        add_column("employees", "last_name", :string, {:limit=>16, :null=>false})
+        add_column("employees", "hire_date", :date, {:null=>false})
       EOS
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.5.beta10
+  version: 0.6.5.beta11
 platform: ruby
 authors:
 - Genki Sugawara