activerecord-postgis 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2022a537c5f4ac8fcdff4b7e9fb5a8801167da139a23df3095c66c5da4cad86
-  data.tar.gz: 174ed2a80856954bc39fae2bd479c47d3508f50ae5ed5ba2dfea458b2741a955
+  metadata.gz: b452469d6861f42a259853b4f6b3f7e5a694d98c325141d5a43ac09eaf40e967
+  data.tar.gz: ada960ed4d93542ae2f2f805412d8b39dc58ae52cfa1612b8007e53e2bf2952f
 SHA512:
-  metadata.gz: a5c66a366cf6e101c9adb412abc8f5714299f9d38c005125a9fff1ba54d0621190acdd391b7fcdf99f16bbf36a59b45a6504d99ef6fffa4d0165f6acff5db8e4
-  data.tar.gz: 2ba4c06a28dbef90a5aff91db38732e6df62cb9d19f65d363b883d5b49e8895aba4622c9b6f81f21892812b201c88a8c8310e6f2c027404d339ab00a29c237e3
+  metadata.gz: d3c0f7fa79a22ba014655f18198bc4c048f3287fa6ade5e5c1442e8f0099c910394bc7592939b3a8c911670d9c4a54b5bbb8d0d29b568dddaf0406cba310c453
+  data.tar.gz: 14c0462864a39e967b1c2c684a0dda6a6e0d6b1d902c87561398dc214f4934238594f8847b26ba33e52df669f00d998828df0c2ca29305fc56f94209e45019bc

data/lib/active_record/connection_adapters/postgis/schema_dumper.rb

@@ -64,6 +64,11 @@ module ActiveRecord
             geom_type = $2
             srid = $3&.to_i
 
+            # Add geographic option for geography columns
+            if spatial_type.downcase == "geography"
+              spec[:geographic] = true
+            end
+
             # Add SRID if not default
             if srid && srid != default_srid(spatial_type)
               spec[:srid] = srid

data/lib/active_record/connection_adapters/postgis/type/geometry.rb

@@ -7,8 +7,8 @@ module ActiveRecord
     module PostGIS
       module Type
         class Geometry < Spatial
-          def initialize(srid: 0, has_z: false, has_m: false)
-            super(geo_type: "geometry", srid: srid, has_z: has_z, has_m: has_m)
+          def initialize(srid: 0, has_z: false, has_m: false, geographic: false)
+            super(geo_type: "geometry", srid: srid, has_z: has_z, has_m: has_m, geographic: geographic)
           end
 
           def type

data/lib/active_record/connection_adapters/postgis/type/geometry_collection.rb

@@ -7,8 +7,8 @@ module ActiveRecord
     module PostGIS
       module Type
         class GeometryCollection < Spatial
-          def initialize(srid: 0, has_z: false, has_m: false)
-            super(geo_type: "geometry_collection", srid: srid, has_z: has_z, has_m: has_m)
+          def initialize(srid: 0, has_z: false, has_m: false, geographic: false)
+            super(geo_type: "geometry_collection", srid: srid, has_z: has_z, has_m: has_m, geographic: geographic)
           end
 
           def type

data/lib/active_record/connection_adapters/postgis/type/multi_line_string.rb

@@ -7,8 +7,8 @@ module ActiveRecord
     module PostGIS
       module Type
         class MultiLineString < Spatial
-          def initialize(srid: 0, has_z: false, has_m: false)
-            super(geo_type: "multi_line_string", srid: srid, has_z: has_z, has_m: has_m)
+          def initialize(srid: 0, has_z: false, has_m: false, geographic: false)
+            super(geo_type: "multi_line_string", srid: srid, has_z: has_z, has_m: has_m, geographic: geographic)
           end
 
           def type

data/lib/active_record/connection_adapters/postgis/type/multi_point.rb

@@ -7,8 +7,8 @@ module ActiveRecord
     module PostGIS
       module Type
         class MultiPoint < Spatial
-          def initialize(srid: 0, has_z: false, has_m: false)
-            super(geo_type: "multi_point", srid: srid, has_z: has_z, has_m: has_m)
+          def initialize(srid: 0, has_z: false, has_m: false, geographic: false)
+            super(geo_type: "multi_point", srid: srid, has_z: has_z, has_m: has_m, geographic: geographic)
           end
 
           def type

data/lib/active_record/connection_adapters/postgis/type/polygon.rb

@@ -7,8 +7,8 @@ module ActiveRecord
     module PostGIS
       module Type
         class Polygon < Spatial
-          def initialize(srid: 0, has_z: false, has_m: false)
-            super(geo_type: "polygon", srid: srid, has_z: has_z, has_m: has_m)
+          def initialize(srid: 0, has_z: false, has_m: false, geographic: false)
+            super(geo_type: "polygon", srid: srid, has_z: has_z, has_m: has_m, geographic: geographic)
           end
 
           def type

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "0.1.0"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_record/connection_adapters/postgresql_adapter"
 require_relative "postgis/version"
 require_relative "postgis/type/geography"
 require_relative "postgis/type/geometry"
@@ -37,18 +38,18 @@ module ActiveRecord
         @initialized = true
 
         # Extend PostgreSQL Column class with spatial functionality
-        ActiveRecord::ConnectionAdapters::PostgreSQL::Column.include(ColumnExtensions)
+        PostgreSQL::Column.include(ColumnExtensions)
 
         # Add spatial object quoting support
-        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Quoting)
+        PostgreSQLAdapter.prepend(Quoting)
 
         # Allow PostGIS specific options in table definitions
         # The `define_column_methods` call already makes these available on the `TableDefinition` instance.
         # The issue might be deeper in how schema.rb is processed or how options are validated.
         # Let's ensure that the column methods are defined *before* any schema loading that might trigger validation.
 
-        ActiveRecord::ConnectionAdapters::PostgreSQL::Table.include(
-          ActiveRecord::ConnectionAdapters::PostGIS::TableDefinition
+        PostgreSQL::Table.include(
+          PostGIS::TableDefinition
         )
 
         # Using st_* prefix to avoid conflicts with PostgreSQL native geometric types
@@ -74,7 +75,7 @@ module ActiveRecord
 
 
         # Tell Rails these are valid column methods for schema dumping - PostgreSQL only
-        ActiveRecord::ConnectionAdapters::PostgreSQL::TableDefinition.send(:define_column_methods,
+        PostgreSQL::TableDefinition.send(:define_column_methods,
                                                                             :st_geography, :st_geometry, :st_geometry_collection, :st_line_string,
                                                                             :st_multi_line_string, :st_multi_point, :st_multi_polygon, :st_point, :st_polygon,
                                                                             # Legacy column methods for compatibility with activerecord-postgis-adapter
@@ -83,10 +84,10 @@ module ActiveRecord
                                                                             *SPATIAL_OPTIONS_FOR_REGISTRATION)
 
         # prevent unknown OID warning and register PostGIS types
-        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.singleton_class.prepend(RegisterTypes)
+        PostgreSQLAdapter.singleton_class.prepend(RegisterTypes)
 
         # Prepend our extensions to handle spatial columns
-        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(AdapterExtensions)
+        PostgreSQLAdapter.prepend(AdapterExtensions)
 
         # Register spatial types with ActiveRecord::Type - use st_* prefix to avoid conflicts
         adapter_name = :postgresql
@@ -113,7 +114,7 @@ module ActiveRecord
         ActiveRecord::Type.register(:polygon, Type::Polygon, adapter: adapter_name)
 
         # Ignore PostGIS system tables in schema dumps - PostgreSQL specific
-        ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.ignore_tables |= %w[
+        PostgreSQL::SchemaDumper.ignore_tables |= %w[
               geography_columns
               geometry_columns
               layer

data/lib/activerecord-postgis.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-# dependencies
 require "active_support"
 require "active_record"
+require "active_record/connection_adapters"
+require_relative "active_record/connection_adapters/postgis"
+require "rgeo-activerecord"
 
 # Initialize when PostgreSQL adapter is loaded
 ActiveSupport.on_load(:active_record_postgresqladapter) do
-  require "rgeo-activerecord"
-  require_relative "active_record/connection_adapters/postgis"
   ActiveRecord::ConnectionAdapters::PostGIS.initialize!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Abdelkader Boudih