rgeo-activerecord 0.5.0.beta1 → 0.5.0.beta2

data/Version

@@ -1 +1 @@
-0.5.0.beta1
+0.5.0.beta2

data/lib/rgeo/active_record/adapter_test_helper.rb

@@ -144,25 +144,30 @@ module RGeo
 
       def cleanup_caches
         klass_ = self.class.const_get(:DEFAULT_AR_CLASS)
+
         # Clear any RGeo factory settings.
         klass_.connection_pool.rgeo_factory_settings.clear!
+
         # Clear out any ActiveRecord caches that are present.
         # Different Rails versions use different types of caches.
+        has_schema_cache_ = false
         klass_.connection_pool.with_connection do |c_|
           if c_.respond_to?(:schema_cache)
             # 3.2.x and 4.0.x
             c_.schema_cache.clear!
+            has_schema_cache_ = true
           end
+          if c_.respond_to?(:clear_cache!)
+            # 3.1 and above
+            c_.clear_cache!
+          end
+          # All 3.x and 4.0
+          c_.clear_query_cache
         end
-        if klass_.connection_pool.respond_to?(:clear_cache!)
-          # 3.1.x
+        if !has_schema_cache_ && klass_.connection_pool.respond_to?(:clear_cache!)
+          # 3.1.x only
           klass_.connection_pool.clear_cache!
         end
-        if klass_.connection.respond_to?(:clear_cache!)
-          # 3.1 and above
-          klass_.connection.clear_cache!
-        end
-        klass_.connection.clear_query_cache
       end
 
 

data/lib/rgeo/active_record/common_adapter_elements.rb

@@ -65,8 +65,7 @@ module RGeo
 
     # Index definition struct with a spatial flag field.
 
-    class SpatialIndexDefinition < ::ActiveRecord::ConnectionAdapters::IndexDefinition
-      attr_accessor :spatial
+    class SpatialIndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders, :where, :spatial)
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.0.beta2
   prerelease: 6
 platform: ruby
 authors: