activerecord-postgis-adapter 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9072742044be5bdca4d15241b2e55fd59753f07f
-  data.tar.gz: f2f0227789eb674f799d1dee7f85555e1040d4e9
+  metadata.gz: 530465c0f3d1c6114a70cc680aeac76cfc92b4fa
+  data.tar.gz: a38593f010a53528501f14ea121698925a72f4b8
 SHA512:
-  metadata.gz: fde41e0dcd38d4a6d2a7a53f739e50610c998682bb0f5303383e580269ce486ec15fa45aaa698fa5d71e7d943ff404785cb5bf96d785d329877f54d08a0f8732
-  data.tar.gz: f8fe668e18334aefef68f4762e5da778d3b3d4929cab9c1d065a17e55ea392f51954406f643cf47b7021c1372ef3dc42bba397f9d2cc4742bd7718561fb5bc1f
+  metadata.gz: d94f15877a0a8bb54c37be063812c9af9d50bc43b2fb8ff2e822a6cb6811a1371d77b83be476a66d41276b37d60535f5c1bc6b20f7c43aea8ee8fc66d1141992
+  data.tar.gz: 5b095db94a92fd53bdd7775875c45b447c6e609b0b5f7970a365c059687bd4e97f3a80dedcadc9aa492a5747227c56925b95bc521b50bcf78e8c61f63eb9d081

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

@@ -114,14 +114,17 @@ module ActiveRecord  # :nodoc:
           end
           table_definition.non_geographic_spatial_columns.each do |col|
             options = {
+              default: col.default,
               has_m: col.has_m?,
               has_z: col.has_z?,
+              null: col.null,
               srid:  col.srid,
               type:  col.spatial_type,
             }
             column_name = col.name.to_s
+            type = col.spatial_type
 
-            add_spatial_column(table_name, column_name, options)
+            add_spatial_column(table_name, column_name, type, options)
           end
         end
 
@@ -129,7 +132,8 @@ module ActiveRecord  # :nodoc:
           table_name = table_name.to_s
           column_name = column_name.to_s
           if (info = spatial_column_constructor(type.to_sym))
-            add_spatial_column(table_name, column_name, info, type, options)
+            options[:info] = info
+            add_spatial_column(table_name, column_name, type, options)
           else
             super
           end
@@ -163,8 +167,9 @@ module ActiveRecord  # :nodoc:
 
         private
 
-        def add_spatial_column(table_name, column_name, info = {}, type = nil, options)
+        def add_spatial_column(table_name, column_name, type, options)
           limit = options[:limit]
+          info = options[:info] || {}
           options.merge!(limit) if limit.is_a?(::Hash)
           type = (options[:type] || info[:type] || type).to_s.gsub('_', '').upcase
           has_z = options[:has_z]
@@ -180,6 +185,7 @@ module ActiveRecord  # :nodoc:
             type = "#{type}M" if has_m && !has_z
             dimensions = set_dimensions(has_m, has_z)
             execute("SELECT AddGeometryColumn('#{quote_string(table_name)}', '#{quote_string(column_name)}', #{srid}, '#{quote_string(type)}', #{dimensions})")
+            change_column_null(table_name, column_name, false, options[:default]) if options[:null] == false
           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.0'.freeze
+      VERSION = '2.1.1'.freeze
     end
   end
 end

data/test/ddl_test.rb

@@ -82,11 +82,14 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
     def test_add_geometry_column_null_false
       klass = create_ar_class
       klass.connection.create_table(:spatial_test) do |t|
-        t.column('latlon', :geometry, null: false)
+        t.column('latlon_null', :geometry, null: false)
+        t.column('latlon', :geometry)
       end
-      geometry_column = klass.columns.first
+      null_false_column = klass.columns[1]
+      null_true_column = klass.columns[2]
 
-      refute(geometry_column.null, 'Column should be null: false')
+      refute(null_false_column.null, 'Column should be null: false')
+      assert(null_true_column.null, 'Column should be null: true')
     end
 
     def test_add_geography_column

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'minitest/autorun'
+require 'minitest/pride'
 require 'rgeo/active_record/adapter_test_helper'
 
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement