ridgepole 0.5.3.beta4 → 0.6.0.beta

data/spec/migrate_0/migrate_create_fk_spec.rb

@@ -2,13 +2,13 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when create fk' do
     let(:actual_dsl) {
       <<-RUBY
-create_table "child", force: true do |t|
-  t.integer "parent_id", unsigned: true
+create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
+  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
 end
 
 add_index "child", ["parent_id"], name: "par_ind", using: :btree
 
-create_table "parent", force: true do |t|
+create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
 end
       RUBY
     }
@@ -16,12 +16,12 @@ end
     let(:expected_dsl) {
       actual_dsl + (<<-RUBY)
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 
     before { subject.diff(actual_dsl).migrate }
-    subject { client(enable_foreigner: true) }
+    subject { client }
 
     it {
       delta = subject.diff(expected_dsl)
@@ -32,7 +32,7 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
     }
 
     it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_foreigner: true)
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
         remove_foreign_key("child", {:name=>"child_ibfk_1"})
@@ -40,13 +40,11 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
     }
 
     it {
-      delta = client(enable_foreigner: true, bulk_change: true).diff(expected_dsl)
+      delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump.delete_empty_lines).to eq actual_dsl.strip_heredoc.strip.delete_empty_lines
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
-        change_table("child", {:bulk => true}) do |t|
-          t.foreign_key("parent", {:name=>"child_ibfk_1", :dependent=>:delete})
-        end
+        add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
       RUBY
       delta.migrate
       expect(subject.dump.delete_empty_lines).to eq expected_dsl.strip_heredoc.strip.delete_empty_lines
@@ -57,35 +55,36 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
     let(:dsl) {
       <<-RUBY
 # Define parent before child
-create_table "parent", force: true do |t|
+create_table "parent", force: :cascade do |t|
 end
 
-create_table "child", force: true do |t|
+create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
 
 add_index "child", ["parent_id"], name: "par_ind", using: :btree
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 
     let(:sorted_dsl) {
       <<-RUBY
-create_table "child", force: true do |t|
-  t.integer "parent_id", unsigned: true
+
+create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
+  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
 end
 
 add_index "child", ["parent_id"], name: "par_ind", using: :btree
 
-create_table "parent", force: true do |t|
+create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
 end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 
-    subject { client(enable_foreigner: true) }
+    subject { client }
 
     it {
       delta = subject.diff(dsl)
@@ -100,22 +99,22 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
     let(:dsl) {
       <<-RUBY
 # Define parent before child
-create_table "parent", force: true do |t|
+create_table "parent", force: :cascade do |t|
 end
 
-create_table "child", force: true do |t|
+create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
 
 add_index "child", ["parent_id"], name: "par_ind", using: :btree
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 
-    subject { client(enable_foreigner: true) }
+    subject { client }
 
     it {
       expect {
@@ -128,20 +127,20 @@ add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
     let(:dsl) {
       <<-RUBY
 # Define parent before child
-create_table "parent", force: true do |t|
+create_table "parent", force: :cascade do |t|
 end
 
-create_table "child", force: true do |t|
+create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
 
 add_index "child", ["parent_id"], name: "par_ind", using: :btree
 
-add_foreign_key "child", "parent", dependent: :delete
+add_foreign_key "child", "parent"
       RUBY
     }
 
-    subject { client(enable_foreigner: true) }
+    subject { client }
 
     it {
       expect {
@@ -154,14 +153,14 @@ add_foreign_key "child", "parent", dependent: :delete
     let(:dsl) {
       <<-RUBY
 # Define parent before child
-create_table "parent", force: true do |t|
+create_table "parent", force: :cascade do |t|
 end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 
-    subject { client(enable_foreigner: true) }
+    subject { client }
 
     it {
       expect {

data/spec/migrate_0/migrate_drop_fk_spec.rb

@@ -2,41 +2,41 @@ describe 'Ridgepole::Client#diff -> migrate' do
   context 'when drop fk' do
     let(:actual_dsl) {
       <<-RUBY
-create_table "parent", force: true do |t|
+create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
 end
 
-create_table "child", force: true do |t|
-  t.integer "parent_id", unsigned: true
+create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
+  t.integer "parent_id"#{unsigned_if_enabled}
 end
 
 add_index "child", ["parent_id"], name: "par_ind", using: :btree
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 
     let(:sorted_actual_dsl) {
       expected_dsl + (<<-RUBY)
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 
     let(:expected_dsl) {
       <<-RUBY
-create_table "child", force: true do |t|
-  t.integer "parent_id", unsigned: true
+create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
+  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
 end
 
 add_index "child", ["parent_id"], name: "par_ind", using: :btree
 
-create_table "parent", force: true do |t|
+create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
 end
       RUBY
     }
 
     before { subject.diff(actual_dsl).migrate }
-    subject { client(enable_foreigner: true) }
+    subject { client }
 
     it {
       delta = subject.diff(expected_dsl)
@@ -47,21 +47,19 @@ end
     }
 
     it {
-      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, enable_foreigner: true)
+      delta = Ridgepole::Client.diff(actual_dsl, expected_dsl, reverse: true, default_int_limit: 4)
       expect(delta.differ?).to be_truthy
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
-        add_foreign_key("child", "parent", {:name=>"child_ibfk_1", :dependent=>:delete})
+        add_foreign_key("child", "parent", {:name=>"child_ibfk_1"})
       RUBY
     }
 
     it {
-      delta = client(enable_foreigner: true, bulk_change: true).diff(expected_dsl)
+      delta = client(bulk_change: true).diff(expected_dsl)
       expect(delta.differ?).to be_truthy
       expect(subject.dump).to eq sorted_actual_dsl.strip_heredoc.strip
       expect(delta.script).to eq <<-RUBY.strip_heredoc.strip
-        change_table("child", {:bulk => true}) do |t|
-          t.remove_foreign_key({:name=>"child_ibfk_1"})
-        end
+        remove_foreign_key("child", {:name=>"child_ibfk_1"})
       RUBY
       delta.migrate
       expect(subject.dump.each_line.select {|i| i !~ /\A\Z/ }.join).to eq expected_dsl.strip_heredoc.strip.each_line.select {|i| i !~ /\A\Z/ }.join
@@ -71,36 +69,37 @@ end
   context 'when drop fk when drop table' do
     let(:dsl) {
       <<-RUBY
-create_table "parent", force: true do |t|
+create_table "parent", force: :cascade do |t|
 end
 
-create_table "child", force: true do |t|
+
+create_table "child", force: :cascade do |t|
   t.integer "parent_id", unsigned: true
 end
 
 add_index "child", ["parent_id"], name: "par_ind", using: :btree
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 
     let(:sorted_dsl) {
       <<-RUBY
-create_table "child", force: true do |t|
-  t.integer "parent_id", unsigned: true
+create_table "child"#{unsigned_if_enabled}, force: :cascade do |t|
+  t.integer "parent_id", limit: 4#{unsigned_if_enabled}
 end
 
 add_index "child", ["parent_id"], name: "par_ind", using: :btree
 
-create_table "parent", force: true do |t|
+create_table "parent"#{unsigned_if_enabled}, force: :cascade do |t|
 end
 
-add_foreign_key "child", "parent", name: "child_ibfk_1", dependent: :delete
+add_foreign_key "child", "parent", name: "child_ibfk_1"
       RUBY
     }
 
     before { subject.diff(dsl).migrate }
-    subject { client(enable_foreigner: true) }
+    subject { client }
 
     it {
       delta = subject.diff('')

data/spec/spec_helper.rb

@@ -57,8 +57,6 @@ def client(options = {}, config = {})
     default_options[:enable_mysql_awesome] = true
     default_options[:dump_without_table_options] = true
     default_options[:mysql_awesome_unsigned_pk] = true
-  else
-    default_options[:enable_mysql_unsigned] = true
   end
 
   options = default_options.merge(options)
@@ -142,3 +140,27 @@ end
 def mysql_awesome_enabled?
   ENV['ENABLE_MYSQL_AWESOME'] == '1'
 end
+
+def if_mysql_awesome_enabled(then_str, else_str = '')
+  if mysql_awesome_enabled?
+    then_str
+  else
+    else_str
+  end
+end
+
+def unsigned_if_enabled(prefix = ', ', suffix = '')
+  if_mysql_awesome_enabled("#{prefix}unsigned: true#{suffix}")
+end
+
+def unsigned_false_if_enabled(prefix = ', ', suffix = '')
+  if_mysql_awesome_enabled("#{prefix}unsigned: false#{suffix}")
+end
+
+def unsigned_if_enabled2(prefix = ', ', suffix = '')
+  if_mysql_awesome_enabled("#{prefix}:unsigned=>true#{suffix}")
+end
+
+def unsigned_false_if_enabled2(prefix = ', ', suffix = '')
+  if_mysql_awesome_enabled("#{prefix}:unsigned=>false#{suffix}")
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.5.3.beta4
+  version: 0.6.0.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -109,75 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-mysql-unsigned
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: foreigner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-- !ruby/object:Gem::Dependency
-  name: activerecord-mysql-pkdump
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: migration_comments
+  name: activerecord-mysql-awesome
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord-mysql-awesome
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.7
 description: Ridgepole is a tool to manage DB schema. It defines DB schema using Rails
   DSL, and updates DB schema according to DSL.
 email:
@@ -203,19 +133,16 @@ files:
 - lib/ridgepole/dsl_parser.rb
 - lib/ridgepole/dumper.rb
 - lib/ridgepole/execute_expander.rb
-- lib/ridgepole/ext/foreign_key.rb
 - lib/ridgepole/ext/mysql_awesome.rb
 - lib/ridgepole/logger.rb
 - lib/ridgepole/migration_ext.rb
 - lib/ridgepole/schema_dumper_ext.rb
 - lib/ridgepole/version.rb
 - ridgepole.gemspec
-- spec/0_diff/dump_disable_unsigned_spec.rb
 - spec/bigint_pk/bigint_pkspec.rb
 - spec/cli/config_spec.rb
 - spec/cli/ridgepole_spec.rb
 - spec/collation/collation_spec.rb
-- spec/comment/comment_spec.rb
 - spec/diff/diff2_spec.rb
 - spec/diff/diff_spec.rb
 - spec/dump/dump_class_method_spec.rb
@@ -251,7 +178,6 @@ files:
 - spec/migrate/migrate_rename_column_spec.rb
 - spec/migrate/migrate_rename_table_spec.rb
 - spec/migrate/migrate_same_default_null_spec.rb
-- spec/migrate/migrate_same_default_unsigned_spec.rb
 - spec/migrate/migrate_same_spec.rb
 - spec/migrate/migrate_script_error_spec.rb
 - spec/migrate/migrate_skip_rename_column_spec.rb
@@ -266,8 +192,7 @@ files:
 - spec/ridgepole_test_tables.sql
 - spec/spec_helper.rb
 - spec/string_ext.rb
-- spec/~pkdump/pkdump_spec.rb
-homepage: http://ridgepole.codenize.tools/
+homepage: https://github.com/winebarrel/ridgepole/tree/v0.6.0
 licenses:
 - MIT
 metadata: {}
@@ -292,12 +217,10 @@ signing_key:
 specification_version: 4
 summary: Ridgepole is a tool to manage DB schema.
 test_files:
-- spec/0_diff/dump_disable_unsigned_spec.rb
 - spec/bigint_pk/bigint_pkspec.rb
 - spec/cli/config_spec.rb
 - spec/cli/ridgepole_spec.rb
 - spec/collation/collation_spec.rb
-- spec/comment/comment_spec.rb
 - spec/diff/diff2_spec.rb
 - spec/diff/diff_spec.rb
 - spec/dump/dump_class_method_spec.rb
@@ -333,7 +256,6 @@ test_files:
 - spec/migrate/migrate_rename_column_spec.rb
 - spec/migrate/migrate_rename_table_spec.rb
 - spec/migrate/migrate_same_default_null_spec.rb
-- spec/migrate/migrate_same_default_unsigned_spec.rb
 - spec/migrate/migrate_same_spec.rb
 - spec/migrate/migrate_script_error_spec.rb
 - spec/migrate/migrate_skip_rename_column_spec.rb
@@ -348,4 +270,3 @@ test_files:
 - spec/ridgepole_test_tables.sql
 - spec/spec_helper.rb
 - spec/string_ext.rb
-- spec/~pkdump/pkdump_spec.rb

data/lib/ridgepole/ext/foreign_key.rb

@@ -1,121 +0,0 @@
-class Ridgepole::ForeignKey
-  class << self
-    def init
-      require 'foreigner'
-
-      ActiveSupport.on_load :active_record do
-        Foreigner.load
-      end
-
-      Ridgepole::DSLParser::Context.include_module(Ridgepole::ForeignKey::DSL)
-    end
-
-    def check_orphan_foreign_key(definition)
-      definition.each do |table_name, attrs|
-        if attrs[:foreign_keys] and not attrs[:definition]
-          raise "Table `#{table_name}` to create the foreign key is not defined: #{attrs[:foreign_keys].keys.join(',')}"
-        end
-      end
-    end
-
-    def scan_foreign_keys_change(from, to, table_delta, options)
-      from = (from || {}).dup
-      to = (to || {}).dup
-      foreign_keys_delta = {}
-
-      to.each do |foreign_key_name, to_attrs|
-        from_attrs = from.delete(foreign_key_name)
-
-        if from_attrs
-          if from_attrs != to_attrs
-            foreign_keys_delta[:add] ||= {}
-            foreign_keys_delta[:add][foreign_key_name] = to_attrs
-
-            unless options[:merge]
-              foreign_keys_delta[:delete] ||= {}
-              foreign_keys_delta[:delete][foreign_key_name] = from_attrs
-            end
-          end
-        else
-          foreign_keys_delta[:add] ||= {}
-          foreign_keys_delta[:add][foreign_key_name] = to_attrs
-        end
-      end
-
-      unless options[:merge]
-        from.each do |foreign_key_name, from_attrs|
-          foreign_keys_delta[:delete] ||= {}
-          foreign_keys_delta[:delete][foreign_key_name] = from_attrs
-        end
-      end
-
-      unless foreign_keys_delta.empty?
-        table_delta[:foreign_keys] = foreign_keys_delta
-      end
-    end
-
-    def append_change_foreign_keys(table_name, delta, buf, options)
-      (delta[:delete] || {}).each do |foreign_key_name, attrs|
-        append_remove_foreign_key(table_name, foreign_key_name, attrs, buf, options)
-      end
-
-      (delta[:add] || {}).each do |foreign_key_name, attrs|
-        append_add_foreign_key(table_name, foreign_key_name, attrs, buf, options)
-      end
-    end
-
-    def append_add_foreign_key(table_name, foreign_key_name, attrs, buf, options)
-      to_table = attrs.fetch(:to_table)
-      attrs_options = attrs[:options] || {}
-
-      if options[:bulk_change]
-        buf.puts(<<-EOS)
-  t.foreign_key(#{to_table.inspect}, #{attrs_options.inspect})
-        EOS
-      else
-        buf.puts(<<-EOS)
-add_foreign_key(#{table_name.inspect}, #{to_table.inspect}, #{attrs_options.inspect})
-        EOS
-      end
-    end
-
-    def append_remove_foreign_key(table_name, foreign_key_name, attrs, buf, options)
-      attrs_options = attrs[:options] || {}
-      target = {:name => attrs_options.fetch(:name)}
-
-      if options[:bulk_change]
-        buf.puts(<<-EOS)
-  t.remove_foreign_key(#{target.inspect})
-        EOS
-      else
-        buf.puts(<<-EOS)
-remove_foreign_key(#{table_name.inspect}, #{target.inspect})
-        EOS
-      end
-    end
-  end # of class methods
-
-  module DSL
-    def add_foreign_key(from_table, to_table, options = {})
-      unless options[:name]
-        raise "Foreign key name in `#{from_table}` is undefined"
-      end
-
-      from_table = from_table.to_s
-      to_table = to_table.to_s
-      options[:name] = options[:name].to_s
-      @__definition[from_table] ||= {}
-      @__definition[from_table][:foreign_keys] ||= {}
-      idx = options[:name]
-
-      if @__definition[from_table][:foreign_keys][idx]
-        raise "Foreign Key `#{from_table}(#{idx})` already defined"
-      end
-
-      @__definition[from_table][:foreign_keys][idx] = {
-        :to_table => to_table,
-        :options => options,
-      }
-    end
-  end
-end