ridgepole 0.6.5.beta2 → 0.6.5.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5175eaaaf37dc9607941847db6b26fc41ded724a
-  data.tar.gz: 5091e1b556002310437ea3f6982b89e51ca37e74
+  metadata.gz: 9f55a300d2808032c178912f81d291ba094a867a
+  data.tar.gz: 20e173fc302bc246392f9efb96f4497c76154516
 SHA512:
-  metadata.gz: 5468e43b1edb0ec5e3bedd4c51caadb44bced02ee448ad22b5da5b5e0108060d78380387ca96469319bd4661dbef9e7c3c590c4d5ee4e161c51e2f6004bdda59
-  data.tar.gz: b73e8fef699d8bf36ea63ae656cd1961e4b1908486155dd055742a0d338d4c4b4a44aa80a34170a89eff58f31c6c17fca2a324dafd154783cdd86712041f84d1
+  metadata.gz: 42b281cc0ebcb60117addc51ddba6b3b39b4358cc86fe804a5a184f2e96e4cff193e66d89b4dedc821e08d529e5ecf23874fa7ee4026b31533ad51f7d050d1c8
+  data.tar.gz: 4cdd724e376511e9cbbb82b269b4aecfc3657f3d6618744b90cb5c43bc8e5353e50cc2a9f1e5f2be85616fe72e92163f2fd7dd1728d0b8b42036ecec040e969b

data/Appraisals

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

data/README.md

@@ -54,6 +54,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Fix rails version `'>= 4.2', '< 6'`
   * Support new types ([pull#84](https://github.com/winebarrel/ridgepole/pull/84))
   * Support `default: -> { ... }` ([pull#85](https://github.com/winebarrel/ridgepole/pull/85))
+  * Support DDL Comment (Rails5 only)
 
 ## Installation
 
@@ -202,7 +203,7 @@ add_index "child", ["parent_id"], name: "par_ind", using: :btree
 add_foreign_key "child", "parent", name: "child_ibfk_1"
 ```
 
-## Collation
+## Collation/Charset
 You can use the column collation by passing `--enable-mysql-awesome` ([activerecord-mysql-awesome](https://github.com/kamipo/activerecord-mysql-awesome) is required)
 
 ```ruby
@@ -214,6 +215,12 @@ create_table "articles", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSE
 end
 ```
 
+Charset:
+
+activerecord 5.0.0 and activerecord-mysql-awesome dumps a collation rather than charset because it does not determine the default collation for charset. Specifying a collation for each column would work if it is possible.
+
+See `mysql> show character set;` to find charset / collation pair for your system.
+
 ## Execute
 ```ruby
 create_table "authors", force: :cascade do |t|

data/gemfiles/activerecord_5.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", ">= 5.0.0.rc1"
+gem "activerecord", ">= 5.0.0"
 
 gemspec :path => "../"

data/lib/ridgepole/version.rb

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

data/spec/mysql/comment/comment_spec.rb

@@ -0,0 +1,177 @@
+describe 'Ridgepole::Client#diff -> migrate', condition: [:activerecord_5] do
+  context 'when change column (add comment)' do
+    let(:actual_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no",                null: false
+          t.integer "club_id",               null: false
+          t.string  "string",                null: false
+          t.text    "text",    limit: 65535, null: false
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no",                null: false, comment: "any comment"
+          t.integer "club_id",               null: false, comment: "any comment2"
+          t.string  "string",                null: false, comment: "any comment3"
+          t.text    "text",    limit: 65535, null: false, comment: "any comment4"
+        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 column (delete comment)' do
+    let(:actual_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no",                null: false, comment: "any comment"
+          t.integer "club_id",               null: false, comment: "any comment2"
+          t.string  "string",                null: false, comment: "any comment3"
+          t.text    "text",    limit: 65535, null: false, comment: "any comment4"
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no",                null: false
+          t.integer "club_id",               null: false
+          t.string  "string",                null: false
+          t.text    "text",    limit: 65535, null: false
+        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 column (change comment)' do
+    let(:actual_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no",                null: false, comment: "any comment"
+          t.integer "club_id",               null: false, comment: "any comment2"
+          t.string  "string",                null: false, comment: "any comment3"
+          t.text    "text",    limit: 65535, null: false, comment: "any comment4"
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no",                null: false, comment: "other comment"
+          t.integer "club_id",               null: false, comment: "other comment2"
+          t.string  "string",                null: false, comment: "other comment3"
+          t.text    "text",    limit: 65535, null: false, comment: "other comment4"
+        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 column (no change comment)' do
+    let(:actual_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade do |t|
+          t.integer "emp_no",                null: false, comment: "any comment"
+          t.integer "club_id",               null: false, comment: "any comment2"
+          t.string  "string",                null: false, comment: "any comment3"
+          t.text    "text",    limit: 65535, null: false, comment: "any comment4"
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(actual_dsl)
+      expect(delta.differ?).to be_falsey
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy actual_dsl
+    }
+  end
+
+  context 'when create table (with comment)' do
+    let(:expected_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade, comment: "table comment" do |t|
+          t.integer "emp_no",                null: false, comment: "other comment"
+          t.integer "club_id",               null: false, comment: "other comment2"
+          t.string  "string",                null: false, comment: "other comment3"
+          t.text    "text",    limit: 65535, null: false, comment: "other comment4"
+        end
+      EOS
+    }
+
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump.strip).to be_empty
+      delta.migrate
+      expect(subject.dump).to match_fuzzy expected_dsl
+    }
+  end
+
+  context 'when drop table (with comment)' do
+    let(:actual_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade, comment: "table comment" do |t|
+          t.integer "emp_no",                null: false, comment: "other comment"
+          t.integer "club_id",               null: false, comment: "other comment2"
+          t.string  "string",                null: false, comment: "other comment3"
+          t.text    "text",    limit: 65535, null: false, comment: "other comment4"
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff('')
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump).to match_fuzzy actual_dsl
+      delta.migrate
+      expect(subject.dump).to be_empty
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.5.beta2
+  version: 0.6.5.beta3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -230,6 +230,7 @@ files:
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb
 - spec/mysql/collation/collation_spec.rb
+- spec/mysql/comment/comment_spec.rb
 - spec/mysql/default_lambda/default_lambda_spec.rb
 - spec/mysql/diff/diff2_spec.rb
 - spec/mysql/diff/diff_spec.rb
@@ -354,6 +355,7 @@ test_files:
 - spec/mysql/cli/config_spec.rb
 - spec/mysql/cli/ridgepole_spec.rb
 - spec/mysql/collation/collation_spec.rb
+- spec/mysql/comment/comment_spec.rb
 - spec/mysql/default_lambda/default_lambda_spec.rb
 - spec/mysql/diff/diff2_spec.rb
 - spec/mysql/diff/diff_spec.rb