db-evolve 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32bce8077789ce0ea59e18087757e7f48b0495f8
-  data.tar.gz: d0e347947c1764c56d72a99d11f61d286eaa044a
+  metadata.gz: 930ccea720e436d84f54b60a3a77ac5d58dedaab
+  data.tar.gz: f9c37425c90e6ce783f4f18fc392cd124031a47a
 SHA512:
-  metadata.gz: 6117fa8c8a58aa74edd257592d22fb9d42c4feea8d2d27250f6d8fd55e36799bdbc3a078f8d85cc5f84b1127f9c6925a1a4501351cbad219179b7bf4e6ebc4e6
-  data.tar.gz: 2b08313fef6d82df293209e389ce0f7f7c8856025d7a62c3387ca0b85fa5e116fefbb1142140ec316da5d8b42a993cfe670bef820dfe69742aaa0d24654e3f14
+  metadata.gz: b14194ef9dee5ff00f6f1876eb6f73fb1ed6a0fbfb2af98bce989a532bca819a1d026af1b1508e079f41145303a240f0648ff8c24e525c8cf224ff98319812fe
+  data.tar.gz: 81edbca721139aa41baa8833cea4da3976b76e8c0c63152054f012eec167670095760841ed9cf8f72bb0b73d019e92152e989c6d29f1697b28b1631a4a3cb4de

data/lib/tasks/db.rb

@@ -81,10 +81,12 @@ end
 
 def do_evolve(noop, yes, nowait)
   existing_tables, existing_indexes = load_existing_tables()
+  server_version = load_server_version()
 
   require_relative 'db_mock'
   
   ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.existing_tables = existing_tables
+  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.server_version = server_version
 
   require Rails.root + 'db/schema'
 
@@ -333,6 +335,10 @@ def load_existing_tables()
   return existing_tables, existing_indexes
 end
 
+def load_server_version()
+  server_version = build_pg_connection.server_version rescue nil
+  return server_version
+end
 
 
 
@@ -526,7 +532,7 @@ end
 def gen_pg_adapter()
   $tmp_to_run = []
   a = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.allocate
-  ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_method(:initialize).bind(a).call ActiveRecord::Base.connection
+  ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_method(:initialize).bind(a).call build_pg_connection
   return a
 end
 

data/lib/tasks/db_mock.rb

@@ -9,19 +9,26 @@ module ActiveRecord
       def values
         return []
       end
+      def first
+        return {}
+      end
       def clear
         return nil
       end
     end
     class PostgreSQLAdapter
       def execute(sql, name = nil)
-        $tmp_to_run.append sql
+        $tmp_to_run.append sql unless skip? sql
         return FakeResult.new
       end
       def async_exec(sql, params_result_format)
-        $tmp_to_run.append sql
+        $tmp_to_run.append sql unless skip? sql
         return FakeResult.new
       end
+      def skip? sql
+        return true if sql.end_with?("'::regtype::oid") and sql.start_with?("SELECT '")
+        return false 
+      end
       def table_exists?(name)
         false
       end
@@ -31,6 +38,15 @@ module ActiveRecord
       def self.existing_tables= existing_tables
         @@existing_tables = existing_tables
       end
+      def self.server_version= server_version
+        @@server_version = server_version 
+      end
+      def server_version
+        return @@server_version
+      end
+      def initialize_type_map m
+        # do nothing
+      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.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Derek Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-22 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.