activerecord-postgis-adapter 0.5.1 → 0.6.0

data/test/tc_tasks.rb

@@ -0,0 +1,110 @@
+# -----------------------------------------------------------------------------
+#
+# 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 'minitest/autorun'
+require 'rgeo/active_record/adapter_test_helper'
+
+
+module RGeo
+  module ActiveRecord  # :nodoc:
+    module PostGISAdapter  # :nodoc:
+      module Tests  # :nodoc:
+
+        class TestTasks < ::MiniTest::Unit::TestCase  # :nodoc:
+
+          DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
+          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
+
+          class << self
+            def before_open_database(args_)
+              @new_database_config = args_[:config].merge('database' => 'postgis_adapter_test2')
+              @new_database_config.stringify_keys!
+            end
+            attr_reader :new_database_config
+          end
+
+          include AdapterTestHelper
+
+
+          def cleanup_tables
+            ::ActiveRecord::Base.remove_connection
+            ::ActiveRecord::Base.clear_active_connections!
+            TestTasks::DEFAULT_AR_CLASS.connection.execute("DROP DATABASE IF EXISTS \"postgis_adapter_test2\"")
+          end
+
+
+          define_test_methods do
+
+
+            def test_create_database_from_extension_in_postgis_schema
+              unless defined?(::ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks)
+                skip('No task tests for Rails 3')
+              end
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              ::ActiveRecord::Base.connection.select_values("SELECT * from postgis.spatial_ref_sys")
+            end
+
+
+            def test_create_database_from_extension_in_public_schema
+              unless defined?(::ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks)
+                skip('No task tests for Rails 3')
+              end
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config)
+              ::ActiveRecord::Base.connection.select_values("SELECT * from public.spatial_ref_sys")
+            end
+
+
+            def test_schema_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::Tasks::DatabaseTasks.structure_dump(TestTasks.new_database_config, filename_)
+              sql_ = ::File.read(filename_)
+              assert(sql_ !~ /CREATE/)
+            end
+
+
+          end
+
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-03-01 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.6
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,9 +26,9 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -82,24 +82,36 @@ email: dazuma@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- Documentation.rdoc
 - History.rdoc
 - 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/rails3/create_connection.rb
+- lib/active_record/connection_adapters/postgis_adapter/rails3/main_adapter.rb
+- lib/active_record/connection_adapters/postgis_adapter/rails3/spatial_column.rb
+- lib/active_record/connection_adapters/postgis_adapter/rails3/spatial_table_definition.rb
+- lib/active_record/connection_adapters/postgis_adapter/rails4/create_connection.rb
+- lib/active_record/connection_adapters/postgis_adapter/rails4/main_adapter.rb
+- lib/active_record/connection_adapters/postgis_adapter/rails4/postgis_database_tasks.rb
+- lib/active_record/connection_adapters/postgis_adapter/rails4/spatial_column.rb
+- 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/spatial_column.rb
-- lib/active_record/connection_adapters/postgis_adapter/spatial_table_definition.rb
-- lib/active_record/connection_adapters/postgis_adapter/version.rb
+- lib/active_record/connection_adapters/postgis_adapter/shared/arel_tosql.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
+- lib/active_record/connection_adapters/postgis_adapter/shared/version.rb
 - lib/active_record/connection_adapters/postgis_adapter.rb
+- lib/activerecord-postgis-adapter.rb
 - lib/rgeo/active_record/postgis_adapter/railtie.rb
-- lib/active_record/connection_adapters/postgis_adapter/databases.rake
+- lib/active_record/connection_adapters/postgis_adapter/rails3/databases.rake
+- lib/active_record/connection_adapters/postgis_adapter/rails4/databases.rake
 - test/tc_basic.rb
 - test/tc_ddl.rb
 - test/tc_nested_class.rb
 - test/tc_spatial_queries.rb
+- test/tc_tasks.rb
+- Documentation.rdoc
 - History.rdoc
 - README.rdoc
 - Version
@@ -132,3 +144,4 @@ test_files:
 - test/tc_ddl.rb
 - test/tc_nested_class.rb
 - test/tc_spatial_queries.rb
+- test/tc_tasks.rb

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

@@ -1,78 +0,0 @@
-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
-  class << self
-    # 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 postgis_connection(config)
-      begin
-        require 'jdbc/postgres'
-        ::Jdbc::Postgres.load_driver(:require) if defined?(::Jdbc::Postgres.load_driver)
-      rescue LoadError # assuming driver.jar is on the class-path
-      end
-      require "arjdbc/postgresql"
-      config[:username] ||= ::Java::JavaLang::System.get_property("user.name")
-      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] ||= defined?(::Jdbc::Postgres.driver_name) ? ::Jdbc::Postgres.driver_name : '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
-    alias_method :jdbcpostgis_connection, :postgis_connection
-  end
-end

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

@@ -1,27 +0,0 @@
-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