activerecord-postgis-adapter 0.6.2 → 0.6.3

data/Documentation.rdoc

@@ -12,7 +12,7 @@ This document is part of the distribution for the activerecord-postgis-adapter g
 
 === General Installation Considerations
 
-Generally, we recommend starting with the latest versions of Ruby, Rails, PostgreSQL, and PostGIS. As of this writing, those are Ruby 1.9.3, Rails 3.2, PostgreSQL 9.2, and PostGIS 2.0. If you cannot upgrade, the minimum supported configuration is the following:
+Generally, we recommend starting with the latest versions of Ruby, Rails, PostgreSQL, and PostGIS. As of this writing, those are Ruby 2.0.0, Rails 3.2, PostgreSQL 9.2, and PostGIS 2.0. If you cannot upgrade, the minimum supported configuration is the following:
 
 * Ruby 1.8.7
 * Rails 3.0.3
@@ -21,10 +21,10 @@ Generally, we recommend starting with the latest versions of Ruby, Rails, Postgr
 
 However, older software versions can make for a more involved setup process, so we recommend using the latest available if possible.
 
-As of this writing, Rails 4.0.0 beta 1 has just been released. This version of activerecord-postgis-adapter does support Rails 4, but because the software is still beta, the usual caveats apply.
+As of this writing, Rails 4.0.0 release candidate 1 has just been released. This version of activerecord-postgis-adapter does support Rails 4, but because the software is still pre-release, the usual caveats apply. If you are running Rails 4, you must be on the release candidate or later; the beta 1 release is not supported.
+
+JRuby and the JDBC Postgres Adapter is supported. But, as of this writing, the JDBC adapters themselves are not yet compatible with Rails 4.
 
-JRuby and the JDBC Postgres Adapter is supported. (But, as of this writing, the JDBC adapters themselves are not yet compatible with Rails 4.)
-  
 === Creating a Spatial Rails App
 
 This section covers starting a new Rails application from scratch. If you need to add geospatial capabilities to an existing Rails application (i.e. you need to convert a non-spatial database to a spatial database), see the section on "Upgrading a Database With Spatial Features" below.

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 0.6.3 / 2013-05-04
+
+* Several fixes for compatibility with changes to Rails 4.0.0 rc1. (Reports by slbug and Victor Costan)
+* Rails 3 rake tasks properly set PGUSER when appropriate. (Pull request by Mitin Pavel)
+* Fixed a nil exception on some Rails 4 migrations. (Pull request by ivanfoong and Victor Costan)
+
 === 0.6.2 / 2013-03-08
 
 * The PostGIS setup now properly connects as the superuser. (Reported by Adam Trilling)

data/Version

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -66,6 +66,7 @@ require 'rgeo/active_record'
 case ::ActiveRecord::VERSION::MAJOR
 when 3
   require 'active_record/connection_adapters/postgis_adapter/shared/version.rb'
+  require 'active_record/connection_adapters/postgis_adapter/shared/common_adapter_methods.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails3/main_adapter.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails3/spatial_table_definition.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails3/spatial_column.rb'
@@ -74,6 +75,7 @@ when 3
   require 'active_record/connection_adapters/postgis_adapter/rails3/create_connection'
 when 4
   require 'active_record/connection_adapters/postgis_adapter/shared/version.rb'
+  require 'active_record/connection_adapters/postgis_adapter/shared/common_adapter_methods.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails4/main_adapter.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails4/spatial_table_definition.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails4/spatial_column.rb'

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

@@ -175,6 +175,14 @@ def drop_database(config_)
 end
 
 
+def set_psql_env(config_)
+  ::ENV['PGHOST'] = config_["host"] if config_["host"]
+  ::ENV['PGPORT'] = config_["port"].to_s if config_["port"]
+  ::ENV['PGPASSWORD'] = config_["password"].to_s if config_["password"]
+  ::ENV['PGUSER'] = config_["username"].to_s if config_["username"]
+end
+
+
 ::RGeo::ActiveRecord::TaskHacker.modify('db:charset', nil, 'postgis') do |config_|
   ::ActiveRecord::Base.establish_connection(config_)
   puts(::ActiveRecord::Base.connection.encoding)
@@ -182,9 +190,7 @@ end
 
 
 ::RGeo::ActiveRecord::TaskHacker.modify('db:structure:dump', nil, 'postgis') do |config_|
-  ::ENV['PGHOST'] = config_["host"] if config_["host"]
-  ::ENV['PGPORT'] = config_["port"].to_s if config_["port"]
-  ::ENV['PGPASSWORD'] = config_["password"].to_s if config_["password"]
+  set_psql_env(config_)
   filename_ = ::File.join(::Rails.root, "db/#{::Rails.env}_structure.sql")
   search_path_ = config_["schema_search_path"].to_s.strip
   search_path_ = search_path_.split(",").map{ |sp_| sp_.strip }
@@ -197,18 +203,14 @@ end
 
 
 ::RGeo::ActiveRecord::TaskHacker.modify('db:structure:load', nil, 'postgis') do |config_|
-  ::ENV['PGHOST'] = config_["host"] if config_["host"]
-  ::ENV['PGPORT'] = config_["port"].to_s if config_["port"]
-  ::ENV['PGPASSWORD'] = config_["password"].to_s if config_["password"]
+  set_psql_env(config_)
   filename_ = ::File.join(::Rails.root, "db/#{::Rails.env}_structure.sql")
   `psql -f #{filename_} #{config_["database"]}`
 end
 
 
 ::RGeo::ActiveRecord::TaskHacker.modify('db:test:clone_structure', 'test', 'postgis') do |config_|
-  ::ENV['PGHOST'] = config_["host"] if config_["host"]
-  ::ENV['PGPORT'] = config_["port"].to_s if config_["port"]
-  ::ENV['PGPASSWORD'] = config_["password"].to_s if config_["password"]
+  set_psql_env(config_)
   `psql -U "#{config_["username"]}" -f #{::Rails.root}/db/#{::Rails.env}_structure.sql #{config_["database"]}`
 end
 

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

@@ -44,13 +44,6 @@ module ActiveRecord  # :nodoc:
       class MainAdapter < PostgreSQLAdapter  # :nodoc:
 
 
-        SPATIAL_COLUMN_CONSTRUCTORS = ::RGeo::ActiveRecord::DEFAULT_SPATIAL_COLUMN_CONSTRUCTORS.merge(
-          :geography => {:type => 'geometry', :geographic => true}
-        )
-
-        @@native_database_types = nil
-
-
         def initialize(*args_)
           super
           # Rails 3.2 way of defining the visitor: do so in the constructor
@@ -60,59 +53,16 @@ module ActiveRecord  # :nodoc:
         end
 
 
-        def set_rgeo_factory_settings(factory_settings_)
-          @rgeo_factory_settings = factory_settings_
-        end
-
-
-        def adapter_name
-          PostGISAdapter::ADAPTER_NAME
-        end
+        include PostGISAdapter::CommonAdapterMethods
 
 
-        def spatial_column_constructor(name_)
-          SPATIAL_COLUMN_CONSTRUCTORS[name_]
-        end
-
+        @@native_database_types = nil
 
         def native_database_types
           @@native_database_types ||= super.merge(:spatial => {:name => 'geometry'})
         end
 
 
-        def postgis_lib_version
-          unless defined?(@postgis_lib_version)
-            @postgis_lib_version = select_value("SELECT PostGIS_Lib_Version()") rescue nil
-          end
-          @postgis_lib_version
-        end
-
-
-        def srs_database_columns
-          {:srtext_column => 'srtext', :proj4text_column => 'proj4text', :auth_name_column => 'auth_name', :auth_srid_column => 'auth_srid'}
-        end
-
-
-        def quote(value_, column_=nil)
-          if ::RGeo::Feature::Geometry.check_type(value_)
-            "'#{::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)}'"
-          elsif value_.is_a?(::RGeo::Cartesian::BoundingBox)
-            "'#{value_.min_x},#{value_.min_y},#{value_.max_x},#{value_.max_y}'::box"
-          else
-            super
-          end
-        end
-
-
-        def type_cast(value_, column_)
-          if ::RGeo::Feature::Geometry.check_type(value_)
-            ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)
-          else
-            super
-          end
-        end
-
-
         def columns(table_name_, name_=nil)
           # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
           # We needed to return a spatial column subclass.

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

@@ -44,75 +44,23 @@ module ActiveRecord  # :nodoc:
       class MainAdapter < PostgreSQLAdapter  # :nodoc:
 
 
-        SPATIAL_COLUMN_CONSTRUCTORS = ::RGeo::ActiveRecord::DEFAULT_SPATIAL_COLUMN_CONSTRUCTORS.merge(
-          :geography => {:type => 'geometry', :geographic => true}
-        )
-
-        @@native_database_types = nil
-
-
-        # Overridden to change the visitor
-
         def initialize(*args_)
+          # Overridden to change the visitor
           super
           @visitor = ::Arel::Visitors::PostGIS.new(self)
         end
 
 
-        def set_rgeo_factory_settings(factory_settings_)
-          @rgeo_factory_settings = factory_settings_
-        end
-
-
-        def adapter_name
-          PostGISAdapter::ADAPTER_NAME
-        end
-
-
-        def spatial_column_constructor(name_)
-          SPATIAL_COLUMN_CONSTRUCTORS[name_]
-        end
+        include PostGISAdapter::CommonAdapterMethods
 
 
-        # Overridden to add the :spatial type
+        @@native_database_types = nil
 
         def native_database_types
-          @@native_database_types ||= super.merge(:spatial => {:name => 'geometry'})
-        end
-
-
-        def postgis_lib_version
-          unless defined?(@postgis_lib_version)
-            @postgis_lib_version = select_value("SELECT PostGIS_Lib_Version()") rescue nil
-          end
-          @postgis_lib_version
-        end
-
-
-        def srs_database_columns
-          {:srtext_column => 'srtext', :proj4text_column => 'proj4text', :auth_name_column => 'auth_name', :auth_srid_column => 'auth_srid'}
-        end
-
-
-        def quote(value_, column_=nil)
-          # Overridden to recognize geometry types
-          if ::RGeo::Feature::Geometry.check_type(value_)
-            "'#{::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)}'"
-          elsif value_.is_a?(::RGeo::Cartesian::BoundingBox)
-            "'#{value_.min_x},#{value_.min_y},#{value_.max_x},#{value_.max_y}'::box"
-          else
-            super
-          end
-        end
-
-
-        def type_cast(value_, column_, array_member_=false)
-          # Overridden to recognize geometry types
-          if ::RGeo::Feature::Geometry.check_type(value_)
-            ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)
-          else
-            super
-          end
+          # Overridden to add the :spatial type
+          @@native_database_types ||= super.merge(
+            :spatial => {:name => 'geometry'},
+            :geography => {:name => 'geography'})
         end
 
 
@@ -187,9 +135,9 @@ module ActiveRecord  # :nodoc:
         end
 
 
-        def table_definition
-          # Override to create a spatial table definition
-          SpatialTableDefinition.new(self)
+        def create_table_definition(name_, temporary_, options_)
+          # Override to create a spatial table definition (post-4.0.0.beta1)
+          PostGISAdapter::TableDefinition.new(native_database_types, name_, temporary_, options_, self)
         end
 
 
@@ -273,6 +221,7 @@ module ActiveRecord  # :nodoc:
         def add_index(table_name_, column_name_, options_={})
           # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
           # We have to fully-replace because of the gist_clause.
+          options_ ||= {}
           gist_clause_ = options_.delete(:spatial) ? ' USING GIST' : ''
           index_name_, index_type_, index_columns_, index_options_ = add_index_options(table_name_, column_name_, options_)
           execute "CREATE #{index_type_} INDEX #{quote_column_name(index_name_)} ON #{quote_table_name(table_name_)}#{gist_clause_} (#{index_columns_})#{index_options_}"

data/lib/active_record/connection_adapters/postgis_adapter/rails4/postgis_database_tasks.rb

@@ -60,7 +60,7 @@ module ActiveRecord  # :nodoc:
           if has_su? && (script_dir || extension_names)
             setup_gis_grant_privileges
           end
-          establish_connection(configuration) if has_su?
+          establish_connection(configuration)
         end
 
 

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

@@ -82,7 +82,7 @@ module ActiveRecord  # :nodoc:
             @geometric_type = @has_z = @has_m = @srid = nil
           end
           super(name_, default_, oid_type_, sql_type_, null_)
-          if type == :spatial
+          if spatial?
             if @srid
               @limit = {:srid => @srid, :type => @geometric_type.type_name.underscore}
               @limit[:has_z] = true if @has_z
@@ -107,7 +107,7 @@ module ActiveRecord  # :nodoc:
 
 
         def spatial?
-          type == :spatial
+          type == :spatial || type == :geography
         end
 
 
@@ -117,12 +117,12 @@ module ActiveRecord  # :nodoc:
 
 
         def klass
-          type == :spatial ? ::RGeo::Feature::Geometry : super
+          spatial? ? ::RGeo::Feature::Geometry : super
         end
 
 
         def type_cast(value_)
-          if type == :spatial
+          if spatial?
             SpatialColumn.convert_to_geometry(value_, @factory_settings, @table_name, name,
               @geographic, @srid, @has_z, @has_m)
           else

data/lib/active_record/connection_adapters/postgis_adapter/rails4/spatial_table_definition.rb

@@ -41,7 +41,13 @@ module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
 
 
-      class SpatialTableDefinition < ConnectionAdapters::PostgreSQLAdapter::TableDefinition  # :nodoc:
+      class TableDefinition < ConnectionAdapters::PostgreSQLAdapter::TableDefinition  # :nodoc:
+
+        def initialize(types_, name_, temporary_, options_, base_)
+          @base = base_
+          @spatial_columns_hash = {}
+          super(types_, name_, temporary_, options_)
+        end
 
         def column(name_, type_, options_={})
           if (info_ = @base.spatial_column_constructor(type_.to_sym))
@@ -56,32 +62,50 @@ module ActiveRecord  # :nodoc:
               type_ = :spatial
             end
           end
-          super(name_, type_, options_)
           if type_ == :spatial
-            col_ = self[name_]
-            col_.extend(SpatialColumnDefinitionMethods) unless col_.respond_to?(:geographic?)
-            options_.merge!(col_.limit) if col_.limit.is_a?(::Hash)
+            if (limit_ = options_.delete(:limit))
+              options_.merge!(limit_) if limit_.is_a?(::Hash)
+            end
+            if options_[:geographic]
+              type_ = :geography
+              spatial_type_ = (options_[:type] || 'geometry').to_s.upcase.gsub('_', '')
+              spatial_type_ << 'Z' if options_[:has_z]
+              spatial_type_ << 'M' if options_[:has_m]
+              options_[:limit] = "#{spatial_type_},#{options_[:srid] || 4326}"
+            end
+            name_ = name_.to_s
+            if primary_key_column_name == name_
+              raise ArgumentError, "you can't redefine the primary key column '#{name_}'. To define a custom primary key, pass { id: false } to create_table."
+            end
+            col_ = new_column_definition(name_, type_, options_)
             col_.set_spatial_type(options_[:type])
             col_.set_geographic(options_[:geographic])
             col_.set_srid(options_[:srid])
             col_.set_has_z(options_[:has_z])
             col_.set_has_m(options_[:has_m])
+            (col_.geographic? ? @columns_hash : @spatial_columns_hash)[name_] = col_
+          else
+            super(name_, type_, options_)
           end
           self
         end
 
-        def to_sql
-          @columns.find_all{ |c_| !c_.respond_to?(:geographic?) || c_.geographic? }.map{ |c_| c_.to_sql } * ', '
+        def create_column_definition(name_, type_)
+          if type_ == :spatial || type_ == :geography
+            PostGISAdapter::ColumnDefinition.new(name_, type_)
+          else
+            super
+          end
         end
 
         def non_geographic_spatial_columns
-          @columns.find_all{ |c_| c_.respond_to?(:geographic?) && !c_.geographic? }
+          @spatial_columns_hash.values
         end
 
       end
 
 
-      module SpatialColumnDefinitionMethods  # :nodoc:
+      class ColumnDefinition < ConnectionAdapters::ColumnDefinition  # :nodoc:
 
         def spatial_type
           @spatial_type
@@ -123,13 +147,6 @@ module ActiveRecord  # :nodoc:
           @has_m = value_ ? true : false
         end
 
