ridgepole 0.6.5.beta8 → 0.6.5.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8adb357a8559da5ebe42cc89f6e8916c2c387c39
-  data.tar.gz: f03ec0b86a0289241ebb64c42fa9eb0d3bdbdd6c
+  metadata.gz: 024470270cd96b582a5e6c0da47e8ca57bfae9a6
+  data.tar.gz: 870ce03f5efdf6d1cf888b35a22367524189fb39
 SHA512:
-  metadata.gz: ab0dd2cc1ad788f6728407421f9b77ea81f641f8d8ea7d665a6fef4e6123c2dbb59db72bcdb01192d12c338622db356f0b82edeaf24df0be3a6b922606e65b3b
-  data.tar.gz: 8fa5ba2e3478b9e83c3da2bb332452e717b57da509b54385de35c2ef6c6a4efe41d7de25b86155c15ed74ead0cc0be958f52bed291a635f8ce2c4c47c4a8fbaf
+  metadata.gz: abfb2f146e7b6d57a72fdf4735227cc9e82e4cb11a1859dfc9666bc7c5c5851539c7a2891edc47075b02c6a09099d911f50f320d26de71e3a845b10a21733cc5
+  data.tar.gz: bca1b088bd0c3943202d51b49ea35304ca7adef09cd5d52581df67527340dfcb86f8262339f1a239ac7d3ee70fadc9c6722c8945c9698d81c2666134ccec6c0c

data/.gitignore

@@ -22,3 +22,4 @@ Schemafile
 _site/
 config.yml
 /gemfiles/*.lock
+*.swp

data/docker-compose.yml

@@ -5,7 +5,7 @@ mysql:
   environment:
     MYSQL_ROOT_PASSWORD: password
 postgres:
-  image: "postgres:9.4"
+  image: "postgres:9.5"
   ports:
     - "5432:5432"
   environment:

data/lib/ridgepole/delta.rb

@@ -218,7 +218,7 @@ class Ridgepole::Delta
     indices = attrs[:indices] || {}
 
     buf.puts(<<-EOS)
-create_table(#{table_name.inspect}, #{options.inspect}) do |t|
+create_table(#{table_name.inspect}, #{inspect_options_include_default_proc(options)}) do |t|
     EOS
 
     definition.each do |column_name, column_attrs|
@@ -227,7 +227,7 @@ create_table(#{table_name.inspect}, #{options.inspect}) do |t|
       normalize_limit(column_type, column_options)
 
       buf.puts(<<-EOS)
-  t.#{column_type}(#{column_name.inspect}, #{inspect_column_options(column_options)})
+  t.#{column_type}(#{column_name.inspect}, #{inspect_options_include_default_proc(column_options)})
       EOS
     end
 
@@ -320,11 +320,11 @@ drop_table(#{table_name.inspect})
 
     if @options[:bulk_change]
       buf.puts(<<-EOS)
-  t.column(#{column_name.inspect}, #{type.inspect}, #{inspect_column_options(options)})
+  t.column(#{column_name.inspect}, #{type.inspect}, #{inspect_options_include_default_proc(options)})
       EOS
     else
       buf.puts(<<-EOS)
-add_column(#{table_name.inspect}, #{column_name.inspect}, #{type.inspect}, #{inspect_column_options(options)})
+add_column(#{table_name.inspect}, #{column_name.inspect}, #{type.inspect}, #{inspect_options_include_default_proc(options)})
       EOS
     end
   end
@@ -347,11 +347,11 @@ rename_column(#{table_name.inspect}, #{from_column_name.inspect}, #{to_column_na
 
     if @options[:bulk_change]
       buf.puts(<<-EOS)
-  t.change(#{column_name.inspect}, #{type.inspect}, #{inspect_column_options(options)})
+  t.change(#{column_name.inspect}, #{type.inspect}, #{inspect_options_include_default_proc(options)})
       EOS
     else
       buf.puts(<<-EOS)
-change_column(#{table_name.inspect}, #{column_name.inspect}, #{type.inspect}, #{inspect_column_options(options)})
+change_column(#{table_name.inspect}, #{column_name.inspect}, #{type.inspect}, #{inspect_options_include_default_proc(options)})
       EOS
     end
   end
@@ -446,7 +446,7 @@ remove_foreign_key(#{table_name.inspect}, #{target.inspect})
     column_options[:limit] ||= default_limit if default_limit
   end
 
-  def inspect_column_options(options)
+  def inspect_options_include_default_proc(options)
     options = options.dup
 
     if options[:default].kind_of?(Proc)

data/lib/ridgepole/diff.rb

@@ -94,6 +94,11 @@ class Ridgepole::Diff
   end
 
   def scan_options_change(table_name, from, to, table_delta)
+    from = (from || {}).dup
+    to = (to || {}).dup
+
+    normalize_default_proc_options!(from, to)
+
     unless from == to
       Ridgepole::Logger.instance.warn("[WARNING] No difference of schema configuration for table `#{table_name}` but table options differ.")
       Ridgepole::Logger.instance.warn("  from: #{from}")
@@ -357,13 +362,15 @@ class Ridgepole::Diff
   def compare_column_attrs(attrs1, attrs2)
     attrs1 = attrs1.merge(:options => attrs1.fetch(:options, {}).dup)
     attrs2 = attrs2.merge(:options => attrs2.fetch(:options, {}).dup)
+    normalize_default_proc_options!(attrs1[:options], attrs2[:options])
+    attrs1 == attrs2
+  end
 
-    if attrs1[:options][:default].kind_of?(Proc) and attrs2[:options][:default].kind_of?(Proc)
-      attrs1[:options][:default] = attrs1[:options][:default].call
-      attrs2[:options][:default] = attrs2[:options][:default].call
+  def normalize_default_proc_options!(opts1, opts2)
+    if opts1[:default].kind_of?(Proc) and opts2[:default].kind_of?(Proc)
+      opts1[:default] = opts1[:default].call
+      opts2[:default] = opts2[:default].call
     end
-
-    attrs1 == attrs2
   end
 
   def diff_inspect(obj1, obj2, options = {})

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.5.beta8'
+  VERSION = '0.6.5.beta9'
 end

data/spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb

@@ -0,0 +1,92 @@
+describe 'Ridgepole::Client#diff -> migrate', condition: [:activerecord_5] do
+  context 'when create table with default proc' do
+    let(:dsl) { '' }
+
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "users", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
+          t.string   "name"
+          t.datetime "created_at", null: false
+          t.datetime "updated_at", null: false
+        end
+      EOS
+    }
+
+    let(:expected_dsl) { dsl }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
+
+      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 create table with default proc without change' do
+    let(:dsl) {
+      erbh(<<-EOS)
+        create_table "users", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
+          t.string   "name"
+          t.datetime "created_at", null: false
+          t.datetime "updated_at", null: false
+        end
+      EOS
+    }
+
+    before { subject.diff(dsl).migrate }
+    subject { client }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn)
+
+      delta = subject.diff(dsl)
+      expect(delta.differ?).to be_falsey
+      expect(subject.dump).to match_fuzzy dsl
+      delta.migrate
+      expect(subject.dump).to match_fuzzy dsl
+    }
+  end
+
+  context 'when migrate table with default proc' do
+    let(:actual_dsl) {
+      erbh(<<-EOS)
+        create_table "users", id: :uuid, default: -> { "uuid_generate_v1()" }, force: :cascade do |t|
+          t.string   "name"
+          t.datetime "created_at", null: false
+          t.datetime "updated_at", null: false
+        end
+      EOS
+    }
+
+    let(:expected_dsl) {
+      erbh(<<-EOS)
+        create_table "users", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
+          t.string   "name"
+          t.datetime "created_at", null: false
+          t.datetime "updated_at", null: false
+        end
+      EOS
+    }
+
+    before { subject.diff(actual_dsl).migrate }
+    subject { client }
+
+    it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).with("[WARNING] No difference of schema configuration for table `users` but table options differ.")
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(%Q!  from: {:id=>:uuid, :default=>"uuid_generate_v1()"}!))
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(erbh(%Q!    to: {:id=>:uuid, :default=>"uuid_generate_v4()"}!))
+
+      delta = subject.diff(expected_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
+end

data/spec/postgresql/ridgepole_test_database.sql

@@ -1,6 +1,7 @@
 CREATE EXTENSION hstore;
 CREATE EXTENSION ltree;
 CREATE EXTENSION citext;
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 
 DO $$
 DECLARE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.5.beta8
+  version: 0.6.5.beta9
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -323,6 +323,7 @@ files:
 - spec/postgresql/migrate/migrate_change_column_spec.rb
 - spec/postgresql/migrate/migrate_change_index_spec.rb
 - spec/postgresql/migrate/migrate_create_table_spec.rb
+- spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_index_spec.rb
@@ -451,6 +452,7 @@ test_files:
 - spec/postgresql/migrate/migrate_change_column_spec.rb
 - spec/postgresql/migrate/migrate_change_index_spec.rb
 - spec/postgresql/migrate/migrate_create_table_spec.rb
+- spec/postgresql/migrate/migrate_create_table_with_default_proc_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_spec.rb
 - spec/postgresql/migrate/migrate_drop_column_with_index_spec.rb
 - spec/postgresql/migrate/migrate_drop_index_spec.rb