ridgepole 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ee14dd171b5e6888ea56c015bbc37c65105ec6
-  data.tar.gz: 39425456d6e6a931918122ef2791f55f17e03154
+  metadata.gz: ae69c3f7da066d33e2e54bb5f8b6fcbfc5d42d36
+  data.tar.gz: 354fed4e3f679ef14b5bd5d97523e58ee07d11bc
 SHA512:
-  metadata.gz: be023093493f6c5ab36f58e13f7a7c4ea1482c7f9b3955d83a0727627297921cc5cf380e4f7252a16a34cb7ca409468665421cc13383c3bf55abaf5f2a1182fc
-  data.tar.gz: ac0a15b7d6e76bccdcb07df562cb9e7f8e16d835761d80c3783c4def499da72e35b57f2d5d5b9dc449cd9b8203a309b63e1203b3f43a61839bc870d2be45fd6d
+  metadata.gz: 3cd38079ebe1d5d1a112f4737c26579aa0bbce185e4e2159db12c2faa825a2f6db677a1086c77bffa93dc8af874bf9786d9608c93c2907b05c5aec487cc19b61
+  data.tar.gz: 798ab1ed0a0dc0e8368781577713b57fd73eb3d5ecdc0a6594bf87c6937fbd14e586f1dd2f9eb52682cd0621a4f6ce1bcdcdfdbf8e1531fef8bd2b8ca4ca3f5d

data/lib/ridgepole/diff.rb

@@ -102,8 +102,8 @@ class Ridgepole::Diff
 
     to.each do |column_name, to_attrs|
       if (from_attrs = from.delete(column_name))
-        normalize_column_options!(from_attrs[:options])
-        normalize_column_options!(to_attrs[:options])
+        normalize_column_options!(from_attrs)
+        normalize_column_options!(to_attrs)
 
         if from_attrs != to_attrs
           definition_delta[:change] ||= {}
@@ -233,9 +233,21 @@ class Ridgepole::Diff
     end
   end
 
-  def normalize_column_options!(opts)
+  def normalize_column_options!(attrs)
+    opts = attrs[:options]
     opts[:null] = true unless opts.has_key?(:null)
 
+    # XXX: MySQL only?
+    case attrs[:type]
+    when :string
+      opts.delete(:limit) if opts[:limit] == 255
+    end
+
+    # XXX: MySQL only?
+    if not opts.has_key?(:default) and opts[:null]
+      opts[:default] = nil
+    end
+
     # XXX: MySQL only?
     unless @options[:disable_mysql_unsigned]
       opts[:unsigned] = false unless opts.has_key?(:unsigned)

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/spec/diff/diff_spec.rb

@@ -144,7 +144,7 @@ describe 'Ridgepole::Client.diff' do
       delta = subject.diff(actual_dsl, expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
-        change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true})
+        change_column("employee_clubs", "club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})
 
         change_column("employees", "last_name", :string, {:limit=>20, :default=>"XXX", :null=>false, :unsigned=>false})
         change_column("employees", "gender", :string, {:limit=>2, :null=>false, :unsigned=>false})

data/spec/migrate/migrate_change_column_spec.rb

@@ -166,7 +166,7 @@ describe 'Ridgepole::Client#diff -> migrate' do
       expect(subject.dump).to eq actual_dsl.strip_heredoc.strip
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         change_table("employee_clubs", {:bulk => true}) do |t|
-          t.change("club_id", :integer, {:unsigned=>false, :null=>true})
+          t.change("club_id", :integer, {:unsigned=>false, :null=>true, :default=>nil})
         end
 
         change_table("employees", {:bulk => true}) do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord