activerecord-postgis-adapter 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 530465c0f3d1c6114a70cc680aeac76cfc92b4fa
-  data.tar.gz: a38593f010a53528501f14ea121698925a72f4b8
+  metadata.gz: cfce80e5cc8bb5ad34d51937326e5f9a2037e207
+  data.tar.gz: d3ce8ba42c544093651afcd799d717aa10f76625
 SHA512:
-  metadata.gz: d94f15877a0a8bb54c37be063812c9af9d50bc43b2fb8ff2e822a6cb6811a1371d77b83be476a66d41276b37d60535f5c1bc6b20f7c43aea8ee8fc66d1141992
-  data.tar.gz: 5b095db94a92fd53bdd7775875c45b447c6e609b0b5f7970a365c059687bd4e97f3a80dedcadc9aa492a5747227c56925b95bc521b50bcf78e8c61f63eb9d081
+  metadata.gz: 7b79c9d7807b857a6f408495a34714106e3bcbd0b9d4578655abd51abbb53463af920971a7e4f712632df82521708467d8e5b28023e3cd4a8e90ac3fb0caf18a
+  data.tar.gz: 3c5f7672e35341ac23bf39c57fa031e9d0f335b93bb954fe593d5595bff3cd19971811d562ae6ff3b2534823da026b2a55b1fd7cfef95413671ea70ce4b20a95

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

@@ -1,7 +1,13 @@
 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
 
-    class PostGIS < PostgreSQL  # :nodoc:
+    class PostGIS < PostGISSuperclass  # :nodoc:
 
       FUNC_MAP = {
         'st_wkttosql' => 'ST_GeomFromEWKT',

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

@@ -1,26 +1,37 @@
-require 'pg'
+if(defined?(::RUBY_ENGINE) && ::RUBY_ENGINE == 'jruby')
+  require 'active_record/connection_adapters/jdbcpostgresql_adapter'
+else
+  require 'pg'
+end
 
 module ActiveRecord  # :nodoc:
   module ConnectionHandling  # :nodoc:
+    if(defined?(::RUBY_ENGINE) && ::RUBY_ENGINE == 'jruby')
+      def postgis_connection(config)
+        config[:adapter_class] = ::ActiveRecord::ConnectionAdapters::PostGISAdapter::MainAdapter
+        postgresql_connection(config)
+      end
+      alias_method :jdbcpostgis_connection, :postgis_connection
+    else
+      # Based on the default <tt>postgresql_connection</tt> definition from ActiveRecord.
+      # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+      def postgis_connection(config)
+        # FULL REPLACEMENT because we need to create a different class.
+        conn_params = config.symbolize_keys
 
-    # Based on the default <tt>postgresql_connection</tt> definition from ActiveRecord.
-    # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
-    def postgis_connection(config)
-      # FULL REPLACEMENT because we need to create a different class.
-      conn_params = config.symbolize_keys
-
-      conn_params.delete_if { |_, v| v.nil? }
+        conn_params.delete_if { |_, v| v.nil? }
 
-      # Map ActiveRecords param names to PGs.
-      conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
-      conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
+        # Map ActiveRecords param names to PGs.
+        conn_params[:user] = conn_params.delete(:username) if conn_params[:username]
+        conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
-      # Forward only valid config params to PGconn.connect.
-      conn_params.keep_if { |k, _| VALID_CONN_PARAMS.include?(k) }
+        # Forward only valid config params to PGconn.connect.
+        conn_params.keep_if { |k, _| VALID_CONN_PARAMS.include?(k) }
 
-      # 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, conn_params, config)
+        # 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, conn_params, config)
+      end
     end
 
   end

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

@@ -34,6 +34,12 @@ module ActiveRecord  # :nodoc:
           column_info = SpatialColumnInfo.new(self, quote_string(table_name.to_s))
           # Limit, precision, and scale are all handled by the superclass.
           column_definitions(table_name).map do |column_name, type, default, notnull, oid, fmod|
+            # JDBC gets true/false in Rails 4, where other platforms get
+            # 't'/'f' strings.
+            if(notnull.is_a?(String))
+              notnull = (notnull == 't')
+            end
+
             oid = column_type_map.fetch(oid.to_i, fmod.to_i) { OID::Identity.new }
             SpatialColumn.new(@rgeo_factory_settings,
                               table_name,
@@ -41,7 +47,7 @@ module ActiveRecord  # :nodoc:
                               default,
                               oid,
                               type,
-                              notnull == 'f',
+                              !notnull,
                               column_info.get(column_name, type))
           end
         end

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

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

data/test/ddl_test.rb

@@ -247,6 +247,52 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
       assert_nil klass.columns[1].has_z
     end
 
+    # Ensure that null contraints info is getting captured like the
+    # normal adapter.
+    def test_null_constraints
+      klass_ = create_ar_class
+      klass_.connection.create_table(:spatial_test) do |t_|
+        t_.column 'nulls_allowed', :string, :null => true
+        t_.column 'nulls_disallowed', :string, :null => false
+      end
+      assert_equal(true, klass_.columns[-2].null)
+      assert_equal(false, klass_.columns[-1].null)
+    end
+
+    # Ensure that default value info is getting captured like the
+    # normal adapter.
+    def test_column_defaults
+      klass_ = create_ar_class
+      klass_.connection.create_table(:spatial_test) do |t_|
+        t_.column 'sample_integer_neg_default', :integer, :default => -1
+      end
+      assert_equal(-1, klass_.columns.last.default)
+    end
+
+    # Ensure that column type info is getting captured like the
+    # normal adapter.
+    def test_column_types
+      klass_ = create_ar_class
+      klass_.connection.create_table(:spatial_test) do |t_|
+        t_.column 'sample_integer', :integer
+        t_.column 'sample_string', :string
+        t_.column 'latlon', :point
+      end
+      assert_equal(:integer, klass_.columns[-3].type)
+      assert_equal(:string, klass_.columns[-2].type)
+      assert_equal(:spatial, klass_.columns[-1].type)
+    end
+
+    def test_array_columns
+      klass_ = create_ar_class
+      klass_.connection.create_table(:spatial_test) do |t_|
+        t_.column 'sample_array', :string, :array => true
+        t_.column 'sample_non_array', :string
+      end
+      assert_equal(true, klass_.columns[-2].array)
+      assert_equal(false, klass_.columns[-1].array)
+    end
+
     private
 
     def geometry_column_count_query

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 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.
@@ -118,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.