activerecord-postgis-adapter 0.4.3 → 0.5.0

data/History.rdoc

@@ -1,3 +1,20 @@
+=== 0.5.0 / 2012-12-12
+
+Thanks to the many who have submitted pull requests. A bunch of them are in this release. Special thanks to Nick Muerdter, who succeeded in porting the adapter to work with the JDBC Postgres adapter in JRuby, and also got Travis up and running for the project.
+
+* Add JRuby compatibility with the activerecord-jdbcpostgresql-adapter gem. (Pull request by Nick Muerdter)
+* Allow WKT to be to be specified as a string-like object rather than having to be a String. (Pull request by Bryan Larsen)
+* Ignore postgis_topology tables 'layer' and 'topology' in rake db:schema:dump. (Pull request by Greg Phillips)
+* Create schemas specified in schema_search_path only if they don't exist. (Pull request by legendetm)
+* Force the postgis_topology extension be created in the topology schema. (Pull request by Dimitri Roche)
+* Specifically set the ownership of the postgis related tables to the regular user. (Pull request by corneverbruggen)
+* The gemspec no longer includes the timestamp in the version, so that bundler can pull from github. (Reported by corneverbruggen)
+* Update tests for PostGIS 2.0 compatibility.
+* Travis-CI integration. (Pull request by Nick Muerdter)
+* Add a missing srid in the Readme. (Pull request by gouthamvel)
+* Readme clarifies that BoundingBox objects can be used in a query only for projected coordinate systems. (Reported by Tee Parham)
+* Update URLs to point to new website.
+
 === 0.4.3 / 2012-04-13
 
 * Rake tasks failed on Rails 3.0.x because of an issue with rgeo-activerecord pre-0.4.5. Now we require the fixed version.

data/README.rdoc

@@ -36,10 +36,10 @@ Examples:
   create_table :my_spatial_table do |t|
     t.column :shape, :geometry  # or t.geometry :shape
     t.line_string :path, :srid => 3785
-    t.point :latlon, :geographic => true
+    t.point :lonlat, :geographic => true
   end
   change_table :my_spatial_table do |t|
-    t.index :latlon, :spatial => true
+    t.index :lonlat, :spatial => true
   end
 
 === Spatial Attributes
@@ -71,16 +71,16 @@ Examples, given the spatial table defined above:
     # By default, use the GEOS implementation for spatial columns.
     self.rgeo_factory_generator = RGeo::Geos.factory_generator
     
-    # But use a geographic implementation for the :latlon column.
-    set_rgeo_factory_for_column(:latlon, RGeo::Geographic.spherical_factory)
+    # But use a geographic implementation for the :lonlat column.
+    set_rgeo_factory_for_column(:lonlat, RGeo::Geographic.spherical_factory(:srid => 4326))
     
   end
 
 Now you can interact with the data using the RGeo types:
 
   rec = MySpatialTable.new
-  rec.latlon = 'POINT(-122 47)'   # You can set by feature object or WKT.
-  loc = rec.latlon                # Accessing always returns a feature object, in
+  rec.lonlat = 'POINT(-122 47)'   # You can set by feature object or WKT.
+  loc = rec.lonlat                # Accessing always returns a feature object, in
                                   # this case, a geographic that understands latitude.
   loc.latitude                    # => 47
   rec.shape = loc                 # the factory for the :shape column is GEOS, so the
@@ -92,11 +92,11 @@ Now you can interact with the data using the RGeo types:
 You can create simple queries based on objective equality in the same way
 you would on a scalar column:
 
-  rec = MySpatialTable.where(:latlon => RGeo::Geos.factory.point(-122, 47)).first
+  rec = MySpatialTable.where(:lonlat => RGeo::Geos.factory.point(-122, 47)).first
 
 You can also use WKT:
 
-  rec = MySpatialTable.where(:latlon => 'POINT(-122 47)').first
+  rec = MySpatialTable.where(:lonlat => 'POINT(-122 47)').first
 
 Most more complex spatial queries require the use of SQL functions. You
 can write such queries in raw SQL, but you may find the "squeel" gem
@@ -104,17 +104,23 @@ very helpful in this regard. Using squeel, you can write queries like
 the following:
 
   my_polygon = get_my_polygon()
-  MySpatialTable.where{st_intersects(latlon, my_polygon)}.first
+  MySpatialTable.where{st_intersects(lonlat, my_polygon)}.first
+
+Note that using squeel to create SQL functions requires Rails 3.1 or later.
 
 One common query is to find all objects displaying in a window. This can
-be done using the overlap (&&) operator with a bounding box, as follows:
+be done using the overlap (&&) operator with a bounding box. Here's an
+example that finds linestrings in the "path" column that intersect a
+bounding box:
 
-  sw = get_sw_corner()
-  ne = get_ne_corner()
+  sw = get_sw_corner_in_projected_coordinates()
+  ne = get_ne_corner_in_projected_coordinates()
   window = RGeo::Cartesian::BoundingBox.create_from_points(sw, ne)
-  MySpatialTable.where{latlon.op('&&', window)}.all
+  MySpatialTable.where{path.op('&&', window)}.all
 
-Note that using squeel to create SQL functions requires Rails 3.1 or later.
+Note that bounding box queries make sense only in a projected coordinate
+system; you shouldn't try to run such a query against a lat/long
+(geographic) column.
 
 == Installation And Configuration
 
@@ -122,14 +128,15 @@ Note that using squeel to create SQL functions requires Rails 3.1 or later.
 
 This adapter has the following requirements:
 
-* Ruby 1.8.7 or later. Ruby 1.9.2 or later preferred.
+* Ruby 1.8.7 or later. Ruby 1.9.2 or later preferred. JRuby 1.6.3 or later also supported.
 * PostgreSQL 9.0 or later.
-* PostGIS 1.5 or later.
-* pg gem 0.11 or later.
+* PostGIS 1.5, PostGIS 2.0, or later.
 * \ActiveRecord 3.0.3 or later. Earlier versions will not work.
   Should be compatible with Rails versions through 3.2.x.
-* rgeo gem 0.3.10 or later.
-* rgeo-activerecord gem 0.4.4 or later.
+* rgeo gem 0.3.20 or later.
+* rgeo-activerecord gem 0.4.6 or later.
+
+Please note that this version of the adapter is targeted towards Rails 3.x only. The upcoming version 0.6 will target Rails 4.0.
 
 Install this adapter as a gem:
 
@@ -172,7 +179,7 @@ database. Generally, the value should be set to true, although you can
 also set it to a comma-delimited list of extension names (which should
 include the base "postgis" extension) if you want to customize which
 extensions are installed. This is the easiest and cleanest way to create
-a PostGIS-enabled database, but it requires PostgreSQL 9.1 or later and
+a PostGIS-enabled database, but it requires PostgreSQL 9.1 or later AND
 PostGIS 2.0 or later.
 
 The <i>script_dir</i> parameter is specific to the PostGIS adapter, and
@@ -278,10 +285,14 @@ current known issues.
 * Other rake tasks may not be supported. Unfortunately, Rails makes it
   difficult for custom \ActiveRecord adapters to support the standard
   rake tasks.
+* Rails 4 is not yet supported. The good news is that the base PostgreSQL
+  adapter has been refactored in Rails 4 to make it easier to extend, so
+  once we get it ported to Rails 4, activerecord-postgis-adapter should
+  be cleaner and more stable.
 
 === Development and support
 
-Documentation is available at http://virtuoso.rubyforge.org/activerecord-postgis-adapter/README_rdoc.html
+Documentation is available at http://dazuma.github.com/activerecord-postgis-adapter/rdoc
 
 Source code is hosted on Github at http://github.com/dazuma/activerecord-postgis-adapter
 
@@ -298,7 +309,7 @@ Contact the author at dazuma at gmail dot com.
 The PostGIS Adapter and its supporting libraries (including RGeo) are
 written by Daniel Azuma (http://www.daniel-azuma.com).
 
-Development is supported by Pirq. (http://www.pirq.com).
+Development is supported by Pirq. (http://pirq.com).
 
 This adapter implementation owes some debt to the spatial_adapter plugin
 (http://github.com/fragility/spatial_adapter). Although we made some

data/Version

@@ -1 +1 @@
-0.4.3
+0.5.0

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -35,7 +35,12 @@
 
 
 require 'rgeo/active_record'
-require 'active_record/connection_adapters/postgresql_adapter'
+
+if defined?(::RUBY_ENGINE) && ::RUBY_ENGINE == 'jruby'
+  require 'active_record/connection_adapters/postgis_adapter/jdbc_connection'
+else
+  require 'active_record/connection_adapters/postgis_adapter/pg_connection'
+end
 
 
 # The activerecord-postgis-adapter gem installs the *postgis*
@@ -43,38 +48,6 @@ require 'active_record/connection_adapters/postgresql_adapter'
 
 module ActiveRecord
 
-
-  # ActiveRecord looks for the postgis_connection factory method in
-  # this class.
-
-  class Base
-
-
-    # Create a postgis connection adapter.
-
-    def self.postgis_connection(config_)
-      require 'pg'
-
-      config_ = config_.symbolize_keys
-      host_ = config_[:host]
-      port_ = config_[:port] || 5432
-      username_ = config_[:username].to_s if config_[:username]
-      password_ = config_[:password].to_s if config_[:password]
-      if config_.has_key?(:database)
-        database_ = config_[:database]
-      else
-        raise ::ArgumentError, "No database specified. Missing argument: database."
-      end
-
-      # The postgres drivers don't allow the creation of an unconnected PGconn object,
-      # so just pass a nil connection object for the time being.
-      ::ActiveRecord::ConnectionAdapters::PostGISAdapter::MainAdapter.new(nil, logger, [host_, port_, nil, nil, database_, username_, password_], config_)
-    end
-
-
-  end
-
-
   # All ActiveRecord adapters go in this namespace.
   module ConnectionAdapters
 
@@ -102,3 +75,5 @@ require 'active_record/connection_adapters/postgis_adapter/arel_tosql.rb'
 ignore_tables_ = ::ActiveRecord::SchemaDumper.ignore_tables
 ignore_tables_ << 'geometry_columns' unless ignore_tables_.include?('geometry_columns')
 ignore_tables_ << 'spatial_ref_sys' unless ignore_tables_.include?('spatial_ref_sys')
+ignore_tables_ << 'layer' unless ignore_tables_.include?('layer')
+ignore_tables_ << 'topology' unless ignore_tables_.include?('topology')

data/lib/active_record/connection_adapters/postgis_adapter/databases.rake

@@ -68,13 +68,18 @@ def create_database(config_)
       search_path_ = search_path_.split(",").map{ |sp_| sp_.strip }
       auth_ = has_su_ ? " AUTHORIZATION #{username_}" : ''
       search_path_.each do |schema_|
-        conn_.execute("CREATE SCHEMA #{schema_}#{auth_}") unless schema_.downcase == 'public'
+        exists = schema_.downcase == 'public' || conn_.execute("SELECT 1 FROM pg_catalog.pg_namespace WHERE nspname='#{schema_}'").try(:first)
+        conn_.execute("CREATE SCHEMA #{schema_}#{auth_}") unless exists
       end
 
       # Install postgis definitions into the database.
       # Note: a superuser is required to run the postgis definitions.
       # If a separate superuser is provided, we need to grant privileges on
       # the postgis definitions over to the regular user afterwards.
+      # We also need to set the ownership of the postgis tables (spatial_ref_sys
+      # and geometry_columns) to the regular user. This is required to e.g.
+      # be able to disable referential integrity on the database when using
+      # a database cleaner truncation strategy during testing.
       # The schema for the postgis definitions is chosen as follows:
       # If "postgis" is present in the search path, use it.
       # Otherwise, use the last schema in the search path.
@@ -93,12 +98,19 @@ def create_database(config_)
           postgis_extension_ = 'postgis' if postgis_extension_ == true
           postgis_extension_ = postgis_extension_.to_s.split(',') unless postgis_extension_.is_a?(::Array)
           postgis_extension_.each do |extname_|
-            conn_.execute("CREATE EXTENSION #{extname_} SCHEMA #{postgis_schema_}")
+            if extname_ == 'postgis_topology'
+              raise ArgumentError, "'topology' must be in schema_search_path for postgis_topology" unless search_path_.include?('topology')
+              conn_.execute("CREATE EXTENSION #{extname_} SCHEMA topology")
+            else
+              conn_.execute("CREATE EXTENSION #{extname_} SCHEMA #{postgis_schema_}")
+            end
           end
         end
         if has_su_
           conn_.execute("GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA #{postgis_schema_} TO #{username_}")
           conn_.execute("GRANT ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA #{postgis_schema_} TO #{username_}")
+          conn_.execute("ALTER TABLE geometry_columns OWNER TO #{username_}")
+          conn_.execute("ALTER TABLE spatial_ref_sys OWNER TO #{username_}")
         end
       end
 

data/lib/active_record/connection_adapters/postgis_adapter/jdbc_connection.rb

@@ -0,0 +1,69 @@
+require 'active_record/connection_adapters/jdbcpostgresql_adapter'
+
+# Extend JDBC's PostgreSQLAdapter implementation for compatibility with
+# ActiveRecord's default PostgreSQLAdapter.
+class ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+  # Add `query` method for compatibility
+  def query(*args)
+    select_rows(*args)
+  end
+
+  # Backport from master, so PostGIS adapater will work with current stable
+  # activerecord-jdbc-adapter gem.
+  #
+  # https://github.com/jruby/activerecord-jdbc-adapter/pull/200
+  unless method_defined?(:schema_search_path=)
+    def schema_search_path=(schema_csv)
+      if schema_csv
+        execute "SET search_path TO #{schema_csv}"
+        @schema_search_path = schema_csv
+      end
+    end
+  end
+
+  # Backport from master, so PostGIS adapater will work with current stable
+  # activerecord-jdbc-adapter gem.
+  #
+  # https://github.com/jruby/activerecord-jdbc-adapter/pull/200
+  unless method_defined?(:schema_search_path)
+    # Returns the active schema search path.
+    def schema_search_path
+      @schema_search_path ||= exec_query('SHOW search_path', 'SCHEMA')[0]['search_path']
+    end
+  end
+
+  # For ActiveRecord 3.1 compatibility: Add the "postgis" adapter to the
+  # matcher of jdbc-like adapters.
+  def self.visitor_for(pool)
+    config = pool.spec.config
+    adapter = config[:adapter]
+    adapter_spec = config[:adapter_spec] || self
+    if adapter =~ /^(jdbc|jndi|postgis)$/
+      adapter_spec.arel2_visitors(config).values.first.new(pool)
+    else
+      adapter_spec.arel2_visitors(config)[adapter].new(pool)
+    end
+  end
+end
+
+class ::ActiveRecord::Base
+  # ActiveRecord looks for the postgis_connection factory method in
+  # this class.
+  #
+  # Based on the default `postgresql_connection` definition from
+  # activerecord-jdbc-adapter's:
+  # lib/arjdbc/postgresql/connection_methods.rb
+  def self.postgis_connection(config)
+    require "arjdbc/postgresql"
+    config[:host] ||= "localhost"
+    config[:port] ||= 5432
+    config[:url] ||= "jdbc:postgresql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
+    config[:url] << config[:pg_params] if config[:pg_params]
+    config[:driver] ||= "org.postgresql.Driver"
+    config[:adapter_class] = ::ActiveRecord::ConnectionAdapters::PostGISAdapter::MainAdapter
+    config[:adapter_spec] = ::ArJdbc::PostgreSQL
+    conn = jdbc_connection(config)
+    conn.execute("SET SEARCH_PATH TO #{config[:schema_search_path]}") if config[:schema_search_path]
+    conn
+  end
+end

data/lib/active_record/connection_adapters/postgis_adapter/main_adapter.rb

@@ -121,6 +121,15 @@ module ActiveRecord
           table_name_ = table_name_.to_s
           spatial_info_ = spatial_column_info(table_name_)
           column_definitions(table_name_).collect do |col_name_, type_, default_, notnull_|
+            # JDBC support: JDBC adapter returns a hash for column definitions,
+            # instead of an array of values.
+            if col_name_.kind_of?(::Hash)
+              notnull_ = col_name_["column_not_null"]
+              default_ = col_name_["column_default"]
+              type_ = col_name_["column_type"]
+              col_name_ = col_name_["column_name"]
+            end
+
             SpatialColumn.new(@rgeo_factory_settings, table_name_, col_name_, default_, type_,
               notnull_ == 'f', type_ =~ /geometry/i ? spatial_info_[col_name_] : nil)
           end
@@ -157,7 +166,7 @@ module ActiveRecord
             oid_ = row_[3]
             indtype_ = row_[4]
 
-            columns_ = query(<<-SQL, "Columns for index #{row_[0]} on #{table_name_}").inject({}){ |h_, r_| h_[r_[0]] = [r_[1], r_[2]]; h_ }
+            columns_ = query(<<-SQL, "Columns for index #{row_[0]} on #{table_name_}").inject({}){ |h_, r_| h_[r_[0].to_s] = [r_[1], r_[2]]; h_ }
               SELECT a.attnum, a.attname, t.typname
                 FROM pg_attribute a, pg_type t
               WHERE a.attrelid = #{oid_}

data/lib/active_record/connection_adapters/postgis_adapter/pg_connection.rb

@@ -0,0 +1,28 @@
+require 'active_record/connection_adapters/postgresql_adapter'
+require 'pg'
+
+class ::ActiveRecord::Base
+  # ActiveRecord looks for the postgis_connection factory method in
+  # this class.
+  #
+  # Based on the default `postgresql_connection` definition from
+  # activerecord's:
+  # lib/active_record/connection_adapters/postgresql_adapter.rb
+  def self.postgis_connection(config_)
+    config_ = config_.symbolize_keys
+    host_ = config_[:host]
+    port_ = config_[:port] || 5432
+    username_ = config_[:username].to_s if config_[:username]
+    password_ = config_[:password].to_s if config_[:password]
+
+    if config_.key?(:database)
+      database_ = config_[:database]
+    else
+      raise ::ArgumentError, "No database specified. Missing argument: database."
+    end
+
+    # The postgres drivers don't allow the creation of an unconnected PGconn object,
+    # so just pass a nil connection object for the time being.
+    ::ActiveRecord::ConnectionAdapters::PostGISAdapter::MainAdapter.new(nil, logger, [host_, port_, nil, nil, database_, username_, password_], config_)
+  end
+end

data/lib/active_record/connection_adapters/postgis_adapter/spatial_column.rb

@@ -165,11 +165,11 @@ module ActiveRecord
           else
             constraints_ = nil
           end
-          case input_
-          when ::RGeo::Feature::Geometry
+          if ::RGeo::Feature::Geometry === input_
             factory_ = factory_settings_.get_column_factory(table_name_, column_, constraints_)
             ::RGeo::Feature.cast(input_, factory_) rescue nil
-          when ::String
+          elsif input_.respond_to?(:to_str)
+            input_ = input_.to_str
             if input_.length == 0
               nil
             else

data/test/tc_basic.rb

@@ -45,6 +45,7 @@ module RGeo
         class TestBasic < ::Test::Unit::TestCase  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
+          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
           include AdapterTestHelper
 
           define_test_methods do
@@ -170,7 +171,8 @@ module RGeo
             end
 
 
-            def test_save_and_load_no_constraints
+            # no_constraints no longer supported in PostGIS 2.0
+            def _test_save_and_load_no_constraints
               klass_ = populate_ar_class(:no_constraints)
               factory1_ = ::RGeo::Cartesian.preferred_factory(:srid => 3785)
               factory2_ = ::RGeo::Cartesian.preferred_factory(:srid => 2000)
@@ -198,6 +200,15 @@ module RGeo
             end
 
 
+            def test_custom_column
+              klass_ = populate_ar_class(:mercator_point)
+              rec_ = klass_.new
+              rec_.latlon = 'POINT(0 0)'
+              rec_.save
+              assert_not_nil(klass_.select("CURRENT_TIMESTAMP as ts").first.ts)
+            end
+
+
           end
 
         end

data/test/tc_ddl.rb

@@ -45,6 +45,7 @@ module RGeo
         class TestDDL < ::Test::Unit::TestCase  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
+          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
           include AdapterTestHelper
 
           define_test_methods do
@@ -60,14 +61,15 @@ module RGeo
               assert_equal(::RGeo::Feature::Geometry, col_.geometric_type)
               assert_equal(true, col_.has_spatial_constraints?)
               assert_equal(false, col_.geographic?)
-              assert_equal(-1, col_.srid)
+              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, col_.srid)
               assert(klass_.cached_attributes.include?('latlon'))
               klass_.connection.drop_table(:spatial_test)
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
 
-            def test_create_no_constraints_geometry
+            # no_constraints no longer supported in PostGIS 2.0
+            def _test_create_no_constraints_geometry
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
                 t_.column 'geom', :geometry, :limit => {:no_constraints => true}
@@ -133,7 +135,7 @@ module RGeo
               assert_equal(2, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(-1, cols_[-3].srid)
+              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-3].srid)
               assert_equal(true, cols_[-3].has_spatial_constraints?)
               assert_equal(::RGeo::Feature::Point, cols_[-2].geometric_type)
               assert_equal(4326, cols_[-2].srid)
@@ -144,7 +146,8 @@ module RGeo
             end
 
 
-            def test_add_no_constraints_geometry_column
+            # no_constraints no longer supported in PostGIS 2.0
+            def _test_add_no_constraints_geometry_column
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
                 t_.column('latlon', :geometry)
@@ -156,7 +159,7 @@ module RGeo
               assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(-1, cols_[-3].srid)
+              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-3].srid)
               assert_equal(true, cols_[-3].has_spatial_constraints?)
               assert_equal(::RGeo::Feature::Geometry, cols_[-2].geometric_type)
               assert_nil(cols_[-2].srid)
@@ -179,7 +182,7 @@ module RGeo
               assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(-1, cols_[-3].srid)
+              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-3].srid)
               assert_equal(true, cols_[-3].has_spatial_constraints?)
               assert_equal(::RGeo::Feature::Point, cols_[-2].geometric_type)
               assert_equal(4326, cols_[-2].srid)
@@ -203,7 +206,7 @@ module RGeo
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-1].geometric_type)
               assert_equal('latlon', cols_[-1].name)
-              assert_equal(-1, cols_[-1].srid)
+              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-1].srid)
               assert_equal(false, cols_[-1].geographic?)
             end
 
@@ -238,14 +241,15 @@ module RGeo
               col_ = klass_.columns.last
               assert_equal(::RGeo::Feature::Geometry, col_.geometric_type)
               assert_equal(false, col_.geographic?)
-              assert_equal(-1, col_.srid)
+              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, col_.srid)
               assert(klass_.cached_attributes.include?('latlon'))
               klass_.connection.drop_table(:spatial_test)
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
 
-            def test_create_no_constraints_geometry_using_shortcut
+            # no_constraints no longer supported in PostGIS 2.0
+            def _test_create_no_constraints_geometry_using_shortcut
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
                 t_.spatial 'geom', :no_constraints => true

data/test/tc_nested_class.rb

@@ -0,0 +1,83 @@
+# -----------------------------------------------------------------------------
+#
+# Tests for the PostGIS ActiveRecord adapter
+#
+# -----------------------------------------------------------------------------
+# Copyright 2010-2012 Daniel Azuma
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+require 'test/unit'
+require 'rgeo/active_record/adapter_test_helper'
+
+
+module RGeo
+  module ActiveRecord  # :nodoc:
+    module PostGISAdapter  # :nodoc:
+      module Tests  # :nodoc:
+
+        class TestNestedClass < ::Test::Unit::TestCase  # :nodoc:
+
+          DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
+          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
+          include AdapterTestHelper
+
+
+          module Foo
+            def self.table_name_prefix
+              'foo_'
+            end
+            class Bar < ::ActiveRecord::Base
+            end
+          end
+
+
+          define_test_methods do
+
+
+            def test_nested_model
+              Foo::Bar.class_eval do
+                establish_connection(TestNestedClass::DATABASE_CONFIG)
+              end
+              Foo::Bar.connection.create_table(:foo_bars) do |t_|
+                t_.column 'latlon', :point, :srid => 3785
+              end
+              Foo::Bar.all
+              Foo::Bar.connection.drop_table(:foo_bars)
+            end
+
+
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/test/tc_spatial_queries.rb

@@ -45,6 +45,7 @@ module RGeo
         class TestSpatialQueries < ::Test::Unit::TestCase  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
+          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
           include AdapterTestHelper
 
           define_test_methods do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,55 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :runtime
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
 description: This is an ActiveRecord connection adapter for PostGIS. It is based on
   the stock PostgreSQL adapter, but provides built-in support for the spatial extensions
   provided by PostGIS. It uses the RGeo library to represent spatial data in Ruby.
@@ -54,7 +86,9 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - lib/active_record/connection_adapters/postgis_adapter/arel_tosql.rb
+- lib/active_record/connection_adapters/postgis_adapter/jdbc_connection.rb
 - lib/active_record/connection_adapters/postgis_adapter/main_adapter.rb
+- lib/active_record/connection_adapters/postgis_adapter/pg_connection.rb
 - lib/active_record/connection_adapters/postgis_adapter/railtie.rb
 - lib/active_record/connection_adapters/postgis_adapter/spatial_column.rb
 - lib/active_record/connection_adapters/postgis_adapter/spatial_table_definition.rb
@@ -64,11 +98,12 @@ files:
 - lib/active_record/connection_adapters/postgis_adapter/databases.rake
 - test/tc_basic.rb
 - test/tc_ddl.rb
+- test/tc_nested_class.rb
 - test/tc_spatial_queries.rb
 - History.rdoc
 - README.rdoc
 - Version
-homepage: http://virtuoso.rubyforge.org/activerecord-postgis-adapter
+homepage: http://dazuma.github.com/activerecord-postgis-adapter
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -88,11 +123,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord adapter for PostGIS, based on RGeo.
 test_files:
 - test/tc_basic.rb
 - test/tc_ddl.rb
+- test/tc_nested_class.rb
 - test/tc_spatial_queries.rb