ridgepole 0.7.0.beta11 → 0.7.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecc5673186f25067b337cfc75180d44b82bba7ce
-  data.tar.gz: 1601ea4b2ab780f97048bdc82b1896cffa3395fe
+  metadata.gz: 49d810a267218a0eb0e29b24172b263bb01160de
+  data.tar.gz: 103967b434908d08b210e156107f5833fc45a567
 SHA512:
-  metadata.gz: ba82871050164aca91fbcc7346a1d892bbc02de322f850ff70c6dd5ab41366b6a6bb1ffa609c7ad74f30be35ba839ccb0720d95bf2551721070d9a57e1514b37
-  data.tar.gz: a7e2278fd069aa686a2a9a652234d3ae069e23a4b46b822272b1310bcfadc4560f99e8e35984fb0e5aebd32bd35555f1d7fe916deeb913ce4d6d6da5ca3d45e8
+  metadata.gz: 80869484e860c7e14bd0757b09b72a6694cfa8dfadc883127f7f61c32e198954e16c00deb2ff63568c0fa04525b5604d9eb65c111a54654d035d1c534e7afab9
+  data.tar.gz: dd88225d51a88f149f8de5b913fa7198d5c97ff707e91062b7eb21a61be4e53d5f09b336adaef5f080ea98b9257b1a427bc83738760c1c5ffe321929e4108957

data/README.md

@@ -9,7 +9,7 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
 [![Build Status](https://travis-ci.org/winebarrel/ridgepole.svg?branch=0.6)](https://travis-ci.org/winebarrel/ridgepole)
 [![Coverage Status](https://coveralls.io/repos/github/winebarrel/ridgepole/badge.svg?branch=0.6)](https://coveralls.io/github/winebarrel/ridgepole?branch=0.6)
 
-[![Edge Version](https://img.shields.io/badge/edge_version-0.7.0.beta11-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta11)
+[![Edge Version](https://img.shields.io/badge/edge_version-0.7.0.beta12-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta12)
 [![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)
 

data/lib/ridgepole/dsl_parser/context.rb

@@ -64,8 +64,10 @@ class Ridgepole::DSLParser
         column_name.each do |col|
           options[:length][col] = index_length
         end
+      end
 
-        options[:length] = options[:length].symbolize_keys
+      if options[:length]
+        options[:length] = options[:length].compact.symbolize_keys
       end
 
       @__definition[table_name][:indices][idx] = {

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0.beta11'
+  VERSION = '0.7.0.beta12'
 end

data/spec/mysql/migrate/migrate_change_index8_spec.rb

@@ -0,0 +1,83 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change index (length has string keys) / No update' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", 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
+          t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: { first_name: 10, last_name: 10 }, <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", 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
+          t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: { "first_name" => 10, "last_name" => 10, "foo" => nil }, <%= 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_falsy
+      expect(subject.dump).to match_fuzzy actual_dsl
+    }
+  end
+
+  context 'when change index (length has string keys) / Update' do
+    let(:actual_dsl) {
+      <<-EOS
+        create_table "employees", primary_key: "emp_no", 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
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "employees", primary_key: "emp_no", 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
+          t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: { "first_name" => 10, "last_name" => 10 }, <%= i cond(5.0, using: :btree) %>
+        end
+      EOS
+    }
+
+    let(:actual_dsl_plus_index) {
+      actual_dsl.sub(/\bend\b/, erbh(<<-EOS))
+          t.index ["first_name", "last_name"], name: "idx_first_name_last_name", length: { first_name: 10, last_name: 10 }, <%= 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 actual_dsl_plus_index
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta11
+  version: 0.7.0.beta12
 platform: ruby
 authors:
 - Genki Sugawara
@@ -282,6 +282,7 @@ files:
 - spec/mysql/migrate/migrate_change_index5_spec.rb
 - spec/mysql/migrate/migrate_change_index6_spec.rb
 - spec/mysql/migrate/migrate_change_index7_spec.rb
+- spec/mysql/migrate/migrate_change_index8_spec.rb
 - spec/mysql/migrate/migrate_change_index_spec.rb
 - spec/mysql/migrate/migrate_change_table_option_spec.rb
 - spec/mysql/migrate/migrate_check_relation_column_type_spec.rb
@@ -426,6 +427,7 @@ test_files:
 - spec/mysql/migrate/migrate_change_index5_spec.rb
 - spec/mysql/migrate/migrate_change_index6_spec.rb
 - spec/mysql/migrate/migrate_change_index7_spec.rb
+- spec/mysql/migrate/migrate_change_index8_spec.rb
 - spec/mysql/migrate/migrate_change_index_spec.rb
 - spec/mysql/migrate/migrate_change_table_option_spec.rb
 - spec/mysql/migrate/migrate_check_relation_column_type_spec.rb