spatial_adapter 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/spatial_adapter/adapters/postgis.rb

@@ -134,7 +134,7 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
   def indexes(table_name, name = nil)
     schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
     result = query(<<-SQL, name)
-    SELECT i.relname, d.indisunique, d.indkey, t.oid, am.amname
+    SELECT distinct i.relname, d.indisunique, d.indkey, t.oid, am.amname
       FROM pg_class t, pg_class i, pg_index d, pg_attribute a, pg_am am
     WHERE i.relkind = 'i'
       AND d.indexrelid = i.oid

data/spec/db/mysql_raw.rb

@@ -6,10 +6,11 @@ ActiveRecord::Schema.define() do
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
     	extra varchar(255),
+    	more_extra varchar(255),
     	geom  point not null
     ) ENGINE=MyISAM"
   execute "create spatial index index_point_models_on_geom on point_models (geom)"
-  execute "create index index_point_models_on_extra on point_models (extra)"
+  execute "create index index_point_models_on_extra on point_models (extra, more_extra)"
     
   execute "drop table if exists line_string_models"
   execute "create table line_string_models

data/spec/db/postgis_raw.rb

@@ -6,11 +6,12 @@ ActiveRecord::Schema.define() do
     create table point_models
     (
     	id serial primary key,
-    	extra varchar(255)
+    	extra varchar(255),
+    	more_extra varchar(255)
     );
     select AddGeometryColumn('point_models', 'geom', 4326, 'POINT', 2);
     create index index_point_models_on_geom on point_models using gist (geom);
-    create index index_point_models_on_extra on point_models (extra);
+    create index index_point_models_on_extra on point_models (extra, more_extra);
     
     drop table if exists line_string_models;
     create table line_string_models

data/spec/mysql/connection_adapter_spec.rb

@@ -65,6 +65,18 @@ describe "Modified MysqlAdapter" do
       @indexes = @connection.indexes('point_models')
     end
     
+    it "should return an IndexDefinition for each index on the table" do
+      @indexes.should have(2).items
+      @indexes.each do |i|
+        i.should be_a(ActiveRecord::ConnectionAdapters::IndexDefinition)
+      end
+    end
+    
+    it "should indicate the correct columns in the index" do
+      @indexes.select{|i| i.name == 'index_point_models_on_geom'}.first.columns.should == ['geom']
+      @indexes.select{|i| i.name == 'index_point_models_on_extra'}.first.columns.should == ['extra', 'more_extra']
+    end   
+    
     it "should be marked as spatial if a spatial index" do
       @indexes.select{|i| i.columns.include?('geom')}.first.spatial.should == true
     end

data/spec/postgis/connection_adapter_spec.rb

@@ -124,12 +124,24 @@ describe "Modified PostgreSQLAdapter" do
       @indexes = @connection.indexes('point_models', 'index_point_models_on_geom')
     end
     
+    it "should return an IndexDefinition for each index on the table" do
+      @indexes.should have(2).items
+      @indexes.each do |i|
+        i.should be_a(ActiveRecord::ConnectionAdapters::IndexDefinition)
+      end
+    end
+    
+    it "should indicate the correct columns in the index" do
+      @indexes.select{|i| i.name == 'index_point_models_on_geom'}.first.columns.should == ['geom']
+      @indexes.select{|i| i.name == 'index_point_models_on_extra'}.first.columns.should == ['extra', 'more_extra']
+    end
+    
     it "should be marked as spatial if a GIST index" do
-      @indexes.select{|i| i.columns.include?('geom')}.first.spatial.should == true
+      @indexes.select{|i| i.name == 'index_point_models_on_geom'}.first.spatial.should == true
     end
     
     it "should not be marked as spatial if not a GIST index" do
-      @indexes.select{|i| i.columns.include?('extra')}.first.spatial.should == false
+      @indexes.select{|i| i.name == 'index_point_models_on_extra'}.first.spatial.should == false
     end
   end  
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spatial_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Pete Deffendol
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -07:00
+date: 2010-02-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency