ridgepole 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c0c8c1752319c718ff7d81bd312595be2d82f13
-  data.tar.gz: d47279b479c711c61612ff141ac256ffc6372918
+  metadata.gz: e76552f3870c883c466187a33c21c8d1b22c4bad
+  data.tar.gz: fee7cdd8d0dd112d033500907d9f468718fd139c
 SHA512:
-  metadata.gz: 46869c5d0e8647b8abf3402d555cf84e60c3a024a9b48e46fbe0075ee1b7fd3cec44b51261df1f23446544ff3123394245649fe87812a56b3e5dccc174582463
-  data.tar.gz: 185b564db9d8af17abe59fc9bc1cea970f1cc906a8a8e6231bfe42d68e86f66d67c78521eef77f694236a24b50afb89434d218314ad96c41dfc2959912192a70
+  metadata.gz: 0fddcb88ff0e7c8357536f746c732ebea7ef276321462992830031e078ce18933f5a76c4f4ecd0832a71f0d24a96e9c2b88a5aba4678483192467ecb80b6e8eb
+  data.tar.gz: d3c94e687f7b28d0b7cd13c75fd6ab473743c5c834b757289c05b244340e836d0a52c7b4e55ec22f3a8396473fc70624d5735b267476d9ddab80303c9d5bab27

data/lib/ridgepole/diff.rb

@@ -94,10 +94,12 @@ class Ridgepole::Diff
         definition_delta[:add] ||= {}
         to_attrs[:options] ||= {}
 
-        if priv_column_name
-          to_attrs[:options][:after] = priv_column_name
-        else
-          to_attrs[:options][:first] = true
+        unless @options[:merge]
+          if priv_column_name
+            to_attrs[:options][:after] = priv_column_name
+          else
+            to_attrs[:options][:first] = true
+          end
         end
 
         definition_delta[:add][column_name] = to_attrs

data/lib/ridgepole/dumper.rb

@@ -6,9 +6,9 @@ class Ridgepole::Dumper
   def dump
     stream = StringIO.new
     conn = ActiveRecord::Base.connection
-    target_tables = @options.fetch(:tables, [])
+    target_tables = @options[:tables]
 
-    unless target_tables.empty?
+    if target_tables
       conn.tables.each do |tbl|
         next if target_tables.include?(tbl)
         ActiveRecord::SchemaDumper.ignore_tables << tbl
@@ -17,6 +17,8 @@ class Ridgepole::Dumper
 
     ActiveRecord::SchemaDumper.dump(conn, stream)
 
+    ActiveRecord::SchemaDumper.ignore_tables.clear if target_tables
+
     dsl = stream.string.lines.select {|line|
       line !~ /\A#/ &&
       line !~ /\AActiveRecord::Schema\.define/ &&

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ $: << File.expand_path('..', __FILE__)
 require 'ridgepole'
 require 'string_ext'
 
+ActiveRecord::Migration.verbose = false
+
 RSpec.configure do |config|
   config.before(:each) do
     restore_database

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord