ridgepole 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a09898d122a3138706ad9e835a0e0941a56749be
-  data.tar.gz: e0bd6aa6ba825488ef7e53fcd68db3267dcde79a
+  metadata.gz: 03b066ad5d7807bd60303e0433ee67703aff903e
+  data.tar.gz: fc2f852d90be9b0c24acf521d0fc5c62dea4f9c0
 SHA512:
-  metadata.gz: ecf91300412d185e49794b4a894180d70747783b88a641856d3af20e35b668aa24201c4a5188cbeb68e2f1c83177dccf19eddafb66a4ad61f807e5f688ac569c
-  data.tar.gz: 9f83de31e8549e7956b79b0c3033208354a4e823901384406ca171295f33a5ea98f8c9f4f224af917a4854ae395d05a6112d81b00aac3267b88ac6266f41bfff
+  metadata.gz: 72e7998e9e154814fae664cfa94be66b33750919729c810c126e3fea9659599f9cf68c13071661ca1d047a4e66030c14f829b77444f78ec06fd8ba4d4090b750
+  data.tar.gz: 40f62f7da32cf5c8a22c53a71a1725e87728f571021e10286acb5f959f0f4a970a5a7133d82d7226f81e2196c4f7a2f73653fc88b74a7eabbb4df5246a40c59b

data/README.md

@@ -1,6 +1,6 @@
 # Ridgepole
 
-Ridgepole is a tool to DB schema.
+Ridgepole is a tool to manage DB schema.
 
 It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.html#types-of-schema-dumps), and updates DB schema according to DSL.
 (like Chef/Puppet)

data/lib/ridgepole/diff.rb

@@ -177,7 +177,21 @@ class Ridgepole::Diff
     indices_delta = {}
 
     to.each do |index_name, to_attrs|
-      if (from_attrs = from.delete(index_name))
+      if index_name.kind_of?(Array)
+        from_index_name, from_attrs = from.find {|name, attrs| attrs[:column_name] == index_name }
+
+        if from_attrs
+          from.delete(from_index_name)
+          from_attrs[:options].delete(:name)
+        end
+      else
+        from_attrs = from.delete(index_name)
+      end
+
+      if from_attrs
+        normalize_index_options!(from_attrs[:options])
+        normalize_index_options!(to_attrs[:options])
+
         if from_attrs != to_attrs
           indices_delta[:add] ||= {}
           indices_delta[:add][index_name] = to_attrs
@@ -222,8 +236,14 @@ class Ridgepole::Diff
   def normalize_column_options!(opts)
     opts[:null] = true unless opts.has_key?(:null)
 
+    # XXX: MySQL only?
     unless @options[:disable_mysql_unsigned]
       opts[:unsigned] = false unless opts.has_key?(:unsigned)
     end
   end
+
+  def normalize_index_options!(opts)
+    # XXX: MySQL only?
+    opts[:using] = :btree unless opts.has_key?(:using)
+  end
 end

data/lib/ridgepole/dsl_parser.rb

@@ -39,7 +39,7 @@ class Ridgepole::DSLParser
       end
 
       def timestamps(*args)
-        options = { :null => false }.merge(args.extract_options!)
+        options = {:null => false}.merge(args.extract_options!)
         column(:created_at, :datetime, options.dup)
         column(:updated_at, :datetime, options.dup)
       end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/ridgepole.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Ridgepole::VERSION
   spec.authors       = ['Genki Sugawara']
   spec.email         = ['sugawara@cookpad.com']
-  spec.summary       = %q{Ridgepole is a tool to DB schema.}
-  spec.description   = %q{Ridgepole is a tool to DB schema. It defines DB schema using Rails DSL, and updates DB schema according to DSL.}
+  spec.summary       = %q{Ridgepole is a tool to manage DB schema.}
+  spec.description   = %q{Ridgepole is a tool to manage DB schema. It defines DB schema using Rails DSL, and updates DB schema according to DSL.}
   spec.homepage      = 'https://github.com/winebarrel/ridgepole'
   spec.license       = 'MIT'
 

data/spec/migrate/migrate_change_index3_spec.rb

@@ -0,0 +1,125 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  context 'when change index without using (no change)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no"
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change index without name (no change)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], using: :btree
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change index without name (change)' do
+    let(:actual_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["emp_no"], name: "emp_no", using: :btree
+      RUBY
+    }
+
+    let(:dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["salary"], using: :btree
+      RUBY
+    }
+
+    let(:expected_dsl) {
+      <<-RUBY
+        create_table "salaries", id: false, force: true do |t|
+          t.integer "emp_no",    null: false
+          t.integer "salary",    null: false
+          t.date    "from_date", null: false
+          t.date    "to_date",   null: false
+        end
+
+        add_index "salaries", ["salary"], name: "index_salaries_on_salary", using: :btree
+      RUBY
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_truthy
+      expect(subject.dump.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
+      delta.migrate
+      expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
+    }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,8 +94,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Ridgepole is a tool to DB schema. It defines DB schema using Rails DSL,
-  and updates DB schema according to DSL.
+description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
+  DSL, and updates DB schema according to DSL.
 email:
 - sugawara@cookpad.com
 executables:
@@ -135,6 +135,7 @@ files:
 - spec/migrate/migrate_change_column3_spec.rb
 - spec/migrate/migrate_change_column_spec.rb
 - spec/migrate/migrate_change_index2_spec.rb
+- spec/migrate/migrate_change_index3_spec.rb
 - spec/migrate/migrate_change_index_spec.rb
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb
@@ -188,7 +189,7 @@ rubyforge_project:
 rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: Ridgepole is a tool to DB schema.
+summary: Ridgepole is a tool to manage DB schema.
 test_files:
 - spec/0_diff/dump_disable_unsigned_spec.rb
 - spec/diff/diff_spec.rb
@@ -202,6 +203,7 @@ test_files:
 - spec/migrate/migrate_change_column3_spec.rb
 - spec/migrate/migrate_change_column_spec.rb
 - spec/migrate/migrate_change_index2_spec.rb
+- spec/migrate/migrate_change_index3_spec.rb
 - spec/migrate/migrate_change_index_spec.rb
 - spec/migrate/migrate_change_table_option_spec.rb
 - spec/migrate/migrate_create_index_spec.rb