ridgepole 0.7.0.alpha2 → 0.7.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 062b636d39f10f64c5fc0b450021c914121982bc
-  data.tar.gz: 7948f752d4a6165ce5b95926ed910c47b32587af
+  metadata.gz: 5cbdcb1cafcede044e48cfd8b7a9c2799c96c98a
+  data.tar.gz: 6c9a147a2162f3c51110d9b1ee6051229638760c
 SHA512:
-  metadata.gz: aeab93ec074378be562709f3984dee5716381c961aa04e845fe78646cc40ee47a1e57caaad5bed77fd11639c5d3d6ad4db4a7a5e1055e320906cb9d2168a9ea8
-  data.tar.gz: 9fabbad5e5158b4916d1772352ca735a82363a41f11eaadae7776e789644c844dbd87d5b48d8b036cfb9ceb5a08c9bb612171ce1e5af833d4424e7b79a0746a7
+  metadata.gz: e9f9c72ae55df7d7dce3dd7a68fd4d5b37bdd5a43df49ed5c8038ad272242cbfdf305e2f5af415f6606057a94505f61b00f7dd9e6a23bfa43b6d9d980ac27dbf
+  data.tar.gz: 6356712998757d48fc5c54e3feef06e4c3580eed2d5cb81b265af9267fb3ebf3def563e81d38dc3761c5b1dcfe3e251399fcb22787df3b84c242023d03108b92

data/.travis.yml

@@ -16,8 +16,10 @@ before_script:
   - sudo service postgresql stop
   - docker-compose up -d
   - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -ppassword ping > /dev/null 2> /dev/null; }
+  - function mysql57_ping { mysqladmin -u root -h 127.0.0.1 -P 3307 -ppassword ping > /dev/null 2> /dev/null; }
   - function pg_ping { PGPASSWORD=password pg_isready -U postgres -h 127.0.0.1 > /dev/null 2> /dev/null; }
   - for i in {1..60}; do mysql_ping && break; sleep 1; done
+  - for i in {1..60}; do mysql57_ping && break; sleep 1; done
   - for i in {1..60}; do pg_ping && break; sleep 1; done
 script:
   - bundle exec rake
@@ -26,7 +28,8 @@ gemfile:
   - gemfiles/activerecord_5.1.gemfile
 env:
   matrix:
-    - POSTGRESQL=0
+    - MYSQL56=1
+    - MYSQL57=1
     - POSTGRESQL=1
 services:
   - docker

data/README.md

@@ -79,6 +79,7 @@ add_foreign_key :articles, :authors # without `name:`
   * Remove `--enable-mysql-awesome` option
   * Add `--skip-drop-table` option
   * Support foreign key without name
+  * Support MySQL JSON Type and Generated Columns
 
 ## Installation
 

data/docker-compose.yml

@@ -4,6 +4,12 @@ mysql:
     - "3306:3306"
   environment:
     MYSQL_ROOT_PASSWORD: password
+mysql57:
+  image: "mysql:5.7"
+  ports:
+    - "3307:3306"
+  environment:
+    MYSQL_ROOT_PASSWORD: password
 postgres:
   image: "postgres:9.5"
   ports:

data/lib/ridgepole/cli/config.rb

@@ -42,6 +42,7 @@ class Ridgepole::Config
         'username' => uri.user,
         'password' => uri.password,
         'host'     => uri.host,
+        'port'     => uri.port,
         'database' => uri.path.sub(%r|\A/|, ''),
       }
      end

data/lib/ridgepole/dsl_parser/table_definition.rb

@@ -57,6 +57,12 @@ class Ridgepole::DSLParser
       :bit,
       :bit_varying,
       :money,
+
+      # https://github.com/rails/rails/blob/v5.1.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L184
+      :virtual,
+
+      # https://github.com/rails/rails/blob/v5.0.4/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L53
+      :json,
     ].uniq
 
     TYPES.each do |column_type|

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0.alpha2'
+  VERSION = '0.7.0.alpha3'
 end

data/spec/mysql57/json/add_json_column_spec.rb

@@ -0,0 +1,33 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when add virtual column' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.json    "attrs", null: false
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

data/spec/mysql57/json/change_json_column_spec.rb

@@ -0,0 +1,100 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change virtual column / not null -> null' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.json    "attrs", null: false
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.json    "attrs"
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+
+  context 'when change virtual column / json -> string' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.json    "attrs", null: false
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.string  "attrs"
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+
+  context 'when change virtual column / string -> json' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.string  "attrs"
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.json    "attrs", null: false
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

data/spec/mysql57/json/drop_json_column_spec.rb

@@ -0,0 +1,33 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when add virtual column' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.json    "attrs", null: false
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "books", force: :cascade do |t|
+          t.string  "title", null: false
+          t.index ["title"], name: "index_books_on_title", <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

data/spec/mysql57/virtual/add_virtual_column_spec.rb

