spatial_adapter 0.3.1 → 1.0.0

data/README.rdoc

@@ -28,7 +28,7 @@ dependencies as well.
 
   gem install spatial_adapter
   
-In your Rails app, you can add a gem dependency in environment.rb:
+In a Rails app, you can add a gem dependency in environment.rb:
 
   config.gem "spatial_adapter"
   
@@ -40,6 +40,25 @@ script/plugin install git://github.com/fragility/spatial_adapter.git
 
 You need to have Git installed first.
 
+== Configuration
+
+Choose the database type for which you would like to use spatial_adapter, and
+load each with
+
+  require 'spatial_adapter/[database]'
+  
+where [database] should be replaced with one of the following:
+
+- postgresql
+- mysql
+  
+For example to use the PostgreSQL spatial adapter:
+
+  require 'spatial_adapter/postgresql'
+  
+In a Rails app, spatial_adapter will automatically load the adapter for the database
+specified in your database.yml configuration.
+
 == Operations
 
 Geometric columns in your ActiveRecord models now appear just like any other

data/VERSION

@@ -1 +1 @@
-0.3.1
+1.0.0

data/lib/spatial_adapter/{adapters/mysql.rb → mysql.rb}

@@ -1,3 +1,4 @@
+require 'spatial_adapter'
 require 'active_record/connection_adapters/mysql_adapter'
 
 ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval do

data/lib/spatial_adapter/{adapters/postgis.rb → postgresql.rb}

@@ -1,3 +1,4 @@
+require 'spatial_adapter'
 require 'active_record/connection_adapters/postgresql_adapter'
 
 ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
@@ -145,28 +146,28 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
   end
 
   # Returns the list of all indexes for a table.
+  #
   # This is a full replacement for the ActiveRecord method and as a result
-  # has a higher probability of breaking in future releases
+  # has a higher probability of breaking in future releases.
   def indexes(table_name, name = nil)
-    schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
-    result = query(<<-SQL, name)
-    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
-      AND d.indisprimary = 'f'
-      AND t.oid = d.indrelid
-      AND i.relam = am.oid
-      AND t.relname = '#{table_name}'
-      AND a.attrelid = t.oid
-      AND ( d.indkey[0]=a.attnum OR d.indkey[1]=a.attnum
-        OR d.indkey[2]=a.attnum OR d.indkey[3]=a.attnum
-        OR d.indkey[4]=a.attnum OR d.indkey[5]=a.attnum
-        OR d.indkey[6]=a.attnum OR d.indkey[7]=a.attnum
-        OR d.indkey[8]=a.attnum OR d.indkey[9]=a.attnum )
-    ORDER BY i.relname
+     schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
+     
+     # Changed from upstread: link to pg_am to grab the index type (e.g. "gist")
+     result = query(<<-SQL, name)
+       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
+         AND d.indisprimary = 'f'
+         AND t.oid = d.indrelid
+         AND t.relname = '#{table_name}'
+         AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname IN (#{schemas}) )
+         AND i.relam = am.oid
+         AND a.attrelid = t.oid
+      ORDER BY i.relname
     SQL
 
+
     indexes = []
 
     indexes = result.map do |row|
@@ -174,16 +175,21 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
       unique = row[1] == 't'
       indkey = row[2].split(" ")
       oid = row[3]
-      spatial = row[4] == "gist"
+      indtype = row[4]
 
-      columns = query(<<-SQL, "Columns for index #{row[0]} on #{table_name}").inject({}) {|attlist, r| attlist[r[1]] = r[0]; attlist}
-      SELECT a.attname, a.attnum
-      FROM pg_attribute a
+      # Changed from upstream: need to get the column types to test for spatial indexes
+      columns = query(<<-SQL, "Columns for index #{row[0]} on #{table_name}").inject({}) {|attlist, r| attlist[r[1]] = [r[0], r[2]]; attlist}
+      SELECT a.attname, a.attnum, t.typname
+      FROM pg_attribute a, pg_type t
       WHERE a.attrelid = #{oid}
       AND a.attnum IN (#{indkey.join(",")})
+      AND a.atttypid = t.oid
       SQL
 
-      column_names = indkey.map {|attnum| columns[attnum] }
+      # Only GiST indexes on spatial columns denote a spatial index
+      spatial = indtype == 'gist' && columns.size == 1 && (columns.values.first[1] == 'geometry' || columns.values.first[1] == 'geography')
+
+      column_names = indkey.map {|attnum| columns[attnum] ? columns[attnum][0] : nil }
       ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, index_name, unique, column_names, spatial)
     end
 

data/lib/spatial_adapter.rb

@@ -1,10 +1,21 @@
+# This file should typically not be directly require'd into your project. You
+# should require the database-specific adapter you desire, e.g.
+#
+#   require 'spatial_adapter/postgresql'
+#
+# Why is this file here?
+#
+# Mostly to keep Rails happy when using config.gem to specify dependencies.
+# The Rails init code (rails/init.rb) will then load the adapter that matches
+# your database.yml configuration.
+
 require 'geo_ruby'
 require 'active_record'
 
 include GeoRuby::SimpleFeatures
 
 module SpatialAdapter
-  #Translation of geometric data types
+  # Translation of geometric data types
   def geometry_data_types
     {
       :point => { :name => "POINT" },
@@ -19,10 +30,8 @@ module SpatialAdapter
   end
 end
 
-require 'spatial_adapter/raw_geom_info'
-require 'spatial_adapter/spatial_column'
-require 'spatial_adapter/schema_definitions'
-require 'spatial_adapter/schema_dumper'
-require 'spatial_adapter/table_definition'
-require 'spatial_adapter/adapters/postgis'
-require 'spatial_adapter/adapters/mysql'
+require 'spatial_adapter/common/raw_geom_info'
+require 'spatial_adapter/common/spatial_column'
+require 'spatial_adapter/common/schema_definitions'
+require 'spatial_adapter/common/schema_dumper'
+require 'spatial_adapter/common/table_definition'

data/rails/init.rb

@@ -1 +1,16 @@
-require 'spatial_adapter'
+# Rails initialization
+#
+# This will load the adapter for the currently used database configuration, if
+# it exists.
+
+module SpatialAdapter
+  class NotCompatibleError < ::StandardError
+  end
+end
+
+begin
+  adapter = ActiveRecord::Base.configurations[RAILS_ENV]['adapter']
+  require "spatial_adapter/#{adapter}"
+rescue LoadError
+  raise SpatialAdapter::NotCompatibleError.new("spatial_adapter does not currently support the #{adapter} database.")
+end

data/spec/mysql/connection_adapter_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spatial_adapter/mysql'
 require 'db/mysql_raw'
 require 'models/common'
 

data/spec/mysql/migration_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spatial_adapter/mysql'
 
 class MigratedGeometryModel < ActiveRecord::Base
 end

data/spec/mysql/models_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spatial_adapter/mysql'
 require 'db/mysql_raw'
 require 'models/common'
 

data/spec/mysql/schema_dumper_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spatial_adapter/mysql'
 
 describe "Spatially-enabled Schema Dumps" do
   before :all do

data/spec/{postgis → postgresql}/connection_adapter_spec.rb

@@ -1,4 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+require 'spatial_adapter/postgresql'
 require 'db/postgis_raw'
 require 'models/common'
 
@@ -165,7 +167,7 @@ describe "Modified PostgreSQLAdapter" do
   
   describe "#indexes" do
     before :each do
-      @indexes = @connection.indexes('point_models', 'index_point_models_on_geom')
+      @indexes = @connection.indexes('point_models')
     end
     
     it "should return an IndexDefinition for each index on the table" do
@@ -180,13 +182,33 @@ describe "Modified PostgreSQLAdapter" do
       @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
+    it "should be marked as spatial if a GiST index on a geometry column" do
       @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
+    it "should be marked as spatial if a GiST index on a geography column" do
+      @indexes = @connection.indexes('geography_point_models')
+      @indexes.select{|i| i.name == 'index_geography_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.name == 'index_point_models_on_extra'}.first.spatial.should == false
     end
+    
+    it "should not be marked as spatial if a GiST index on a non-geometry column" do
+      @connection.execute(<<-SQL)
+        create table non_spatial_models
+        (
+          id serial primary key,
+          location point,
+          extra varchar(255)
+        );
+        create index index_non_spatial_models_on_location on non_spatial_models using gist (box(location, location));
+      SQL
+      @indexes = @connection.indexes('non_spatial_models')
+      @indexes.select{|i| i.name == 'index_non_spatial_models_on_location'}.first.spatial.should == false
+      @connection.execute 'drop table non_spatial_models'
+    end
   end  
   
   describe "#add_index" do

data/spec/{postgis → postgresql}/migration_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spatial_adapter/postgresql'
 
 class MigratedGeometryModel < ActiveRecord::Base
 end

data/spec/{postgis → postgresql}/models_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spatial_adapter/postgresql'
 require 'db/postgis_raw'
 require 'models/common'
 

data/spec/{postgis → postgresql}/schema_dumper_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spatial_adapter/postgresql'
 
 describe "Spatially-enabled Schema Dumps" do
   before :all do

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 require 'rubygems'
 require 'spec'
+require 'geo_ruby'
 gem 'activerecord', '=2.3.5'
+require 'active_record'
 
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
-require 'spatial_adapter'
 
 include GeoRuby::SimpleFeatures
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spatial_adapter
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Pete Deffendol
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -07:00
+date: 2010-04-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 2
         version: 2.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: GeoRuby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Provides enhancements to ActiveRecord to handle spatial datatypes in PostgreSQL and MySQL.
 email: pete@fragility.us
 executables: []
@@ -45,13 +58,13 @@ files:
 - README.rdoc
 - VERSION
 - lib/spatial_adapter.rb
-- lib/spatial_adapter/adapters/mysql.rb
-- lib/spatial_adapter/adapters/postgis.rb
-- lib/spatial_adapter/raw_geom_info.rb
-- lib/spatial_adapter/schema_definitions.rb
-- lib/spatial_adapter/schema_dumper.rb
-- lib/spatial_adapter/spatial_column.rb
-- lib/spatial_adapter/table_definition.rb
+- lib/spatial_adapter/common/raw_geom_info.rb
+- lib/spatial_adapter/common/schema_definitions.rb
+- lib/spatial_adapter/common/schema_dumper.rb
+- lib/spatial_adapter/common/spatial_column.rb
+- lib/spatial_adapter/common/table_definition.rb
+- lib/spatial_adapter/mysql.rb
+- lib/spatial_adapter/postgresql.rb
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/fragility/spatial_adapter
@@ -66,18 +79,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Spatial Adapter for ActiveRecord
@@ -89,9 +104,9 @@ test_files:
 - spec/mysql/migration_spec.rb
 - spec/mysql/models_spec.rb
 - spec/mysql/schema_dumper_spec.rb
-- spec/postgis/connection_adapter_spec.rb
-- spec/postgis/migration_spec.rb
-- spec/postgis/models_spec.rb
-- spec/postgis/schema_dumper_spec.rb
+- spec/postgresql/connection_adapter_spec.rb
+- spec/postgresql/migration_spec.rb
+- spec/postgresql/models_spec.rb
+- spec/postgresql/schema_dumper_spec.rb
 - spec/spec_helper.rb
 - spec/README.txt