activerecord-postgis-adapter 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff4e3a14420f0cb54ab5f2ee745eb9b48a5cfc5
-  data.tar.gz: 51adb18e9a0b6f5678863e8ac480b5910868f82f
+  metadata.gz: 84cec176fe58c09c168a2e70ded5aa3c6cd340bc
+  data.tar.gz: feb4f2299f2031b0f8f3f5750225600b4f1f8f29
 SHA512:
-  metadata.gz: 44a9ac94f6ee75aebecd789a1b988d88a137663c039b0a187f8653abc22992e5641c5804c64db414a19fdaacec7322bb2c0900f6b15442194259a33034529d16
-  data.tar.gz: 2bc25c45236615f6a782d22046b15185881f14395a1ab437a0e45b5f1f8672ad871242c211914f455136740feb74422b1d1b25c9aaf4bc1b932b150d6e5a0c23
+  metadata.gz: fd646dad76070fb45abc821d56d5945cf28d76e967f9a479d11bc81d1fe2a4e1cc33c98d7e346eec3a7546f2207d09b3f427f0f3a87a529a12f294cc21701d6b
+  data.tar.gz: 1b916339a0926ced1441a14aecc8f68e21f5bffbf196c64f677f975121622b554bfe178d3819e0eeb2bd78d8d8c878011b819ab97694d74e298d7f3262872748

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

@@ -116,9 +116,7 @@ module ActiveRecord  # :nodoc:
             has_z = col.has_z?
             has_m = col.has_m?
             type = "#{type}M" if has_m && !has_z
-            dimensions_ = 2
-            dimensions_ += 1 if has_z
-            dimensions_ += 1 if has_m
+            dimensions_ = set_dimensions(has_m, has_z)
             execute("SELECT AddGeometryColumn('#{quote_string(table_name)}', '#{quote_string(col.name.to_s)}', #{col.srid}, '#{quote_string(type)}', #{dimensions_})")
           end
         end
@@ -127,32 +125,7 @@ module ActiveRecord  # :nodoc:
           table_name = table_name.to_s
           column_name = column_name.to_s
           if (info = spatial_column_constructor(type.to_sym))
-            limit = options[:limit]
-            if type.to_s == 'geometry' &&
-              (options[:no_constraints] || limit.is_a?(::Hash) && limit[:no_constraints])
-            then
-              options.delete(:limit)
-              super
-            else
-              options.merge!(limit) if limit.is_a?(::Hash)
-              type = (options[:type] || info[:type] || type).to_s.gsub('_', '').upcase
-              has_z = options[:has_z]
-              has_m = options[:has_m]
-              srid = (options[:srid] || PostGISAdapter::DEFAULT_SRID).to_i
-              if options[:geographic]
-                type << 'Z' if has_z
-                type << 'M' if has_m
-                execute("ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} GEOGRAPHY(#{type},#{srid})")
-                change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
-                change_column_null(table_name, column_name, false, options[:default]) if options[:null] == false
-              else
-                type = "#{type}M" if has_m && !has_z
-                dimensions = 2
-                dimensions += 1 if has_z
-                dimensions += 1 if has_m
-                execute("SELECT AddGeometryColumn('#{quote_string(table_name)}', '#{quote_string(column_name)}', #{srid}, '#{quote_string(type)}', #{dimensions})")
-              end
-            end
+            add_spatial_column(column_name, table_name, info, type, options)
           else
             super
           end
@@ -172,8 +145,8 @@ module ActiveRecord  # :nodoc:
         # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS
         # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
         def add_index(table_name, column_name, options = {})
-          # We have to fully-replace because of the gist_clause.
-
+          # We have to fully replace to add the gist clause.
+          options ||= {} # in case nil explicitly passed
           gist = options.delete(:spatial)
           index_name, index_type, index_columns, index_options, index_algorithm, index_using = add_index_options(table_name, column_name, options)
           index_using = 'USING GIST' if gist
@@ -204,6 +177,26 @@ module ActiveRecord  # :nodoc:
 
         private
 
+        def add_spatial_column(column_name, table_name, info, type, options)
+          limit = options[:limit]
+          options.merge!(limit) if limit.is_a?(::Hash)
+          type = (options[:type] || info[:type] || type).to_s.gsub('_', '').upcase
+          has_z = options[:has_z]
+          has_m = options[:has_m]
+          srid = (options[:srid] || PostGISAdapter::DEFAULT_SRID).to_i
+          if options[:geographic]
+            type << 'Z' if has_z
+            type << 'M' if has_m
+            execute("ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} GEOGRAPHY(#{type},#{srid})")
+            change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
+            change_column_null(table_name, column_name, false, options[:default]) if options[:null] == false
+          else
+            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})")
+          end
+        end
+
         def column_type_map
           if defined?(type_map) # ActiveRecord 4.1+
             type_map
