activerecord-postgis-adapter 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d2bd161f205308afbc558cdd1b78a3895fa6d57
-  data.tar.gz: 9d8012bd9863180566481fa062582d15a0b093a4
+  metadata.gz: 2ff4e3a14420f0cb54ab5f2ee745eb9b48a5cfc5
+  data.tar.gz: 51adb18e9a0b6f5678863e8ac480b5910868f82f
 SHA512:
-  metadata.gz: 2f791f644fedb57ec26b2c2adc6cdcca315246f6ad51b2e2f6e056eb612d3b2f88305e0ba99836b70dc59d8b76db3febfe64941226dc37d7a9eedde5a9437ae2
-  data.tar.gz: 061590b4d9fbe64b2cb03c8dab47263ed91c4d980683fd366a055675a106c715d10691c846008afeab03aaffb2d64286357510e4f2af909e050bb09b981ad6fc
+  metadata.gz: 44a9ac94f6ee75aebecd789a1b988d88a137663c039b0a187f8653abc22992e5641c5804c64db414a19fdaacec7322bb2c0900f6b15442194259a33034529d16
+  data.tar.gz: 2bc25c45236615f6a782d22046b15185881f14395a1ab437a0e45b5f1f8672ad871242c211914f455136740feb74422b1d1b25c9aaf4bc1b932b150d6e5a0c23

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

@@ -27,28 +27,27 @@ module ActiveRecord  # :nodoc:
           end
         end
 
+        # 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 columns(table_name, name = nil)
-          # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
-          # We needed to return a spatial column subclass.
-          table_name = table_name.to_s
+          # Limit, precision, and scale are all handled by the superclass.
           spatial_info_ = spatial_column_info(table_name)
-          column_definitions(table_name).collect do |col_name, type, default, notnull, oid, fmod|
-            oid = column_type_map.fetch(oid.to_i, fmod.to_i) {
-              OID::Identity.new
-            }
+          column_definitions(table_name).map do |column_name, type, default, notnull, oid, fmod|
+            oid = column_type_map.fetch(oid.to_i, fmod.to_i) { OID::Identity.new }
             SpatialColumn.new(@rgeo_factory_settings,
                               table_name,
-                              col_name,
+                              column_name,
                               default,
                               oid,
                               type,
                               notnull == 'f',
-                              type =~ /geometry/i ? spatial_info_[col_name] : nil)
+                              type =~ /geometry/i ? spatial_info_[column_name] : nil)
           end
         end
 
+        # 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 indexes(table_name, name = nil)
-          # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
           result = query(<<-SQL, 'SCHEMA')
             SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid
             FROM pg_class t
@@ -62,7 +61,7 @@ module ActiveRecord  # :nodoc:
           SQL
 
           result.map do |row|
-            index_name_ = row[0]
+            index_name = row[0]
             unique = row[1] == 't'
             indkey = row[2].split(" ")
             inddef = row[3]
@@ -78,17 +77,19 @@ module ActiveRecord  # :nodoc:
             columns = columns.inject({}){ |h, r| h[r[0].to_s] = [r[1], r[2]]; h }
             column_names = columns.values_at(*indkey).compact.map{ |a| a[0] }
 
-            # add info on sort order for columns (only desc order is explicitly specified, asc is the default)
-            desc_order_columns_ = inddef.scan(/(\w+) DESC/).flatten
-            orders = desc_order_columns_.any? ? Hash[desc_order_columns_.map {|order_column_| [order_column_, :desc]}] : {}
-            where = inddef.scan(/WHERE (.+)$/).flatten[0]
-            spatial = inddef =~ /using\s+gist/i && columns.size == 1 &&
-              (columns.values.first[1] == 'geometry' || columns.values.first[1] == 'geography')
+            unless column_names.empty?
+              # add info on sort order for columns (only desc order is explicitly specified, asc is the default)
+              desc_order_columns = inddef.scan(/(\w+) DESC/).flatten
+              orders = desc_order_columns.any? ? Hash[desc_order_columns.map {|order_column| [order_column, :desc]}] : {}
+              where = inddef.scan(/WHERE (.+)$/).flatten[0]
+              # using = inddef.scan(/USING (.+?) /).flatten[0].to_sym
 
-            if column_names.empty?
-              nil
-            else
-              ::RGeo::ActiveRecord::SpatialIndexDefinition.new(table_name, index_name_, unique, column_names, [], orders, where, !!spatial)
+              spatial = inddef =~ /using\s+gist/i &&
+                        columns.size == 1 &&
+                        %w[geometry geography].include?(columns.values.first[1])
+
+              # IndexDefinition.new(table_name, index_name, unique, column_names, [], orders, where, nil, using)
+              ::RGeo::ActiveRecord::SpatialIndexDefinition.new(table_name, index_name, unique, column_names, [], orders, where, !!spatial)
             end
           end.compact
         end
@@ -168,13 +169,15 @@ module ActiveRecord  # :nodoc:
           end
         end
 
+        # 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 = {})
-          # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
           # We have to fully-replace because of the gist_clause.
-          options ||= {}
-          gist_clause = options.delete(:spatial) ? ' USING GIST' : ''
-          index_name, index_type, index_columns, index_options = add_index_options(table_name, column_name, options)
-          execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}#{gist_clause} (#{index_columns})#{index_options}"
+
+          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
+          execute "CREATE #{index_type} INDEX #{index_algorithm} #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} #{index_using} (#{index_columns})#{index_options}"
         end
 
         def spatial_column_info(table_name)

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

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

data/test/database.yml

@@ -3,3 +3,4 @@ host: 127.0.0.1
 database: postgis_adapter_test
 username: postgres
 setup: default
+schema_search_path: public

data/test/tasks_test.rb

@@ -28,80 +28,109 @@ module RGeo
           define_test_methods do
             def test_create_database_from_extension_in_public_schema
               ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config)
-              ::ActiveRecord::Base.connection.select_values("SELECT * from public.spatial_ref_sys")
+              refute_empty connection.select_values("SELECT * from public.spatial_ref_sys")
             end
 
             def test_empty_sql_dump
-              filename = ::File.expand_path('../tmp/tmp.sql', ::File.dirname(__FILE__))
-              ::FileUtils.rm_f(filename)
-              ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
-              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TasksTest.new_database_config, filename)
-              sql = ::File.read(filename)
+              setup_database_tasks
+              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TasksTest.new_database_config, tmp_sql_filename)
+              sql = ::File.read(tmp_sql_filename)
               assert(sql !~ /CREATE TABLE/)
             end
 
             def test_basic_geography_sql_dump
-              filename = ::File.expand_path('../tmp/tmp.sql', ::File.dirname(__FILE__))
-              ::FileUtils.rm_f(filename)
-              ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
-              ::ActiveRecord::Base.connection.create_table(:spatial_test) do |t|
-                t.point "latlon", :geographic => true
+              setup_database_tasks
+              connection.create_table(:spatial_test) do |t|
+                t.point "latlon", geographic: true
               end
-              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TasksTest.new_database_config, filename)
-              data = ::File.read(filename)
+              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TasksTest.new_database_config, tmp_sql_filename)
+              data = ::File.read(tmp_sql_filename)
               assert(data.index('latlon geography(Point,4326)'))
             end
 
+            def test_index_sql_dump
+              setup_database_tasks
+              connection.create_table(:spatial_test) do |t|
+                t.point "latlon", geographic: true
+                t.string "name"
+              end
+              connection.add_index :spatial_test, :latlon, spatial: true
+              connection.add_index :spatial_test, :name, using: :btree
+              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TasksTest.new_database_config, tmp_sql_filename)
+              data = ::File.read(tmp_sql_filename)
+              assert(data.index('latlon geography(Point,4326)'))
+              assert data.index('CREATE INDEX index_spatial_test_on_latlon ON spatial_test USING gist (latlon);')
+              assert data.index('CREATE INDEX index_spatial_test_on_name ON spatial_test USING btree (name);')
+            end
+
             def test_empty_schema_dump
-              filename = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
-              ::FileUtils.rm_f(filename)
-              ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
-              ::File.open(filename, "w:utf-8") do |file|
+              setup_database_tasks
+              ::File.open(tmp_sql_filename, "w:utf-8") do |file|
                 ::ActiveRecord::SchemaDumper.dump(::ActiveRecord::Base.connection, file)
               end
-              data = ::File.read(filename)
+              data = ::File.read(tmp_sql_filename)
               assert(data.index('ActiveRecord::Schema'))
             end
 
             def test_basic_geometry_schema_dump
-              filename = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
-              ::FileUtils.rm_f(filename)
-              ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
-              conn = ::ActiveRecord::Base.connection
-              conn.create_table(:spatial_test) do |t|
+              setup_database_tasks
+              connection.create_table(:spatial_test) do |t|
                 t.geometry 'object1'
-                t.spatial "object2", :limit => {:srid=>conn.default_srid, :type=>"geometry"}
+                t.spatial "object2", limit: { srid: connection.default_srid, type: "geometry" }
               end
-              ::File.open(filename, "w:utf-8") do |file|
-                ::ActiveRecord::SchemaDumper.dump(conn, file)
+              ::File.open(tmp_sql_filename, "w:utf-8") do |file|
+                ::ActiveRecord::SchemaDumper.dump(connection, file)
               end
-              data = ::File.read(filename)
-              assert(data.index("t.spatial \"object1\", limit: {:srid=>#{conn.default_srid}, :type=>\"geometry\"}"))
-              assert(data.index("t.spatial \"object2\", limit: {:srid=>#{conn.default_srid}, :type=>\"geometry\"}"))
+              data = ::File.read(tmp_sql_filename)
+              assert(data.index("t.spatial \"object1\", limit: {:srid=>#{connection.default_srid}, :type=>\"geometry\"}"))
+              assert(data.index("t.spatial \"object2\", limit: {:srid=>#{connection.default_srid}, :type=>\"geometry\"}"))
             end
 
             def test_basic_geography_schema_dump
-              filename = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
-              ::FileUtils.rm_f(filename)
-              ::FileUtils.mkdir_p(::File.dirname(filename))
-              ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config.merge('schema_search_path' => 'public'))
-              conn = ::ActiveRecord::Base.connection
-              conn.create_table(:spatial_test) do |t|
-                t.point "latlon1", :geographic => true
-                t.spatial "latlon2", :limit => {:srid=>4326, :type=>"point", :geographic=>true}
+              setup_database_tasks
+              connection.create_table(:spatial_test) do |t|
+                t.point "latlon1", geographic: true
+                t.spatial "latlon2", limit: { srid: 4326, type: "point", geographic: true }
               end
-              ::File.open(filename, "w:utf-8") do |file|
-                ::ActiveRecord::SchemaDumper.dump(conn, file)
+              ::File.open(tmp_sql_filename, "w:utf-8") do |file|
+                ::ActiveRecord::SchemaDumper.dump(connection, file)
               end
-              data = ::File.read(filename)
+              data = ::File.read(tmp_sql_filename)
               assert(data.index('t.spatial "latlon1", limit: {:srid=>4326, :type=>"point", :geographic=>true}'))
               assert(data.index('t.spatial "latlon2", limit: {:srid=>4326, :type=>"point", :geographic=>true}'))
             end
+
+            def test_index_schema_dump
+              setup_database_tasks
+              connection.create_table(:spatial_test) do |t|
+                t.point "latlon", geographic: true
+              end
+              connection.add_index :spatial_test, :latlon, spatial: true
+              ::File.open(tmp_sql_filename, "w:utf-8") do |file|
+                ::ActiveRecord::SchemaDumper.dump(connection, file)
+              end
+              data = ::File.read(tmp_sql_filename)
+              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
           end
+
+          private
+
+          def connection
+            ::ActiveRecord::Base.connection
+          end
+
+          def tmp_sql_filename
+            ::File.expand_path('../tmp/tmp.sql', ::File.dirname(__FILE__))
+          end
+
+          def setup_database_tasks
+            ::FileUtils.rm_f(tmp_sql_filename)
+            ::FileUtils.mkdir_p(::File.dirname(tmp_sql_filename))
+            ::ActiveRecord::Tasks::DatabaseTasks.create(TasksTest.new_database_config)
+          end
+
         end
       end
     end

metadata

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