@@ -0,0 +1,35 @@
+describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
+  context 'when add virtual column' do
+    let(:actual_dsl) {
+      <<-EOS
+        create_table "books", force: :cascade do |t|
+          t.string  "title"
+          t.index ["title"], name: "index_books_on_title"
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      <<-EOS
+        create_table "books", force: :cascade do |t|
+          t.string   "title"
+          t.virtual  "upper_title", type: :string, as: "upper(`title`)"
+          t.virtual  "title_length", type: :integer, as: "length(`title`)", stored: true
+          t.index ["title"], name: "index_books_on_title"
+          t.index ["title_length"], name: "index_books_on_title_length"
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

data/spec/mysql57/virtual/change_virtual_column_spec.rb

@@ -0,0 +1,38 @@
+describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
+  context 'when change virtual column' do
+    let(:actual_dsl) {
+      <<-EOS
+        create_table "books", force: :cascade do |t|
+          t.string   "title"
+          t.virtual "upper_title", type: :string, null: false, as: "upper(`title`)"
+          t.virtual "title_length", type: :integer, null: false, as: "length(`title`)", stored: true
+          t.index ["title"], name: "index_books_on_title"
+          t.index ["title_length"], name: "index_books_on_title_length"
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      <<-EOS
+        create_table "books", force: :cascade do |t|
+          t.string   "title"
+          t.virtual "upper_title", type: :string, null: false, as: "length(`title`)"
+          t.virtual "title_length", type: :integer, null: false, as: "upper(`title`)", stored: true
+          t.index ["title"], name: "index_books_on_title"
+          t.index ["title_length"], name: "index_books_on_title_length"
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

data/spec/mysql57/virtual/drop_virtual_column_spec.rb

@@ -0,0 +1,35 @@
+describe 'Ridgepole::Client#diff -> migrate', condition: 5.1 do
+  context 'when drop virtual column' do
+    let(:actual_dsl) {
+      <<-EOS
+        create_table "books", force: :cascade do |t|
+          t.string   "title"
+          t.virtual  "upper_title", type: :string, as: "upper(`title`)"
+          t.virtual  "title_length", type: :integer, as: "length(`title`)", stored: true
+          t.index ["title"], name: "index_books_on_title"
+          t.index ["title_length"], name: "index_books_on_title_length"
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      <<-EOS
+        create_table "books", force: :cascade do |t|
+          t.string  "title"
+          t.index ["title"], name: "index_books_on_title"
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+end

data/spec/spec_condition.rb

@@ -6,6 +6,10 @@ module SpecCondition
       ENV['POSTGRESQL'] == '1'
     end
 
+    def mysql57?
+      ENV['MYSQL57'] == '1'
+    end
+
     def mysql_awesome_enabled?
       ENV['ENABLE_MYSQL_AWESOME'] == '1'
     end

data/spec/spec_const.rb

@@ -1,5 +1,5 @@
 TEST_MYSQL_HOST = '127.0.0.1'
-TEST_MYSQL_PORT = 3306
+TEST_MYSQL_PORT = ENV['MYSQL57'] == '1' ? 3307 : 3306
 TEST_MYSQL_USER = 'root'
 TEST_MYSQL_PASS = 'password'
 

data/spec/spec_helper.rb

@@ -39,6 +39,8 @@ RSpec.configure do |config|
     end
 
     case example.metadata[:file_path]
+    when /mysql57/
+      skip unless condition(:mysql57)
     when /mysql/
       skip if condition(:postgresql)
     when /postgresql/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha2
+  version: 0.7.0.alpha3
 platform: ruby
 authors:
 - Genki Sugawara
@@ -319,6 +319,12 @@ files:
 - spec/mysql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_create_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb
+- spec/mysql57/json/add_json_column_spec.rb
+- spec/mysql57/json/change_json_column_spec.rb
+- spec/mysql57/json/drop_json_column_spec.rb
+- spec/mysql57/virtual/add_virtual_column_spec.rb
+- spec/mysql57/virtual/change_virtual_column_spec.rb
+- spec/mysql57/virtual/drop_virtual_column_spec.rb
 - spec/postgresql/diff/diff_spec.rb
 - spec/postgresql/dump/dump_spec.rb
 - spec/postgresql/fk/migrate_change_fk_spec.rb
@@ -453,6 +459,12 @@ test_files:
 - spec/mysql/~default_name_fk/migrate_change_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_create_fk_spec.rb
 - spec/mysql/~default_name_fk/migrate_drop_fk_spec.rb
+- spec/mysql57/json/add_json_column_spec.rb
+- spec/mysql57/json/change_json_column_spec.rb
+- spec/mysql57/json/drop_json_column_spec.rb
+- spec/mysql57/virtual/add_virtual_column_spec.rb
+- spec/mysql57/virtual/change_virtual_column_spec.rb
+- spec/mysql57/virtual/drop_virtual_column_spec.rb
 - spec/postgresql/diff/diff_spec.rb
 - spec/postgresql/dump/dump_spec.rb
 - spec/postgresql/fk/migrate_change_fk_spec.rb