ridgepole 0.6.5.beta → 0.6.5.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1afe38c33e11fab6506b3b4803488aec6058ddfb
-  data.tar.gz: 84819c79b7e1d2756f84682f2749ee9c51f09181
+  metadata.gz: 5175eaaaf37dc9607941847db6b26fc41ded724a
+  data.tar.gz: 5091e1b556002310437ea3f6982b89e51ca37e74
 SHA512:
-  metadata.gz: a1c834a74ee2b5f861f0a29fccb41b5411dfb9013aeebc9823ae5232a5994ee6b1b14075a1a74b85af005df6f9c4f799f375b7ac3ffd39ba8e1d1a9448404db5
-  data.tar.gz: 7153c5acdb81e28810c40049490a321ade6bd2f986b0d4a64435cb227ee1d73dd63480e5c8be0af2691af7333775d5664f4852f7281cd24c7091e2bd70fea99d
+  metadata.gz: 5468e43b1edb0ec5e3bedd4c51caadb44bced02ee448ad22b5da5b5e0108060d78380387ca96469319bd4661dbef9e7c3c590c4d5ee4e161c51e2f6004bdda59
+  data.tar.gz: b73e8fef699d8bf36ea63ae656cd1961e4b1908486155dd055742a0d338d4c4b4a44aa80a34170a89eff58f31c6c17fca2a324dafd154783cdd86712041f84d1

data/.travis.yml

@@ -6,7 +6,7 @@ cache:
   - apt
 rvm:
   - 2.2.4
-  - 2.3.0
+  - 2.3.1
 before_install:
   - gem install bundler
   - sudo service postgresql stop
@@ -20,12 +20,16 @@ script:
   - bundle exec rake
 gemfile:
   - gemfiles/activerecord_4.2.gemfile
-  #- gemfiles/activerecord_5.0.gemfile
+  - gemfiles/activerecord_5.0.gemfile
 env:
   matrix:
     - ENABLE_MYSQL_AWESOME=0
     - ENABLE_MYSQL_AWESOME=1
     - POSTGRESQL=1
+matrix:
+  exclude:
+    - env: ENABLE_MYSQL_AWESOME=1
+      gemfile: gemfiles/activerecord_5.0.gemfile
 services:
   - docker
 addons:

data/Appraisals

@@ -4,5 +4,5 @@ appraise "activerecord-4.2" do
 end
 
 appraise 'activerecord-5.0' do
-  gem 'activerecord', '>= 5.0.0.beta3'
+  gem 'activerecord', '>= 5.0.0.rc1'
 end

data/README.md

