db-evolve 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c2d219d9eb136d9fc77ef61db3de22b60e4e045
-  data.tar.gz: 1add3a0300f4ea0445c05a56b85e6a01c7b72cbd
+  metadata.gz: fd431b52d3cc53adc7169b32e9bf06d9aa0eba57
+  data.tar.gz: c8162d9e1f347a8c8cc9b30145764d6f928ae5e3
 SHA512:
-  metadata.gz: 8d694515230ef89f8149cdfd6a80853bcb8760ce660dc9a002bdc4a14cb2aec30d18b8095fe92cd77b568ec8d0aaa92f99df3cd6cb90559d97caad82f5f2cfd0
-  data.tar.gz: ce6e122c6fe1000a2167569effc8e4013de3b124da61516abdf6247b997cf78e9e5a10ec5530816d2233c9661c0b93851bf4b55922406406cca36d19131acaf7
+  metadata.gz: 03ccbeb7750dec593c5271b5dbae4e2140d4fe854845cd759778d56afdc72b70763f3e05933c61bf2643ff6ac56cace98c32e89d5b1b16d6c77d4f745556d186
+  data.tar.gz: 892af42ab6744eefcd0f27d0b5634464f567585862a63aa2d184bb7256f8f7991196cbe2c46a17f12c5fd7ca918ffffc621d641bce990b9ff338ae7cd0e86455

data/lib/tasks/db.rb

@@ -83,6 +83,8 @@ def do_evolve(noop, yes, nowait)
   existing_tables, existing_indexes = load_existing_tables()
 
   require_relative 'db_mock'
+  
+  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.existing_tables = existing_tables
 
   require Rails.root + 'db/schema'
 
@@ -663,8 +665,11 @@ def calc_column_changes(tbl, existing_cols, schema_cols)
     scale_changed = (sc.type=="decimal" and sc_scale!=ec.scale)
     if type_changed or limit_changed or precision_changed or scale_changed
       pg_a.change_column(tbl, sc.name, sc.type.to_sym, sc.opts)
+      while $tmp_to_run.length > 1
+        $tmp_to_run.pop # in later versions of rails change_column runs extra crap we don't want
+      end
     end
-    if normalize_default(ec.default) != sc.opts[:default]
+    if normalize_default(ec.default, type: ec.type) != normalize_default(sc.opts[:default], type: sc.type)
       pg_a.change_column_default(tbl, sc.name, sc.opts[:default])
     end
     sc_null = sc.opts.has_key?(:null) ? sc.opts[:null] : true
@@ -684,14 +689,26 @@ def calc_column_changes(tbl, existing_cols, schema_cols)
   return to_run, rename_cols
 end
 
-def normalize_default default
-  default = default.to_s if default.is_a? Symbol
+def normalize_default default, type: nil
+  type = type.to_s unless type==nil
+  unless default==nil
+    default = default.to_i if type=='integer'
+    default = default.truish? if type=='boolean' && (default.is_a?(String) || default.is_a?(Symbol))
+    default = default.to_s if default.is_a? Symbol
+  end
   if (default.respond_to?(:infinite?) && default.infinite?) || default.is_a?(String) && (default.downcase == 'infinity' || default.downcase == '-infinity')
     default = default.to_s.downcase
   end
   return default
 end
 
+class String
+  def truish?
+    return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
+    return false if self == false || self.blank? || self =~ (/(false|f|no|n|0)$/i)
+    raise ArgumentError.new("i don't know... is \"#{self}\" truish?")
+  end
+end
 
 $tmp_to_run = []
 

data/lib/tasks/db_mock.rb

@@ -2,13 +2,35 @@ require 'pg'
 
 module ActiveRecord
   module ConnectionAdapters
+    class FakeResult
+      def fields
+        return []
+      end
+      def values
+        return []
+      end
+      def clear
+        return nil
+      end
+    end
     class PostgreSQLAdapter
       def execute(sql, name = nil)
         $tmp_to_run.append sql
+        return FakeResult.new
+      end
+      def async_exec(sql, params_result_format)
+        $tmp_to_run.append sql
+        return FakeResult.new
       end
       def table_exists?(name)
         false
       end
+      def columns(table_name)
+        return @@existing_tables[table_name]
+      end
+      def self.existing_tables= existing_tables
+        @@existing_tables = existing_tables
+      end
       def clear_cache!
       end
       def quote_string s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db-evolve
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Derek Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies: []
 description: A diff/patch-esque tool to replace schema migrations in Ruby.  See https://github.com/keredson/ruby-db-evolve
   for details.