ridgepole 0.7.3.beta2 → 0.7.3.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acad17ac1fb19603bbf36ba03f17510ddd752db8
-  data.tar.gz: 93ccceda898278fb96684aaaa23bff4a6b1a0fb2
+  metadata.gz: 7a40a3e0af48eec8639364ed4757e8af349cea63
+  data.tar.gz: 7cae592ecd1b5d9127988341ec8da8e072749a71
 SHA512:
-  metadata.gz: 4013ac5fff9afef7c70282b2b1a26543ec08832e30e8551b18f8ae9f3e019629d6143a8167084bc0556d2d116a4a2822b449af34fcc64e0a00480cc01ceeaadf
-  data.tar.gz: a081d8554675a28c9b55fefcb959d39d48c640ce768935b53eb0ccefdaff2a5e8b1eb84a3a1540ae4bde82c765af096dd17abb620412018f96b01c64247b3d46
+  metadata.gz: 5e9056bf844f8d96510f1d30537aadbf2a53de215045e92e96a1a3877c1cad2a5d597332e5f53aba2a983966a5956680845aea3da94bf6b138de97fdf0d11897
+  data.tar.gz: 45fc6de5dde52f208701d7bcc027a16fb7bc3c1f1b8fa463ce3bbbf4c4403b6a0fc34becb01ba80db897a853f8c3f306352cd8646634873e3932ae4e5cd8f631

data/README.md

@@ -6,7 +6,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 (like Chef/Puppet)
 
 [![Gem Version](https://badge.fury.io/rb/ridgepole.svg)](http://badge.fury.io/rb/ridgepole)
-[![Unstable Version](https://img.shields.io/badge/unstable-0.7.3.beta-green.svg?longCache=true&style=flat)](https://rubygems.org/gems/ridgepole/versions/0.7.3.beta)
+[![Unstable Version](https://img.shields.io/badge/unstable-0.7.3.beta3-green.svg?longCache=true&style=flat)](https://rubygems.org/gems/ridgepole/versions/0.7.3.beta3)
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.7)](https://travis-ci.org/winebarrel/ridgepole)
 [![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.7)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.7)
 
@@ -86,7 +86,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 * `>= 0.7.3`
   * Add `--mysql-change-table-comment option` ([pull#166](https://github.com/winebarrel/ridgepole/pull/166))
   * Refactoring with RuboCop
-  * Support primary key dropping ([issue#246](https://github.com/winebarrel/ridgepole/issues/246))
+  * Support primary key adding/dropping ([issue#246](https://github.com/winebarrel/ridgepole/issues/246))
 
 ## Installation
 

data/lib/ridgepole/diff.rb

@@ -139,7 +139,13 @@ module Ridgepole
       pk_attrs = build_primary_key_attrs_if_changed(from, to, table_name)
       if pk_attrs
         if @options[:allow_pk_change]
-          delta_type = pk_attrs[:options][:id] == false ? :delete : :change
+          if from[:id] == false
+            delta_type = :add
+            pk_attrs[:options][:primary_key] = true
+          else
+            delta_type = pk_attrs[:options][:id] == false ? :delete : :change
+          end
+
           table_delta[:primary_key_definition] = { delta_type => { id: pk_attrs } }
         else
           @logger.warn(<<-MSG)
@@ -170,7 +176,7 @@ module Ridgepole
                Ridgepole::DSLParser::TableDefinition::DEFAULT_PRIMARY_KEY_TYPE
              end
 
-      if %i[integer bigint].include?(type) && !options.key?(:default)
+      if %i[integer bigint].include?(type) && !options.key?(:default) && !Ridgepole::ConnectionAdapters.postgresql?
         options[:auto_increment] = true
       end
 

data/lib/ridgepole/version.rb

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

data/spec/postgresql/migrate/migrate_primary_key2_spec.rb

@@ -0,0 +1,71 @@
+describe 'Ridgepole::Client#diff -> migrate', condition: '>= 5.1.0' do
+  let(:actual_dsl) do
+    erbh(<<-ERB)
+      create_table "employees", id: false, force: :cascade do |t|
+        t.string "name"
+      end
+    ERB
+  end
+
+  before do
+    subject.diff('').migrate
+    subject.diff(actual_dsl).migrate
+  end
+  subject { client(allow_pk_change: allow_pk_change) }
+
+  context 'when allow_pk_change option is false' do
+    let(:allow_pk_change) { false }
+
+    context 'with difference' do
+      let(:expected_dsl) do
+        erbh(<<-ERB)
+          create_table "employees", id: :bigint, force: :cascade do |t|
+            t.string "name"
+          end
+        ERB
+      end
+
+      it {
+        expect(Ridgepole::Logger.instance).to receive(:warn).with(<<-MSG)
+[WARNING] Primary key definition of `employees` differ but `allow_pk_change` option is false
+  from: {:id=>false}
+    to: {:id=>:bigint}
+        MSG
+
+        delta = subject.diff(expected_dsl)
+        expect(delta.differ?).to be_falsey
+        delta.migrate
+        expect(subject.dump).to match_ruby actual_dsl
+      }
+    end
+
+    context 'with no difference' do
+      let(:expected_dsl) { actual_dsl }
+
+      it {
+        expect(Ridgepole::Logger.instance).to_not receive(:warn)
+
+        delta = subject.diff(expected_dsl)
+        expect(delta.differ?).to be_falsey
+      }
+    end
+  end
+
+  context 'when allow_pk_change option is true' do
+    let(:allow_pk_change) { true }
+    let(:expected_dsl) do
+      erbh(<<-ERB)
+        create_table "employees", id: :serial, force: :cascade do |t|
+          t.string "name"
+        end
+      ERB
+    end
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      delta.migrate
+      expect(subject.dump).to match_ruby expected_dsl
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.3.beta2
+  version: 0.7.3.beta3
 platform: ruby
 authors:
 - Genki Sugawara
@@ -390,6 +390,7 @@ files:
 - spec/postgresql/migrate/migrate_drop_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_table_spec.rb
 - spec/postgresql/migrate/migrate_ext_cols_spec.rb
+- spec/postgresql/migrate/migrate_primary_key2_spec.rb
 - spec/postgresql/migrate/migrate_primary_key_spec.rb
 - spec/postgresql/migrate/migrate_references_spec.rb
 - spec/postgresql/migrate/migrate_rename_column_spec.rb
@@ -546,6 +547,7 @@ test_files:
 - spec/postgresql/migrate/migrate_drop_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_table_spec.rb
 - spec/postgresql/migrate/migrate_ext_cols_spec.rb
+- spec/postgresql/migrate/migrate_primary_key2_spec.rb
 - spec/postgresql/migrate/migrate_primary_key_spec.rb
 - spec/postgresql/migrate/migrate_references_spec.rb
 - spec/postgresql/migrate/migrate_rename_column_spec.rb