@@ -51,7 +51,9 @@ It defines DB schema using [Rails DSL](http://guides.rubyonrails.org/migrations.
   * Remove migration_comments
   * Fix foreign key apply order
 * `>= 0.6.5`
-  * Fix rails version '>= 4.2', '< 6'
+  * Fix rails version `'>= 4.2', '< 6'`
+  * Support new types ([pull#84](https://github.com/winebarrel/ridgepole/pull/84))
+  * Support `default: -> { ... }` ([pull#85](https://github.com/winebarrel/ridgepole/pull/85))
 
 ## Installation
 

data/gemfiles/activerecord_5.0.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", ">= 5.0.0.beta3"
+gem "activerecord", ">= 5.0.0.rc1"
 
 gemspec :path => "../"

data/lib/ridgepole/client.rb

@@ -19,12 +19,16 @@ class Ridgepole::Client
     end
 
     if @options[:mysql_use_alter]
-      require 'ridgepole/ext/abstract_mysql_adapter'
+      require 'ridgepole/ext/abstract_mysql_adapter/use_alter_index'
     end
 
     if @options[:dumb_with_default_fk_name]
       require 'ridgepole/ext/schema_dumper'
     end
+
+    if ActiveRecord::VERSION::MAJOR >= 5 and @options[:dump_without_table_options]
+      require 'ridgepole/ext/abstract_mysql_adapter/disable_table_options'
+    end
   end
 
   def dump(&block)

data/lib/ridgepole/delta.rb

@@ -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}, #{column_options.inspect})
+  t.#{column_type}(#{column_name.inspect}, #{inspect_column_options(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}, #{options.inspect})
+  t.column(#{column_name.inspect}, #{type.inspect}, #{inspect_column_options(options)})
       EOS
     else
       buf.puts(<<-EOS)
-add_column(#{table_name.inspect}, #{column_name.inspect}, #{type.inspect}, #{options.inspect})
+add_column(#{table_name.inspect}, #{column_name.inspect}, #{type.inspect}, #{inspect_column_options(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}, #{options.inspect})
+  t.change(#{column_name.inspect}, #{type.inspect}, #{inspect_column_options(options)})
       EOS
     else
       buf.puts(<<-EOS)
-change_column(#{table_name.inspect}, #{column_name.inspect}, #{type.inspect}, #{options.inspect})
+change_column(#{table_name.inspect}, #{column_name.inspect}, #{type.inspect}, #{inspect_column_options(options)})
       EOS
     end
   end
@@ -445,4 +445,20 @@ remove_foreign_key(#{table_name.inspect}, #{target.inspect})
     default_limit = Ridgepole::DefaultsLimit.default_limit(column_type, @options)
     column_options[:limit] ||= default_limit if default_limit
   end
+
+  def inspect_column_options(options)
+    options = options.dup
+
+    if options[:default].kind_of?(Proc)
+      proc_default = options.delete(:default)
+      proc_default = ":default=>proc{#{proc_default.call.inspect}}"
+      options_inspect = options.inspect
+      options_inspect.sub!(/\}\z/, '')
+      options_inspect << ', ' if options_inspect !~ /\{\z/
+      options_inspect << proc_default << '}'
+      options_inspect
+    else
+      options.inspect
+    end
+  end
 end

data/lib/ridgepole/diff.rb

@@ -114,7 +114,7 @@ class Ridgepole::Diff
         normalize_column_options!(from_attrs)
         normalize_column_options!(to_attrs)
 
-        if from_attrs != to_attrs
+        unless compare_column_attrs(from_attrs, to_attrs)
           definition_delta[:change] ||= {}
           to_attrs = fix_change_column_options(table_name, from_attrs, to_attrs)
           definition_delta[:change][column_name] = to_attrs
@@ -322,7 +322,6 @@ class Ridgepole::Diff
     end
   end
 
-
   # XXX: MySQL only?
   # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb#L760
   # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_creation.rb#L102
@@ -347,4 +346,16 @@ class Ridgepole::Diff
 
     to_attrs
   end
+
+  def compare_column_attrs(attrs1, attrs2)
+    attrs1 = attrs1.merge(:options => attrs1.fetch(:options, {}).dup)
+    attrs2 = attrs2.merge(:options => attrs2.fetch(:options, {}).dup)
+
+    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
+    end
+
+    attrs1 == attrs2
+  end
 end

data/lib/ridgepole/dsl_parser.rb

@@ -19,7 +19,7 @@ class Ridgepole::DSLParser
       end
 
       TYPES = [
-        # https://github.com/winebarrel/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L274
+        # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L274
         :string,
         :text,
         :integer,
@@ -33,7 +33,7 @@ class Ridgepole::DSLParser
         :binary,
         :boolean,
 
-        # https://github.com/winebarrel/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79
+        # https://github.com/rails/rails/blob/v4.2.1/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L79
         :daterange,
         :numrange,
         :tsrange,
@@ -58,7 +58,7 @@ class Ridgepole::DSLParser
         :bit,
         :bit_varying,
         :money,
-      ]
+      ].uniq
 
       TYPES.each do |column_type|
         define_method column_type do |*args|
@@ -68,6 +68,41 @@ class Ridgepole::DSLParser
         end
       end
 
+      ALIAS_TYPES = {
+        # https://github.com/rails/rails/blob/v5.0.0.rc1/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb
+        tinyblob: [:blob, {limit: 255}],
+        mediumblob: [:binary, {limit: 16777215}],
+        longblob: [:binary, {limit: 4294967295}],
+        tinytext: [:text, {limit: 255}],
+        mediumtext: [:text, {limit: 16777215}],
+        longtext: [:text, {limit: 4294967295}],
+        unsigned_integer: [:integer, {unsigned: true}],
+        unsigned_bigint: [:bigint, {unsigned: true}],
+        unsigned_float: [:float, {limit: 24, unsigned: true}],
+        unsigned_decimal: [:decimal, {precision: 10, unsigned: true}],
+      }
+
+      # XXX:
+      def blob(*args)
+        options = args.extract_options!
+        options = {limit: 65535}.merge(options)
+        column_names = args
+
+        column_names.each do |name|
+          column_type = (0..0xff).include?(options[:limit]) ? :blob : :binary
+          column(name, column_type, options)
+        end
+      end
+
+      ALIAS_TYPES.each do |alias_type, (column_type, default_options)|
+        define_method alias_type do |*args|
+          options = args.extract_options!
+          options = default_options.merge(options)
+          column_names = args
+          column_names.each {|name| column(name, column_type, options) }
+        end
+      end
+
       def index(name, options = {})
         @base.add_index(@table_name, name, options)
       end

data/lib/ridgepole/dumper.rb

@@ -10,14 +10,14 @@ class Ridgepole::Dumper
     ignore_tables = @options[:ignore_tables]
 
     if target_tables
-      conn.tables.each do |tbl|
+      conn.data_sources.each do |tbl|
         next if target_tables.include?(tbl)
         ActiveRecord::SchemaDumper.ignore_tables << tbl
       end
     end
 
     if ignore_tables
-      conn.tables.each do |tbl|
+      conn.data_sources.each do |tbl|
         if ignore_tables.any? {|i| i =~ tbl } and not (target_tables and target_tables.include?(tbl))
           ActiveRecord::SchemaDumper.ignore_tables << tbl
         end

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

@@ -0,0 +1,21 @@
+require 'active_record/connection_adapters/abstract_mysql_adapter'
+
+module Ridgepole
+  module Ext
+    module AbstractMysqlAdapter
+      module DisableTableOptions
+        def table_options(table_name)
+          nil
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractMysqlAdapter
+      prepend Ridgepole::Ext::AbstractMysqlAdapter::DisableTableOptions
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require 'active_record/connection_adapters/abstract_mysql_adapter'
+
+module Ridgepole
+  module Ext
+    module AbstractMysqlAdapter
+      module UseAlterIndex
+        def add_index(table_name, column_name, options = {})
+          index_name, index_type, index_columns, index_options, index_algorithm, index_using = add_index_options(table_name, column_name, options)
+
+          # cannot specify index_algorithm
+          execute "ALTER TABLE #{quote_table_name(table_name)} ADD #{index_type} INDEX #{quote_column_name(index_name)} #{index_using} (#{index_columns})#{index_options}"
+        end
+
+        def remove_index!(table_name, index_name)
+          execute "ALTER TABLE #{quote_table_name(table_name)} DROP INDEX #{quote_column_name(index_name)}"
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+    class AbstractMysqlAdapter
+      prepend Ridgepole::Ext::AbstractMysqlAdapter::UseAlterIndex
+    end
+  end
+end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.5.beta'
+  VERSION = '0.6.5.beta2'
 end

data/ridgepole.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pg'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.2'
-  spec.add_development_dependency 'erbh'
+  spec.add_development_dependency 'rspec-match_fuzzy', '>= 0.1.3'
+  spec.add_development_dependency 'erbh', '>= 0.1.2'
   spec.add_development_dependency 'hash_modern_inspect', '>= 0.1.1'
-  spec.add_development_dependency 'hash_order_helper', '>= 0.1.1'
+  spec.add_development_dependency 'hash_order_helper', '>= 0.1.5'
 end

data/spec/erb_helper.rb

@@ -0,0 +1,43 @@
+include ERBh
+
+ERBh.define_method(:i) do |obj|
+  if obj.nil? or (obj.respond_to?(:empty?) and obj.empty?)
+    @_erbout.sub!(/,\s*\z/, '')
+    ''
+  else
+    obj.modern_inspect_without_brace
+  end
+end
+
+ERBh.define_method(:add_index) do |table_name, column_name, options|
+  if condition(:activerecord_5)
+    @_erbout.sub!(/\bend\s*\z/, '')
+
+    <<-EOS
+        t.index #{column_name.inspect}, #{options.modern_inspect_without_brace}
+      end
+    EOS
+  else
+    "add_index #{table_name.inspect}, #{column_name.inspect}, #{options.modern_inspect_without_brace}"
+  end
+end
+
+ERBh.define_method(:unsigned) do |value, *conds|
+  conds = [:mysql_awesome_enabled] if conds.empty?
+
+  if condition(*conds)
+    {unsigned: value}
+  else
+    {}
+  end
+end
+
+ERBh.define_method(:limit) do |value, *conds|
+  conds = [:activerecord_4] if conds.empty?
+
+  if condition(*conds)
+    {limit: value}
+  else
+    {}
+  end
+end

data/spec/mysql/bigint_pk/bigint_pk_spec.rb

@@ -1,24 +1,24 @@
-describe 'Ridgepole::Client (with bigint pk)', condition: [:mysql_awesome_enabled] do
+describe 'Ridgepole::Client (with bigint pk)', condition: [:mysql_awesome_enabled, :activerecord_5] do
   let(:dsl1) {
-    <<-RUBY
+    erbh(<<-EOS)
       create_table "books", id: :primary_key, limit: 8, force: :cascade do |t|
-        t.string   "title",      limit: 255, null: false
-        t.integer  "author_id",  limit: 4,   null: false
+        t.string   "title",      <%= i limit(255) + {null: false} %>
+        t.integer  "author_id",  <%= i limit(4) + {null: false} %>
         t.datetime "created_at"
         t.datetime "updated_at"
       end
-    RUBY
+    EOS
   }
 
   let(:dsl2) {
-    <<-RUBY
+    erbh(<<-EOS)
       create_table "books", id: :bigint, force: :cascade do |t|
-        t.string   "title",      limit: 255, null: false
-        t.integer  "author_id",  limit: 4,   null: false
+        t.string   "title",      <%= i limit(255) + {null: false} %>
+        t.integer  "author_id",  <%= i limit(4) + {null: false} %>
         t.datetime "created_at"
         t.datetime "updated_at"
       end
-    RUBY
+    EOS
   }
 
   context 'when with limit:8' do

data/spec/mysql/collation/collation_spec.rb

@@ -1,25 +1,25 @@
-describe 'Ridgepole::Client#diff -> migrate', condition: [:mysql_awesome_enabled] do
+describe 'Ridgepole::Client#diff -> migrate', condition: [:mysql_awesome_enabled, :activerecord_5] do
   context 'when change column (add collation)' do
     let(:actual_dsl) {
-      <<-RUBY
+      erbh(<<-EOS)
         create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false
-          t.integer "club_id", limit: 4,     null: false, unsigned: true
-          t.string  "string",  limit: 255,   null: false
+          t.integer "emp_no",  <%= i limit(4) + {null: false} %>
+          t.integer "club_id", <%= i limit(4) + {null: false, unsigned: true} %>
+          t.string  "string",  <%= i limit(255) + {null: false, collation: "ascii_bin"} %>
           t.text    "text",    limit: 65535, null: false
         end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      erbh(<<-EOS)
         create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false
-          t.integer "club_id", limit: 4,     null: false, unsigned: true
-          t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
+          t.integer "emp_no",  <%= i limit(4) + {null: false} %>
+          t.integer "club_id", <%= i limit(4) + {null: false, unsigned: true} %>
+          t.string  "string",  <%= i limit(255) + {null: false, collation: "ascii_bin"} %>
           t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -36,25 +36,25 @@ describe 'Ridgepole::Client#diff -> migrate', condition: [:mysql_awesome_enabled
 
   context 'when change column (delete collation)' do
     let(:actual_dsl) {
-      <<-RUBY
+      erbh(<<-EOS)
         create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false
-          t.integer "club_id", limit: 4,     null: false, unsigned: true
-          t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
+          t.integer "emp_no",  <%= i limit(4) + {null: false} %>
+          t.integer "club_id", <%= i limit(4) + {null: false, unsigned: true} %>
+          t.string  "string",  <%= i limit(255) + {null: false, collation: "ascii_bin"} %>
           t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
         end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      erbh(<<-EOS)
         create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false
-          t.integer "club_id", limit: 4,     null: false, unsigned: true
-          t.string  "string",  limit: 255,   null: false
+          t.integer "emp_no",  <%= i limit(4) + {null: false} %>
+          t.integer "club_id", <%= i limit(4) + {null: false, unsigned: true} %>
+          t.string  "string",  <%= i limit(255) + {null: false, collation: "ascii_bin"} %>
           t.text    "text",    limit: 65535, null: false
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -71,25 +71,25 @@ describe 'Ridgepole::Client#diff -> migrate', condition: [:mysql_awesome_enabled
 
   context 'when change column (change collation)' do
     let(:actual_dsl) {
-      <<-RUBY
+      erbh(<<-EOS)
         create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false
-          t.integer "club_id", limit: 4,     null: false, unsigned: true
-          t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
+          t.integer "emp_no",  <%= i limit(4) + {null: false} %>
+          t.integer "club_id", <%= i limit(4) + {null: false, unsigned: true} %>
+          t.string  "string",  <%= i limit(255) + {null: false, collation: "ascii_bin"} %>
           t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
         end
-      RUBY
+      EOS
     }
 
     let(:expected_dsl) {
-      <<-RUBY
+      erbh(<<-EOS)
         create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false
-          t.integer "club_id", limit: 4,     null: false, unsigned: true
-          t.string  "string",  limit: 255,   null: false,                 collation: "utf8mb4_bin"
+          t.integer "emp_no",  <%= i limit(4) + {null: false} %>
+          t.integer "club_id", <%= i limit(4) + {null: false, unsigned: true} %>
+          t.string  "string",  <%= i limit(255) + {null: false, collation: "utf8mb4_bin"} %>
           t.text    "text",    limit: 65535, null: false,                 collation: "ascii_bin"
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -106,14 +106,14 @@ describe 'Ridgepole::Client#diff -> migrate', condition: [:mysql_awesome_enabled
 
   context 'when change column (no change collation)' do
     let(:actual_dsl) {
-      <<-RUBY
+      erbh(<<-EOS)
         create_table "employee_clubs", unsigned: true, force: :cascade do |t|
-          t.integer "emp_no",  limit: 4,     null: false
-          t.integer "club_id", limit: 4,     null: false, unsigned: true
-          t.string  "string",  limit: 255,   null: false,                 collation: "ascii_bin"
+          t.integer "emp_no",  <%= i limit(4) + {null: false} %>
+          t.integer "club_id", <%= i limit(4) + {null: false, unsigned: true} %>
+          t.string  "string",  <%= i limit(255) + {null: false, collation: "ascii_bin"} %>
           t.text    "text",    limit: 65535, null: false,                 collation: "utf8mb4_bin"
         end
-      RUBY
+      EOS
     }
 
     before { subject.diff(actual_dsl).migrate }
@@ -133,7 +133,9 @@ describe 'Ridgepole::Client#diff -> migrate', condition: [:mysql_awesome_enabled
           f.puts(actual_dsl)
           f.flush
 
-          out, status = run_ridgepole('--diff', "'#{JSON.dump(conn_spec)}'", f.path, '--enable-mysql-awesome', '--dump-without-table-options')
+          opts = ['--dump-without-table-options']
+          opts << '--enable-mysql-awesome' if condition(:mysql_awesome_enabled)
+          out, status = run_ridgepole('--diff', "'#{JSON.dump(conn_spec)}'", f.path, *opts)
 
           expect(out).to be_empty
           expect(status.success?).to be_truthy