pilipinas 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c053d3fbf05daa1c3bd6298945223e06a0c8154962f9958e8681701738a808b
-  data.tar.gz: 5613bb74fb432f59980cb54067d2d5fb0c2229807df82471e73131b884e00452
+  metadata.gz: '069c53de29b6607d4f19d961e085870e474ee3f53e5a9950d5564211d05b7286'
+  data.tar.gz: fbaa56417882627d836b445625b65fab4cd2077fc4f901019dc2c841b38f6c4f
 SHA512:
-  metadata.gz: 5b1fb8a1a22541315c95dddf2f8f027e88c9455a7fbcde7dd8af9a8483c844247224321aae75d627eab1a15121ef075df01430cfe9a50448dbf9191e83c53851
-  data.tar.gz: 453835a9b952e40983c10e50ba5f7321efc669c59b11db7442943c29553d37c5d5d79defb697382ac7eac11298f87dc92d7e8dc1e0ad26e7cf5262b532ac97ac
+  metadata.gz: 9bf493ab7a8d154f11c17b992d93abb8695e3c92b9286a8be3c14d0aad1d95568f2abb5467cbb86416a082cfda21eda542103cffd0e039aae32bbe34d9b3575f
+  data.tar.gz: a11da75e206b70b6c1fb8cee5f0e3f132ddaa74b10beb3a51e946271f415367511cddce3f6a9c307ba8eb46ba7fcd64f8094c5ca2fbf5604de3c5c86ee4cc395

