spatial_adapter 1.1.1 → 1.1.2

data/README.rdoc

@@ -28,9 +28,13 @@ dependencies as well.
 
   gem install spatial_adapter
   
-In a Rails app, you can add a gem dependency in environment.rb:
+In a Rails 2.x app, you can add a gem dependency in environment.rb:
 
-  config.gem "spatial_adapter"
+  config.gem 'spatial_adapter'
+  
+In a Rails 3 app, add a gem dependency to Gemfile:
+
+  gem 'spatial_adapter'
   
 === As a Rails Plugin
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/spatial_adapter/postgresql.rb

@@ -99,7 +99,7 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
     columns(table_name).each do |col|
       if column_names.include?(col.name.to_sym)
         # Geometry columns have to be removed using DropGeometryColumn
-        if col.spatial? && !col.geographic?
+        if col.is_a?(SpatialColumn) && col.spatial? && !col.geographic?
           execute "SELECT DropGeometryColumn('#{table_name}','#{col.name}')"
         else
           original_remove_column(table_name, col.name)

data/rails/init.rb

@@ -1,4 +1,4 @@
-# Rails initialization
+# Rails initialization (for Rails 2.x)
 #
 # This will load the adapter for the currently used database configuration, if
 # it exists.

data/spec/postgresql/migration_spec.rb

@@ -330,22 +330,36 @@ describe "Spatially-enabled Migrations" do
       end
     end
 
+    SpatialAdapter.geometry_data_types.keys.each do |type|
+      it "should remove #{type.to_s} geography columns using ALTER TABLE DROP COLUMN" do
+        ActiveRecord::Schema.define do
+          create_table :migrated_geometry_models, :force => true do |t|
+            t.integer :extra
+            t.send(type, :geom, :geographic => true)
+          end
+        end
 
-  SpatialAdapter.geometry_data_types.keys.each do |type|
-    it "should remove #{type.to_s} geography columns using ALTER TABLE DROP COLUMN" do
+        @connection.should_receive(:execute).with(/alter table.*migrated_geometry_models.*drop.*geom/i)
+        ActiveRecord::Schema.define do
+          remove_column :migrated_geometry_models, :geom
+        end
+        @connection.should_receive(:execute).with(anything())
+      end
+    end
+    
+    it "should still remove non-spatial columns using ALTER TABLE DROP COLUMN" do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
           t.integer :extra
-          t.send(type, :geom, :geographic => true)
+          t.point   :geom
         end
       end
 
-      @connection.should_receive(:execute).with(/alter table.*migrated_geometry_models.*drop.*geom/i)
+      @connection.should_receive(:execute).with(/alter table.*migrated_geometry_models.*drop.*extra/i)
       ActiveRecord::Schema.define do
-        remove_column :migrated_geometry_models, :geom
+        remove_column :migrated_geometry_models, :extra
       end
       @connection.should_receive(:execute).with(anything())
     end
   end
-  end
 end

metadata

@@ -5,11 +5,12 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Pete Deffendol
+- Guilhem Vellut
 autorequire: 
 bindir: bin
 cert_chain: []