activerecord-postgis-adapter 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52208ecdfd87beec772fa39025cce50cd04c01d
-  data.tar.gz: ea574e93f4e76a74f1e7a97e5dddc892e176e179
+  metadata.gz: 76d9431bb3c7e39d5fbd758bb5a5235c5bdf2679
+  data.tar.gz: 00b2d3a6e72cd2c66b93de93a4a50f9d011fdba1
 SHA512:
-  metadata.gz: fcc4c8a0aba03cd3b9e5f0ceeec9a0c39ae3be10faa2eb571e5280ad59b6e97d83245c76cb749bd9d11a6f135e26edb60f39c6456f8f06246e3484de78e8735a
-  data.tar.gz: 1ab978f2b167f0480f971863040ba235e868e70a60cc2efe0ba74f176fd7e2339649d63c1069059e87dea9e52e5bb8f88d908e4b82d3981c1a6e22ef6f3cc653
+  metadata.gz: 96a805abbd12a4d90038b7896198c12370214881fba6ddd62cee2b062720c575b4f9479e63746fa385363484161c65070be30484cf14d208616c4c1f15aac93f
+  data.tar.gz: 64f9df06696a296d146d07323b4cd6b7c11797f756447264262d68fd992f487e9ed0a0f03e4696542356da07add81ffc4d8513ec5615fc844bf72a940c628a8c

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

@@ -2,10 +2,10 @@ module Arel  # :nodoc:
   module Visitors  # :nodoc:
     # Different super-class under JRuby JDBC adapter.
     PostGISSuperclass = if defined?(::ArJdbc::PostgreSQL::BindSubstitution)
-      ::ArJdbc::PostgreSQL::BindSubstitution
-    else
-      ::Arel::Visitors::PostgreSQL
-    end
+                          ::ArJdbc::PostgreSQL::BindSubstitution
+                        else
+                          ::Arel::Visitors::PostgreSQL
+                        end
 
     class PostGIS < PostGISSuperclass  # :nodoc:
 

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

@@ -16,10 +16,10 @@ module ActiveRecord  # :nodoc:
           establish_connection(configuration)
         end
 
-        # Overridden to set the database owner and call setup_gis
+        # Override to set the database owner and call setup_gis
         def create(master_established = false)
           establish_master_connection unless master_established
-          extra_configs = {'encoding' => encoding}
+          extra_configs = { 'encoding' => encoding }
           extra_configs['owner'] = username if has_su?
           connection.create_database(configuration['database'], configuration.merge(extra_configs))
           setup_gis
@@ -33,20 +33,22 @@ module ActiveRecord  # :nodoc:
 
         private
 
-        # Overridden to use su_username and su_password
+        # Override to use su_username and su_password
         def establish_master_connection
           establish_connection(configuration.merge(
-            'database' => 'postgres',
+            'database'           => 'postgres',
+            'password'           => su_password,
             'schema_search_path' => 'public',
-            'username' => su_username,
-            'password' => su_password))
+            'username'           => su_username,
+          ))
         end
 
         def establish_su_connection
           establish_connection(configuration.merge(
+            'password'           => su_password,
             'schema_search_path' => 'public',
-            'username' => su_username,
-            'password' => su_password))
+            'username'           => su_username,
+          ))
         end
 
         def username
@@ -80,12 +82,12 @@ module ActiveRecord  # :nodoc:
 
         def extension_names
           @extension_names ||= begin
-            ext_ = configuration['postgis_extension']
-            case ext_
+            extensions = configuration['postgis_extension']
+            case extensions
             when ::String
-              ext_.split(',')
+              extensions.split(',')
             when ::Array
-              ext_
+              extensions
             else
               ['postgis']
             end
@@ -94,9 +96,9 @@ module ActiveRecord  # :nodoc:
 
         def ensure_installation_configs
           if configuration['setup'] == 'default' && !configuration['postgis_extension']
-            share_dir_ = `pg_config --sharedir`.strip rescue '/usr/share'
-            control_file_ = ::File.expand_path('extension/postgis.control', share_dir_)
-            if ::File.readable?(control_file_)
+            share_dir = `pg_config --sharedir`.strip rescue '/usr/share'
+            control_file = ::File.expand_path('extension/postgis.control', share_dir)
+            if ::File.readable?(control_file)
               configuration['postgis_extension'] = 'postgis'
             end
           end
@@ -108,10 +110,24 @@ module ActiveRecord  # :nodoc:
               raise ::ArgumentError, "'topology' must be in schema_search_path for postgis_topology" unless search_path.include?('topology')
               connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname} SCHEMA topology")
             else
-              connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname}")
+              if (postgis_schema = configuration['postgis_schema'])
+                schema_clause = "WITH SCHEMA #{postgis_schema}"
+                unless schema_exists?(postgis_schema)
+                  connection.execute("CREATE SCHEMA #{postgis_schema}")
+                  connection.execute("GRANT ALL ON SCHEMA #{postgis_schema} TO PUBLIC")
+                end
+              else
+                schema_clause = ''
+              end
+
+              connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname} #{schema_clause}")
             end
           end
         end
+
+        def schema_exists?(schema_name)
+          connection.execute("SELECT schema_name FROM information_schema.schemata WHERE schema_name = '#{schema_name}'").any?
+        end
       end
 
       ::ActiveRecord::Tasks::DatabaseTasks.register_task(/postgis/, PostGISDatabaseTasks)

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGISAdapter
-      VERSION = '2.2.1'.freeze
+      VERSION = '2.2.2'.freeze
     end
   end
 end

data/test/tasks_test.rb

@@ -27,6 +27,12 @@ class TasksTest < ActiveSupport::TestCase  # :nodoc:
       refute_empty connection.select_values("SELECT * from public.spatial_ref_sys")
     end
 
+    def test_create_database_from_extension_in_separate_schema
+      configuration = TasksTest.new_database_config.merge('postgis_schema' => 'postgis')
+      ::ActiveRecord::Tasks::DatabaseTasks.create(configuration)
+      refute_empty connection.select_values("SELECT * from postgis.spatial_ref_sys")
+    end
+
     def test_empty_sql_dump
       setup_database_tasks
       ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TasksTest.new_database_config, tmp_sql_filename)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.