@@ -212,6 +205,13 @@ module ActiveRecord  # :nodoc:
           end
         end
 
+        def set_dimensions(has_m, has_z)
+          dimensions = 2
+          dimensions += 1 if has_z
+          dimensions += 1 if has_m
+          dimensions
+        end
+
       end
     end
   end

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

@@ -10,9 +10,7 @@ module ActiveRecord  # :nodoc:
 
         def setup_gis
           establish_su_connection
-          if script_dir
-            setup_gis_from_script_dir
-          elsif extension_names
+          if extension_names
             setup_gis_from_extension
           end
           establish_connection(configuration)
@@ -80,11 +78,6 @@ module ActiveRecord  # :nodoc:
           @search_path ||= configuration['schema_search_path'].to_s.strip.split(',').map(&:strip)
         end
 
-        def script_dir
-          @script_dir = configuration['script_dir'] unless defined?(@script_dir)
-          @script_dir
-        end
-
         def extension_names
           @extension_names ||= begin
             ext_ = configuration['postgis_extension']
@@ -100,14 +93,11 @@ module ActiveRecord  # :nodoc:
         end
 
         def ensure_installation_configs
-          if configuration['setup'] == 'default' && !configuration['script_dir'] && !configuration['postgis_extension']
+          if configuration['setup'] == 'default' && !configuration['postgis_extension']
             share_dir_ = `pg_config --sharedir`.strip rescue '/usr/share'
-            script_dir_ = ::File.expand_path('contrib/postgis-1.5', share_dir_)
             control_file_ = ::File.expand_path('extension/postgis.control', share_dir_)
             if ::File.readable?(control_file_)
               configuration['postgis_extension'] = 'postgis'
-            elsif ::File.directory?(script_dir_)
-              configuration['script_dir'] = script_dir_
             end
           end
         end
@@ -122,11 +112,6 @@ module ActiveRecord  # :nodoc:
             end
           end
         end
-
-        def setup_gis_from_script_dir
-          connection.execute(::File.read(::File.expand_path('postgis.sql', script_dir)))
-          connection.execute(::File.read(::File.expand_path('spatial_ref_sys.sql', script_dir)))
-        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.0.1'.freeze
+      VERSION = '2.0.2'.freeze
     end
   end
 end

data/test/basic_test.rb

@@ -4,7 +4,7 @@ module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
-        class BasicTest < BASE_TEST_CLASS  # :nodoc:
+        class BasicTest < ActiveSupport::TestCase  # :nodoc:
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
 

data/test/ddl_test.rb

@@ -4,7 +4,7 @@ module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
-        class DDLTest < BASE_TEST_CLASS  # :nodoc:
+        class DDLTest < ActiveSupport::TestCase  # :nodoc:
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database_local.yml'
 
