spatial_features 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5ada735515d4ec029917c5d00994254804e9b270c65093f32672d851fb1a452
-  data.tar.gz: 1828f79799ab6e91bfcd0503aba6091b9e0120d33aa28a05158f729dc1738e0f
+  metadata.gz: 4c0e0009e894639d857055d9352765ff673d5d3759bc12b7382f132fd72af923
+  data.tar.gz: 6ecc2848af239c202773a3e80522fa8172619808254fd5ad39c15e20708abf2b
 SHA512:
-  metadata.gz: ff7491b8acd5875ad23909d2ce988ea793d00707be4ece7d9cb7b700c4a1e064db949778ccc029f948f3ea389d91b7e8c54dceac55fb3206bd928bd97319e760
-  data.tar.gz: f1256bec3bb256e2789e3e7e0462f8f710f23fc1a493814b8a9126c3cd5495680394f588ca5121908875847d5ae3748a10a0e65d5b0f84d7ee65a5304a238c4b
+  metadata.gz: e7da7be9e6b5bb1ec0db3980ca273e8ce0156be36ea3b00a06b6c5d60316ed9b19960b9d0ebf7803ec71147f5b0e72c85028e3f64acc75f2d8b47bd5d2a924b6
+  data.tar.gz: 32ac8b571dd0d223145c5980b56d040ba7daa3fc5070558c192267011a735a95e0d0088332047ccba75f3bad9a2aa5b7aa7f575f1555b3457f4c8275fad243ca

data/lib/spatial_features/importers/kml.rb

@@ -56,24 +56,23 @@ module SpatialFeatures
       end
 
       def geom_from_kml(kml)
-        geom = nil
-        conn = nil
-
         strip_altitude(kml)
 
-        # Do query in a new thread so we use a new connection (if the query fails it will poison the transaction of the current connection)
-        #
-        # We manually checkout a new connection since Rails re-uses DB connections across threads.
-        Thread.new do
-          conn = ActiveRecord::Base.connection_pool.checkout
-          geom = conn.select_value("SELECT ST_GeomFromKML(#{conn.quote(kml.to_s)})")
-        rescue ActiveRecord::StatementInvalid => e # Discard Invalid KML features
-          geom = nil
-        ensure
-          ActiveRecord::Base.connection_pool.checkin(conn) if conn
-        end.join
-
-        return geom
+        # Run the parse inside a SAVEPOINT so a `ST_GeomFromKML` failure on a single
+        # invalid feature rolls back only that savepoint, not the surrounding
+        # transaction. The previous implementation spawned a thread and checked out
+        # a fresh connection for the same isolation reason, but on Rails 8 that
+        # pattern deadlocks under `use_transactional_fixtures` — the test pins its
+        # connection, the spawned thread blocks indefinitely waiting on
+        # `ActiveRecord::Base.connection_pool.checkout`. A nested transaction
+        # (`requires_new: true`) gives identical fault containment without crossing
+        # thread boundaries.
+        ActiveRecord::Base.transaction(requires_new: true) do
+          conn = ActiveRecord::Base.connection
+          conn.select_value("SELECT ST_GeomFromKML(#{conn.quote(kml.to_s)})")
+        end
+      rescue ActiveRecord::StatementInvalid # Discard invalid KML features
+        nil
       end
 
       def images_from_metadata(metadata)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "3.10.0"
+  VERSION = "3.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors:
 - Ryan Wallace
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.5
 specification_version: 4
 summary: Adds spatial methods to a model.
 test_files: []