ridgepole 0.7.0.beta18 → 0.7.0.beta19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7179716cf14a5382522a62ed4d93806ce547a10b
-  data.tar.gz: ccce44bf2506174bb829aa0c4faa4c5742ff558c
+  metadata.gz: 3d69dc66de98a5b2e1b71adc21896d9cfb54a153
+  data.tar.gz: 30cfacc9b97bb51ac60172a06c6ac157469210a0
 SHA512:
-  metadata.gz: 2084f496ee48ac860e23f05059df599c9dff978badf91c656982e446a774fc3bd1313d4c05c60f78910ef8aef24dc914a10231359e464687f344468ae54b003a
-  data.tar.gz: e1b01b8c8292b090fd8be7724698deb344804f8befc345537d80cb830c0af66450cea7b656869d83ee1493df07f664726963e098660eb12eb5979e0223c3195e
+  metadata.gz: bc8cbc9963b3334d7848c07a31c294e35a5ca352a7420cf4f94733179330ba74180c00178a60a43806f6968f40e273b65f5f02338158d47a6af5a17b5aa77c41
+  data.tar.gz: 5bae656215f07994b3da071953e9c7f82e2c95e49ffe3147f5bacbf5159fe9add6c34a8d428bb014b06829daf64ff9d6015bf6287aa2ac08dd171b1609d475cb

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.beta18-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta18)
+[![Edge Version](https://img.shields.io/badge/edge_version-0.7.0.beta19-brightgreen.svg)](https://rubygems.org/gems/ridgepole/versions/0.7.0.beta19)
 [![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)
 
@@ -391,6 +391,7 @@ bundle install
 bundle exec appraisal install
 bundle exec appraisal activerecord-5.1 rake
 # POSTGRESQL=1 bundle exec appraisal activerecord-5.1 rake
+# MYSQL57=1 bundle exec appraisal activerecord-5.1 rake
 ```
 
 **Notice:** mysql-client/postgresql-client is required.

data/docker-compose.yml

@@ -1,18 +1,18 @@
 mysql:
   image: "mysql:5.6"
   ports:
-    - "3306:3306"
+    - "13316:3306"
   environment:
     MYSQL_ROOT_PASSWORD: password
 mysql57:
   image: "mysql:5.7"
   ports:
-    - "3307:3306"
+    - "13317:3306"
   environment:
     MYSQL_ROOT_PASSWORD: password
 postgres:
   image: "postgres:9.5"
   ports:
-    - "5432:5432"
+    - "15442:5432"
   environment:
     POSTGRES_PASSWORD: password

data/lib/ridgepole/client.rb

@@ -17,14 +17,6 @@ class Ridgepole::Client
     if @options[:mysql_use_alter]
       require 'ridgepole/ext/abstract_mysql_adapter/use_alter_index'
     end
-
-    if @options[:dump_with_default_fk_name]
-      require 'ridgepole/ext/schema_dumper'
-    end
-
-    if @options[:dump_without_table_options]
-      require 'ridgepole/ext/abstract_mysql_adapter/disable_table_options'
-    end
   end
 
   def dump(&block)
@@ -38,6 +30,9 @@ class Ridgepole::Client
 
     logger.verbose_info('# Parse DSL')
     expected_definition, expected_execute = @parser.parse(dsl, opts)
+    expected_definition.each do |table, definition|
+      definition[:options][:options] ||= @options[:table_options] if @options[:table_options]
+    end
     logger.verbose_info('# Load tables')
     current_definition, _current_execute = @parser.parse(@dumper.dump, opts)
     logger.verbose_info('# Compare definitions')

data/lib/ridgepole/delta.rb

@@ -218,7 +218,6 @@ class Ridgepole::Delta
 
   def append_create_table(table_name, attrs, buf, post_buf_for_fk)
     options = attrs[:options] || {}
-    options[:options] ||= @options[:table_options] if @options[:table_options]
     definition = attrs[:definition] || {}
     indices = attrs[:indices] || {}
 

data/lib/ridgepole/dumper.rb

@@ -4,7 +4,6 @@ class Ridgepole::Dumper
   end
 
   def dump
-    stream = StringIO.new
     conn = ActiveRecord::Base.connection
     target_tables = @options[:tables]
     ignore_tables = @options[:ignore_tables]
@@ -24,7 +23,7 @@ class Ridgepole::Dumper
       end
     end
 
-    ActiveRecord::SchemaDumper.dump(conn, stream)
+    stream = dump_from(conn)
 
     if target_tables or ignore_tables
       ActiveRecord::SchemaDumper.ignore_tables.clear
@@ -80,4 +79,14 @@ class Ridgepole::Dumper
   def target?(table_name)
     not @options[:tables] or @options[:tables].include?(table_name)
   end
+
+  def dump_from(conn)
+    stream = StringIO.new
+    conn.without_table_options(@options[:dump_without_table_options]) do
+      ActiveRecord::SchemaDumper.with_default_fk_name(@options[:dump_with_default_fk_name]) do
+        ActiveRecord::SchemaDumper.dump(conn, stream)
+      end
+    end
+    stream
+  end
 end

data/lib/ridgepole/ext/abstract_adapter/disable_table_options.rb

@@ -0,0 +1,32 @@
+require 'active_record/connection_adapters/abstract_adapter'
+
+module Ridgepole
+  module Ext
+    module AbstractAdapter
+      module DisableTableOptions
+        def without_table_options(value)
+          @__without_table_options = value
+          yield
+        ensure
+          remove_instance_variable(:@__without_table_options)
+        end
+
+        def table_options(table_name)
+          options = super
+          options.delete(:options) if options && @__without_table_options
+          options
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractAdapter
+      def self.inherited(subclass)
+        subclass.prepend Ridgepole::Ext::AbstractAdapter::DisableTableOptions
+      end
+    end
+  end
+end

data/lib/ridgepole/ext/schema_dumper.rb

@@ -3,7 +3,24 @@ require 'active_record/schema_dumper'
 module Ridgepole
   module Ext
     module SchemaDumper
+      def self.prepended(klass)
+        klass.extend ClassMethods
+      end
+
+      module ClassMethods
+        attr_reader :__with_default_fk_name
+
+        def with_default_fk_name(value)
+          @__with_default_fk_name = value
+          yield
+        ensure
+          remove_instance_variable(:@__with_default_fk_name)
+        end
+      end
+
       def foreign_keys(table, stream)
+        return super unless self.class.__with_default_fk_name
+
         if (foreign_keys = @connection.foreign_keys(table)).any?
           add_foreign_key_statements = foreign_keys.map do |foreign_key|
             parts = [

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.7.0.beta18'
+  VERSION = '0.7.0.beta19'
 end

data/lib/ridgepole.rb

@@ -13,7 +13,9 @@ require 'diffy'
 
 module Ridgepole; end
 
+require 'ridgepole/ext/abstract_adapter/disable_table_options'
 require 'ridgepole/ext/pp_sort_hash'
+require 'ridgepole/ext/schema_dumper'
 require 'ridgepole/client'
 require 'ridgepole/connection_adapters'
 require 'ridgepole/default_limit'

data/spec/mysql/migrate/migrate_change_column8_spec.rb

@@ -0,0 +1,40 @@
+describe 'Ridgepole::Client#diff -> migrate' do
+  before { subject.diff(actual_dsl).migrate }
+  subject { client(:table_options => table_options, :dump_without_table_options => false) }
+
+  let(:warning_regexp) { /table options differ/ }
+
+  let(:actual_dsl) {
+    erbh(<<-EOS)
+      create_table "employees", primary_key: "emp_no", force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+      end
+    EOS
+  }
+
+  let(:expected_dsl) {
+    erbh(<<-EOS)
+      create_table :employees, primary_key: :emp_no, force: :cascade do |t|
+      end
+    EOS
+  }
+
+  context 'when change options (no change)' do
+    let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8' }
+
+    it {
+      expect(Ridgepole::Logger.instance).to_not receive(:warn).with(warning_regexp)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+
+  context 'when change options (change)' do
+    let(:table_options) { 'ENGINE=InnoDB DEFAULT CHARSET=utf8mb4' }
+
+    it {
+      expect(Ridgepole::Logger.instance).to receive(:warn).with(warning_regexp)
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_falsey
+    }
+  end
+end

data/spec/mysql/migrate/migrate_create_table_with_options_spec.rb

@@ -26,4 +26,32 @@ describe 'Ridgepole::Client#diff -> migrate' do
       EOS
     }
   end
+
+  context 'when create table (table definition options takes precedence)' do
+    let(:expected_dsl) {
+      <<-EOS
+        create_table "employee_clubs", force: :cascade, options: "ENGINE=InnoDB CHARSET=utf8mb4" do |t|
+          t.integer "emp_no", null: false, unsigned: true
+          t.integer "club_id", null: false, unsigned: true
+        end
+
+        add_index "employee_clubs", ["emp_no", "club_id"], name: "idx_emp_no_club_id", using: :btree
+      EOS
+    }
+
+    subject { client(table_options: 'ENGINE=MyISAM CHARSET=utf8') }
+
+    it {
+      delta = subject.diff(expected_dsl)
+      expect(delta.differ?).to be_truthy
+
+      expect(delta.script).to match_fuzzy <<-EOS
+        create_table("employee_clubs", {:options=>"ENGINE=InnoDB CHARSET=utf8mb4"}) do |t|
+          t.column("emp_no", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
+          t.column("club_id", :"integer", {:null=>false, :unsigned=>true, :limit=>4})
+        end
+        add_index("employee_clubs", ["emp_no", "club_id"], {:name=>"idx_emp_no_club_id", :using=>:btree})
+      EOS
+    }
+  end
 end

data/spec/mysql/migrate/migrate_skip_column_comment_change_spec.rb

@@ -31,7 +31,6 @@ describe 'Ridgepole::Client#diff -> migrate' do
 
     it {
       delta = subject.diff(expected_dsl)
-      puts delta.script
       expect(delta.differ?).to be_falsey
     }
   end

data/spec/spec_const.rb

@@ -1,12 +1,12 @@
 TEST_MYSQL_HOST = '127.0.0.1'
-TEST_MYSQL_PORT = ENV['MYSQL57'] == '1' ? 3307 : 3306
+TEST_MYSQL_PORT = ENV['MYSQL57'] == '1' ? 13317 : 13316
 TEST_MYSQL_USER = 'root'
 TEST_MYSQL_PASS = 'password'
 
 MYSQL_CLI = "mysql -h #{TEST_MYSQL_HOST} -P #{TEST_MYSQL_PORT} -u #{TEST_MYSQL_USER} -p#{TEST_MYSQL_PASS} 2>/dev/null"
 
 TEST_PG_HOST = '127.0.0.1'
-TEST_PG_PORT = 5432
+TEST_PG_PORT = 15442
 TEST_PG_USER = 'postgres'
 TEST_PG_PASS = 'password'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta18
+  version: 0.7.0.beta19
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -231,7 +231,7 @@ files:
 - lib/ridgepole/dsl_parser/table_definition.rb
 - lib/ridgepole/dumper.rb
 - lib/ridgepole/execute_expander.rb
-- lib/ridgepole/ext/abstract_mysql_adapter/disable_table_options.rb
+- lib/ridgepole/ext/abstract_adapter/disable_table_options.rb
 - lib/ridgepole/ext/abstract_mysql_adapter/use_alter_index.rb
 - lib/ridgepole/ext/pp_sort_hash.rb
 - lib/ridgepole/ext/schema_dumper.rb
@@ -274,6 +274,7 @@ files:
 - spec/mysql/migrate/migrate_change_column5_spec.rb
 - spec/mysql/migrate/migrate_change_column6_spec.rb
 - spec/mysql/migrate/migrate_change_column7_spec.rb
+- spec/mysql/migrate/migrate_change_column8_spec.rb
 - spec/mysql/migrate/migrate_change_column_default_spec.rb
 - spec/mysql/migrate/migrate_change_column_float_spec.rb
 - spec/mysql/migrate/migrate_change_column_spec.rb
@@ -420,6 +421,7 @@ test_files:
 - spec/mysql/migrate/migrate_change_column5_spec.rb
 - spec/mysql/migrate/migrate_change_column6_spec.rb
 - spec/mysql/migrate/migrate_change_column7_spec.rb
+- spec/mysql/migrate/migrate_change_column8_spec.rb
 - spec/mysql/migrate/migrate_change_column_default_spec.rb
 - spec/mysql/migrate/migrate_change_column_float_spec.rb
 - spec/mysql/migrate/migrate_change_column_spec.rb

data/lib/ridgepole/ext/abstract_mysql_adapter/disable_table_options.rb

@@ -1,23 +0,0 @@
-require 'active_record/connection_adapters/abstract_mysql_adapter'
-
-module Ridgepole
-  module Ext
-    module AbstractMysqlAdapter
-      module DisableTableOptions
-        def table_options(table_name)
-          options = super
-          options.delete(:options)
-          options
-        end
-      end
-    end
-  end
-end
-
-module ActiveRecord
-  module ConnectionAdapters
-    class AbstractMysqlAdapter
-      prepend Ridgepole::Ext::AbstractMysqlAdapter::DisableTableOptions
-    end
-  end
-end