-        def sql_type
-          type_ = spatial_type.upcase.gsub('_', '')
-          type_ << 'Z' if has_z?
-          type_ << 'M' if has_m?
-          "GEOGRAPHY(#{type_},#{srid})"
-        end
-
       end
 
 

data/lib/active_record/connection_adapters/postgis_adapter/shared/common_adapter_methods.rb

@@ -0,0 +1,122 @@
+# -----------------------------------------------------------------------------
+#
+# PostGIS adapter for ActiveRecord
+#
+# -----------------------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------------------
+;
+
+
+module ActiveRecord  # :nodoc:
+
+  module ConnectionAdapters  # :nodoc:
+
+    module PostGISAdapter  # :nodoc:
+
+
+      SPATIAL_COLUMN_CONSTRUCTORS = ::RGeo::ActiveRecord::DEFAULT_SPATIAL_COLUMN_CONSTRUCTORS.merge(
+        :geography => {:type => 'geometry', :geographic => true}
+      )
+
+
+      module CommonAdapterMethods  # :nodoc:
+
+
+        def set_rgeo_factory_settings(factory_settings_)
+          @rgeo_factory_settings = factory_settings_
+        end
+
+
+        def adapter_name
+          PostGISAdapter::ADAPTER_NAME
+        end
+
+
+        def spatial_column_constructor(name_)
+          PostGISAdapter::SPATIAL_COLUMN_CONSTRUCTORS[name_]
+        end
+
+
+        def postgis_lib_version
+          unless defined?(@postgis_lib_version)
+            @postgis_lib_version = select_value("SELECT PostGIS_Lib_Version()") rescue nil
+          end
+          @postgis_lib_version
+        end
+
+
+        def default_srid
+          unless defined?(@default_srid)
+            case postgis_lib_version
+            when nil
+              @default_srid = nil
+            when /^1/
+              @default_srid = -1
+            else
+              @default_srid = 0
+            end
+          end
+          @default_srid
+        end
+
+
+        def srs_database_columns
+          {:srtext_column => 'srtext', :proj4text_column => 'proj4text', :auth_name_column => 'auth_name', :auth_srid_column => 'auth_srid'}
+        end
+
+
+        def quote(value_, column_=nil)
+          if ::RGeo::Feature::Geometry.check_type(value_)
+            "'#{::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)}'"
+          elsif value_.is_a?(::RGeo::Cartesian::BoundingBox)
+            "'#{value_.min_x},#{value_.min_y},#{value_.max_x},#{value_.max_y}'::box"
+          else
+            super
+          end
+        end
+
+
+        def type_cast(value_, column_)
+          if ::RGeo::Feature::Geometry.check_type(value_)
+            ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)
+          else
+            super
+          end
+        end
+
+
+      end
+
+
+    end
+
+  end
+
+end

data/test/tc_tasks.rb

@@ -86,7 +86,7 @@ module RGeo
             end
 
 
-            def test_schema_dump
+            def test_empty_sql_dump
               unless defined?(::ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks)
                 skip('No task tests for Rails 3')
               end
@@ -100,6 +100,86 @@ module RGeo
             end
 
 
+            def test_basic_geography_sql_dump
+              unless defined?(::ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks)
+                skip('No task tests for Rails 3')
+              end
+              filename_ = ::File.expand_path('../tmp/tmp.sql', ::File.dirname(__FILE__))
+              ::FileUtils.rm_f(filename_)
+              ::FileUtils.mkdir_p(::File.dirname(filename_))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              ::ActiveRecord::Base.connection.create_table(:spatial_test) do |t_|
+                t_.point "latlon", :geographic => true
+              end
+              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TestTasks.new_database_config, filename_)
+              data_ = ::File.read(filename_)
+              assert(data_.index('latlon postgis.geography(Point,4326)'))
+            end
+
+
+            def test_empty_schema_dump
+              unless defined?(::ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks)
+                skip('No task tests for Rails 3')
+              end
+              filename_ = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
+              ::FileUtils.rm_f(filename_)
+              ::FileUtils.mkdir_p(::File.dirname(filename_))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              require 'active_record/schema_dumper'
+              ::File.open(filename_, "w:utf-8") do |file_|
+                ::ActiveRecord::SchemaDumper.dump(::ActiveRecord::Base.connection, file_)
+              end
+              data_ = ::File.read(filename_)
+              assert(data_.index('ActiveRecord::Schema'))
+            end
+
+
+            def test_basic_geometry_schema_dump
+              unless defined?(::ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks)
+                skip('No task tests for Rails 3')
+              end
+              filename_ = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
+              ::FileUtils.rm_f(filename_)
+              ::FileUtils.mkdir_p(::File.dirname(filename_))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              conn_ = ::ActiveRecord::Base.connection
+              conn_.create_table(:spatial_test) do |t_|
+                t_.geometry 'object1'
+                t_.spatial "object2", :limit => {:srid=>conn_.default_srid, :type=>"geometry"}
+              end
+              require 'active_record/schema_dumper'
+              ::File.open(filename_, "w:utf-8") do |file_|
+                ::ActiveRecord::SchemaDumper.dump(conn_, file_)
+              end
+              data_ = ::File.read(filename_)
+              assert(data_.index("t.spatial \"object1\", limit: {:srid=>#{conn_.default_srid}, :type=>\"geometry\"}"))
+              assert(data_.index("t.spatial \"object2\", limit: {:srid=>#{conn_.default_srid}, :type=>\"geometry\"}"))
+            end
+
+
+            def test_basic_geography_schema_dump
+              unless defined?(::ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks)
+                skip('No task tests for Rails 3')
+              end
+              filename_ = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
+              ::FileUtils.rm_f(filename_)
+              ::FileUtils.mkdir_p(::File.dirname(filename_))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              conn_ = ::ActiveRecord::Base.connection
+              conn_.create_table(:spatial_test) do |t_|
+                t_.point "latlon1", :geographic => true
+                t_.spatial "latlon2", :limit => {:srid=>4326, :type=>"point", :geographic=>true}
+              end
+              require 'active_record/schema_dumper'
+              ::File.open(filename_, "w:utf-8") do |file_|
+                ::ActiveRecord::SchemaDumper.dump(conn_, file_)
+              end
+              data_ = ::File.read(filename_)
+              assert(data_.index('t.spatial "latlon1", limit: {:srid=>4326, :type=>"point", :geographic=>true}'))
+              assert(data_.index('t.spatial "latlon2", limit: {:srid=>4326, :type=>"point", :geographic=>true}'))
+            end
+
+
           end
 
         end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
+  prerelease: 
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,43 +30,49 @@ dependencies:
 - !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: minitest
   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'
 description: This is an ActiveRecord connection adapter for PostGIS. It is based on
@@ -88,6 +97,7 @@ files:
 - lib/active_record/connection_adapters/postgis_adapter/rails4/spatial_table_definition.rb
 - lib/active_record/connection_adapters/postgis_adapter/railtie.rb
 - lib/active_record/connection_adapters/postgis_adapter/shared/arel_tosql.rb
+- lib/active_record/connection_adapters/postgis_adapter/shared/common_adapter_methods.rb
 - lib/active_record/connection_adapters/postgis_adapter/shared/jdbc_compat.rb
 - lib/active_record/connection_adapters/postgis_adapter/shared/railtie.rb
 - lib/active_record/connection_adapters/postgis_adapter/shared/setup.rb
@@ -110,26 +120,27 @@ files:
 homepage: http://dazuma.github.com/activerecord-postgis-adapter
 licenses:
 - BSD
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 2.0.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: An ActiveRecord adapter for PostGIS, based on RGeo.
 test_files:
 - test/tc_basic.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 13b719128d29998b594c6b5824d977cbd9c613fe
-  data.tar.gz: aff10c325efe668907b5cceab815f86b621679a8
-SHA512:
-  metadata.gz: 7129620feb197a400636bc4b5b563229041a03558bd6d095eca6c72c4ba12a52849919198907eeb8e65fa7c07e00fb34759afcacd528078e68ec78cba5e0f793
-  data.tar.gz: f4d7459e39bc259aaaa00d7a9eca3adfa1b36809ff017db983f7d01df366ffe9a3eb8f4e3299e931a48e6bf72e5a714c003b6fd684b2d247fb7a2e4d97170fb4