activerecord-postgis-adapter 0.6.1 → 0.6.2

checksums.yaml

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

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 0.6.2 / 2013-03-08
+
+* The PostGIS setup now properly connects as the superuser. (Reported by Adam Trilling)
+* Fix database setup rake tasks under jruby/jdbc adapter. (Pull request by Nick Muerdter)
+* Drop table no longer tries to modify the geometry_columns view under PostGIS 2.0.
+* The Rakefile is now compatible with RubyGems 2.0.
+
 === 0.6.1 / 2013-02-28
 
 * Fixed some gem loading issues.

data/Version

@@ -1 +1 @@
-0.6.1
+0.6.2

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

@@ -92,7 +92,7 @@ def setup_gis(config_)
   ::ActiveRecord::Base.establish_connection(config_.merge('schema_search_path' => 'public', 'username' => su_username_, 'password' => su_password_))
   conn_ = ::ActiveRecord::Base.connection
   search_path_ = get_search_path(config_)
-  quoted_username_ = ::PGconn.quote_ident(username_)
+  quoted_username_ = ::ActiveRecord::Base.connection.quote_column_name(username_)
   auth_ = has_su_ ? " AUTHORIZATION #{quoted_username_}" : ''
   search_path_.each do |schema_|
     exists = schema_.downcase == 'public' || conn_.execute("SELECT 1 FROM pg_catalog.pg_namespace WHERE nspname='#{schema_}'").try(:first)
@@ -128,6 +128,7 @@ def setup_gis(config_)
       postgis_version = conn_.execute( "SELECT #{postgis_schema_}.postgis_version();" ).first[ 'postgis_version' ]
       if postgis_version =~ /^2/
         conn_.execute("ALTER VIEW #{postgis_schema_}.geometry_columns OWNER TO #{quoted_username_}")
+        conn_.execute("ALTER VIEW #{postgis_schema_}.geography_columns OWNER TO #{quoted_username_}")
       else
         conn_.execute("ALTER TABLE #{postgis_schema_}.geometry_columns OWNER TO #{quoted_username_}")
       end

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

@@ -221,7 +221,9 @@ module ActiveRecord  # :nodoc:
 
 
         def drop_table(table_name_, *options_)
-          execute("DELETE from geometry_columns where f_table_name='#{quote_string(table_name_.to_s)}'")
+          if postgis_lib_version.to_s.split('.').first.to_i == 1
+            execute("DELETE from geometry_columns where f_table_name='#{quote_string(table_name_.to_s)}'")
+          end
           super
         end
 

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

@@ -215,7 +215,9 @@ module ActiveRecord  # :nodoc:
 
 
         def drop_table(table_name_, *options_)
-          execute("DELETE from geometry_columns where f_table_name='#{quote_string(table_name_.to_s)}'")
+          if postgis_lib_version.to_s.split('.').first.to_i == 1
+            execute("DELETE from geometry_columns where f_table_name='#{quote_string(table_name_.to_s)}'")
+          end
           super
         end
 

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

@@ -50,6 +50,7 @@ module ActiveRecord  # :nodoc:
 
 
         def setup_gis
+          establish_su_connection
           setup_gis_schemas
           if script_dir
             setup_gis_from_script_dir
@@ -59,6 +60,7 @@ module ActiveRecord  # :nodoc:
           if has_su? && (script_dir || extension_names)
             setup_gis_grant_privileges
           end
+          establish_connection(configuration) if has_su?
         end
 
 
@@ -69,7 +71,6 @@ module ActiveRecord  # :nodoc:
           extra_configs_ = {'encoding' => encoding}
           extra_configs_['owner'] = username if has_su?
           connection.create_database(configuration['database'], configuration.merge(extra_configs_))
-          establish_connection(configuration) unless master_established_
           setup_gis
         rescue ::ActiveRecord::StatementInvalid => error_
           if /database .* already exists/ === error_.message
@@ -108,12 +109,20 @@ module ActiveRecord  # :nodoc:
         end
 
 
+        def establish_su_connection
+          establish_connection(configuration.merge(
+            'schema_search_path' => 'public',
+            'username' => su_username,
+            'password' => su_password))
+        end
+
+
         def username
           @username ||= configuration['username']
         end
 
         def quoted_username
-          @quoted_username ||= ::PGconn.quote_ident(username)
+          @quoted_username ||= ::ActiveRecord::Base.connection.quote_column_name(username)
         end
 
         def password
@@ -176,14 +185,12 @@ module ActiveRecord  # :nodoc:
 
 
         def setup_gis_schemas
-          establish_connection(configuration.merge('schema_search_path' => 'public'))
           auth_ = has_su? ? " AUTHORIZATION #{quoted_username}" : ''
           search_path.each do |schema_|
             if schema_.downcase != 'public' && !connection.execute("SELECT 1 FROM pg_catalog.pg_namespace WHERE nspname='#{schema_}'").try(:first)
               connection.execute("CREATE SCHEMA #{schema_}#{auth_}")
             end
           end
-          establish_connection(configuration)
         end
 
 
@@ -212,6 +219,7 @@ module ActiveRecord  # :nodoc:
           postgis_version_ = connection.execute( "SELECT #{postgis_schema}.postgis_version();" ).first['postgis_version']
           if postgis_version_ =~ /^2/
             connection.execute("ALTER VIEW #{postgis_schema}.geometry_columns OWNER TO #{quoted_username}")
+            connection.execute("ALTER VIEW #{postgis_schema}.geography_columns OWNER TO #{quoted_username}")
           else
             connection.execute("ALTER TABLE #{postgis_schema}.geometry_columns OWNER TO #{quoted_username}")
           end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.6.2
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-08 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
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,49 +27,43 @@ 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
@@ -117,28 +108,28 @@ files:
 - README.rdoc
 - Version
 homepage: http://dazuma.github.com/activerecord-postgis-adapter
-licenses: []
+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: 1.8.25
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An ActiveRecord adapter for PostGIS, based on RGeo.
 test_files:
 - test/tc_basic.rb