data/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [1.1.3] - 2026-06-13
+
+### Fixed
+
+- `rake pilipinas:load` now upserts ActiveRecord seed rows by `location_id` instead of `code`, matching the stable identifier from `lib/data/pilipinas_data.yml`.
+- `rails generate pilipinas:code_indexes` now generates a migration that adds unique `location_id` indexes to all four `pilipinas_*` tables, matching the loader's upsert conflict target.
+
+### Changed
+
+- Updated loader upgrade guidance and README wording to reference the required `location_id` unique indexes.
+
+### Tests
+
+- Added regression coverage that asserts `Loader.bulk_insert` uses `location_id` as the `upsert_all` unique key and reports the matching missing-index guidance.
+
+---
+
 ## [1.1.2] - 2026-06-12
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pilipinas (1.1.2)
+    pilipinas (1.1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -76,7 +76,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.8)
+    json (2.19.9)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -280,7 +280,7 @@ CHECKSUMS
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
-  json (2.19.8) sha256=6354310fd76ef69b87d5bd1f38b40d730613baf90b6803d2d0a48f618d32dfaa
+  json (2.19.9) sha256=9b9025b7cdddafa38d316eca0b2358488e42d417045c1b90d216a9fefe46b79a
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
@@ -296,7 +296,7 @@ CHECKSUMS
   nokogiri (1.19.3-x86_64-linux-musl) sha256=248c906d2166eca5efb56d52fdee5f9a1f51d69a72e2b64fdac647b4ce39ea3f
   parallel (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
   parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
-  pilipinas (1.1.2)
+  pilipinas (1.1.3)
   pp (0.6.3) sha256=2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
   prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85

data/README.md

@@ -177,7 +177,7 @@ rake pilipinas:load
 > **Upgrading from an older version?**
 >
 > If `rake pilipinas:load` raises
-> `Pilipinas::Error: pilipinas:load requires a unique index on the code column`,
+> `Pilipinas::Error: pilipinas:load requires a unique index on the location_id column`,
 > your database was created with an earlier migration that did not include those
 > indexes. Add them with the dedicated generator:
 >

data/lib/generators/pilipinas/code_indexes_generator.rb

@@ -4,13 +4,13 @@ require 'rails/generators/base'
 require 'rails/generators/active_record'
 
 module Pilipinas
-  # Rails generator that adds unique indexes on the +code+ column to all four
-  # pilipinas_* tables.
+  # Rails generator that adds unique indexes on the +location_id+ column to all
+  # four pilipinas_* tables.
   #
   # Run this if your database was created with an older version of the gem
   # that did not include these indexes, and +rake pilipinas:load+ raises:
   #
-  #   ArgumentError: No unique index found for code
+  #   ArgumentError: No unique index found for location_id
   #
   # @example
   #   rails generate pilipinas:code_indexes
@@ -23,7 +23,7 @@ module Pilipinas
 
     def generate_migration
       migration_template 'templates/add_pilipinas_code_indexes.rb',
-                         'db/migrate/add_pilipinas_code_indexes.rb'
+                         'db/migrate/add_pilipinas_location_id_indexes.rb'
     end
 
     # @param _dir [String] unused (required by the interface)

data/lib/generators/templates/add_pilipinas_code_indexes.rb

@@ -1,8 +1,8 @@
-class AddPilipinasCodeIndexes < ActiveRecord::Migration<%= migration_version %>
+class AddPilipinasLocationIdIndexes < ActiveRecord::Migration<%= migration_version %>
   def change
-    add_index :pilipinas_regions,   :code, unique: true, if_not_exists: true
-    add_index :pilipinas_provinces, :code, unique: true, if_not_exists: true
-    add_index :pilipinas_cities,    :code, unique: true, if_not_exists: true
-    add_index :pilipinas_barangays, :code, unique: true, if_not_exists: true
+    add_index :pilipinas_regions,   :location_id, unique: true, if_not_exists: true
+    add_index :pilipinas_provinces, :location_id, unique: true, if_not_exists: true
+    add_index :pilipinas_cities,    :location_id, unique: true, if_not_exists: true
+    add_index :pilipinas_barangays, :location_id, unique: true, if_not_exists: true
   end
 end

data/lib/pilipinas/loader.rb

@@ -42,15 +42,21 @@ module Pilipinas
       #
       # @return [void]
       def run
+        records = nil
         column_indexes, records = full_location_table
 
-        ActiveRecord::Base.transaction do
-          FULL_DATA_SEEDS.each do |model_name, type, attributes|
-            model = Db.const_get(model_name)
-            delete_stale_compact_rows(model)
-            seed_full_data(model, records, column_indexes, type, attributes)
+        ActiveRecord::Base.uncached do
+          ActiveRecord::Base.transaction do
+            FULL_DATA_SEEDS.each do |model_name, type, attributes|
+              model = Db.const_get(model_name)
+              delete_stale_compact_rows(model)
+              seed_full_data(model, records, column_indexes, type, attributes)
+            end
           end
         end
+      ensure
+        records&.clear
+        clear_query_cache
       end
 
       private
@@ -92,10 +98,11 @@ module Pilipinas
           next if batch.size < BATCH_SIZE
 
           bulk_insert(model, batch)
-          batch = []
+          batch.clear
         end
 
         bulk_insert(model, batch) unless batch.empty?
+        batch.clear
       end
 
       # @param record            [Array] full location dump row
@@ -135,16 +142,17 @@ module Pilipinas
         records.each_slice(BATCH_SIZE) do |slice|
           batch = slice.map { |r| r.transform_keys(&:to_s).merge('created_at' => now, 'updated_at' => now) }
           bulk_insert(model, batch)
+          batch.clear
         end
       end
 
       # Perform the most capable bulk-insert available for this AR version.
       #
       # +upsert_all+ (Rails 6.1+) is idempotent — it updates existing rows
-      # matched by the unique index on +code+, which is present in every YAML
-      # record.  Using +code+ (not +location_id+) as the conflict column is
-      # essential because +location_id+ is nullable and NULL != NULL in SQL —
-      # a unique index on a nullable column cannot reliably detect conflicts.
+      # matched by the unique index on +location_id+, the stable identifier in
+      # the full location dump. Compact rows from older loader versions have a
+      # NULL +location_id+ and are deleted before the canonical full-data rows
+      # are inserted.
       #
       # +insert_all+ (Rails 6.0) silently skips conflicts.
       # Legacy path: individual +create!+ calls (raises on conflict).
@@ -155,10 +163,10 @@ module Pilipinas
       def bulk_insert(model, batch)
         if model.respond_to?(:upsert_all)
           begin
-            model.upsert_all(batch, unique_by: :code)
+            model.upsert_all(batch, unique_by: :location_id)
           rescue ArgumentError
             raise Pilipinas::Error,
-                  'pilipinas:load requires a unique index on the `code` column, ' \
+                  'pilipinas:load requires a unique index on the `location_id` column, ' \
                   "which is missing from #{model.table_name}. " \
                   'Your database was likely created with an older version of the gem. ' \
                   "Run the following to add the missing indexes and retry:\n\n  " \
@@ -170,6 +178,17 @@ module Pilipinas
         else
           batch.each { |attrs| model.unscoped.create!(attrs) }
         end
+      ensure
+        clear_query_cache
+      end
+
+      # Clear any per-connection query-cache state so a long-running Rails
+      # process does not retain loader queries or bind values between batches.
+      #
+      # @return [void]
+      def clear_query_cache
+        connection = ActiveRecord::Base.connection
+        connection.clear_query_cache if connection.respond_to?(:clear_query_cache)
       end
 
       # @return [Time] current UTC time, compatible with or without ActiveSupport

data/lib/pilipinas/version.rb

@@ -4,5 +4,5 @@ module Pilipinas
   # Semantic version of the gem.
   #
   # Follows {https://semver.org Semantic Versioning}: MAJOR.MINOR.PATCH.
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pilipinas
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Nujian Den Mark Meralpis