@@ -27,23 +27,6 @@ module RGeo
               assert_equal(0, klass.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-            # no_constraints no longer supported in PostGIS 2.0
-            def _test_create_no_constraints_geometry
-              klass = create_ar_class
-              klass.connection.create_table(:spatial_test) do |t|
-                t.column 'geom', :geometry, :limit => {:no_constraints => true}
-              end
-              assert_equal(0, klass.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
-              col = klass.columns.last
-              assert_equal(::RGeo::Feature::Geometry, col.geometric_type)
-              assert_equal(false, col.geographic?)
-              assert_equal(false, col.has_spatial_constraints?)
-              assert_nil(col.srid)
-              assert(klass.cached_attributes.include?('geom'))
-              klass.connection.drop_table(:spatial_test)
-              assert_equal(0, klass.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
-            end
-
             def test_create_simple_geography
               klass = create_ar_class
               klass.connection.create_table(:spatial_test) do |t|
@@ -100,29 +83,6 @@ module RGeo
               assert_equal(false, cols_[-1].has_spatial_constraints?)
             end
 
-            # no_constraints no longer supported in PostGIS 2.0
-            def _test_add_no_constraints_geometry_column
-              klass = create_ar_class
-              klass.connection.create_table(:spatial_test) do |t|
-                t.column('latlon', :geometry)
-              end
-              klass.connection.change_table(:spatial_test) do |t|
-                t.column('geom2', :geometry, :no_constraints => true)
-                t.column('name', :string)
-              end
-              assert_equal(1, klass.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
-              cols_ = klass.columns
-              assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(0, cols_[-3].srid)
-              assert_equal(true, cols_[-3].has_spatial_constraints?)
-              assert_equal(::RGeo::Feature::Geometry, cols_[-2].geometric_type)
-              assert_nil(cols_[-2].srid)
-              assert_equal(false, cols_[-2].geographic?)
-              assert_equal(false, cols_[-2].has_spatial_constraints?)
-              assert_nil(cols_[-1].geometric_type)
-              assert_equal(false, cols_[-1].has_spatial_constraints?)
-            end
-
             def test_add_geography_column
               klass = create_ar_class
               klass.connection.create_table(:spatial_test) do |t|
@@ -197,22 +157,6 @@ module RGeo
               assert_equal(0, klass.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-            # no_constraints no longer supported in PostGIS 2.0
-            def _test_create_no_constraints_geometry_using_shortcut
-              klass = create_ar_class
-              klass.connection.create_table(:spatial_test) do |t|
-                t.spatial 'geom', :no_constraints => true
-              end
-              assert_equal(0, klass.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
-              col = klass.columns.last
-              assert_equal(::RGeo::Feature::Geometry, col.geometric_type)
-              assert_equal(false, col.geographic?)
-              assert_nil(col.srid)
-              assert(klass.cached_attributes.include?('geom'))
-              klass.connection.drop_table(:spatial_test)
-              assert_equal(0, klass.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
-            end
-
             def test_create_simple_geography_using_shortcut
               klass = create_ar_class
               klass.connection.create_table(:spatial_test) do |t|

data/test/nested_class_test.rb

@@ -4,7 +4,7 @@ module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
-        class NestedClassTest < BASE_TEST_CLASS  # :nodoc:
+        class NestedClassTest < ActiveSupport::TestCase  # :nodoc:
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database_local.yml'
 

data/test/setup_test.rb

@@ -4,7 +4,7 @@ module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
-        class SpatialQueriesTest < BASE_TEST_CLASS  # :nodoc:
+        class SpatialQueriesTest < ActiveSupport::TestCase  # :nodoc:
 
           def test_ignore_tables
             assert_equal %w(geometry_columns spatial_ref_sys layer topology), ::ActiveRecord::SchemaDumper.ignore_tables

data/test/spatial_queries_test.rb

@@ -4,7 +4,7 @@ module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
-        class SpatialQueriesTest < BASE_TEST_CLASS  # :nodoc:
+        class SpatialQueriesTest < ActiveSupport::TestCase  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database_local.yml'

data/test/tasks_test.rb

@@ -5,7 +5,7 @@ module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
-        class TasksTest < BASE_TEST_CLASS  # :nodoc:
+        class TasksTest < ActiveSupport::TestCase  # :nodoc:
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database_local.yml'
 
@@ -113,6 +113,28 @@ module RGeo
               assert data.index('t.spatial "latlon", limit: {:srid=>4326, :type=>"point", :geographic=>true}')
               assert data.index('add_index "spatial_test", ["latlon"], :name => "index_spatial_test_on_latlon", :spatial => true')
             end
+
+            def test_add_index_with_nil_options
+              setup_database_tasks
+              connection.create_table(:test) do |t|
+                t.string "name"
+              end
+              connection.add_index :test, :name, nil
+              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TasksTest.new_database_config, tmp_sql_filename)
+              data = ::File.read(tmp_sql_filename)
+              assert data.index('CREATE INDEX index_test_on_name ON test USING btree (name);')
+            end
+
+            def test_add_index_via_references
+              setup_database_tasks
+              connection.create_table(:cats)
+              connection.create_table(:dogs) do |t|
+                t.references :cats, index: true
+              end
+              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TasksTest.new_database_config, tmp_sql_filename)
+              data = ::File.read(tmp_sql_filename)
+              assert data.index('CREATE INDEX index_dogs_on_cats_id ON dogs USING btree (cats_id);')
+            end
           end
 
           private

data/test/test_helper.rb

@@ -6,9 +6,3 @@ begin
 rescue LoadError
   # ignore
 end
-
-BASE_TEST_CLASS = if ActiveRecord::VERSION::STRING > '4.1'
-                    Minitest::Test
-                  else
-                    MiniTest::Unit::TestCase
-                  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord