pilipinas 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c053d3fbf05daa1c3bd6298945223e06a0c8154962f9958e8681701738a808b
-  data.tar.gz: 5613bb74fb432f59980cb54067d2d5fb0c2229807df82471e73131b884e00452
+  metadata.gz: 04ff6a464b6a25a7b5e47ed3ef768ebef163e2be65421f3bc2e757abf70d8e1d
+  data.tar.gz: ba4d5c34f920ad0c764df2fbb932faa0325771bef95c60753065a7a9b895ff74
 SHA512:
-  metadata.gz: 5b1fb8a1a22541315c95dddf2f8f027e88c9455a7fbcde7dd8af9a8483c844247224321aae75d627eab1a15121ef075df01430cfe9a50448dbf9191e83c53851
-  data.tar.gz: 453835a9b952e40983c10e50ba5f7321efc669c59b11db7442943c29553d37c5d5d79defb697382ac7eac11298f87dc92d7e8dc1e0ad26e7cf5262b532ac97ac
+  metadata.gz: fbd098e73fe2b1158946dc2a9076b1b0f402309d5d25689131056c2c9783c9728857c3f840108755fa4c111b7cdb6c6da5872e791dc29edab264bffbdaaff7f8
+  data.tar.gz: ab1056dac9fb59bd9c07e2256ce535a5e60acf1bbd5efda3447ac1e4b377542052d20ee31c8f92f7752225723bb67253e8ac0af2961629c3a84efcb7bbc22571

data/CHANGELOG.md

@@ -7,6 +7,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [1.1.4] - 2026-06-26
+
+### Changed
+
+- `rake pilipinas:load` now wraps the entire seed transaction in `ActiveRecord::Base.uncached` so a long-running Rails process cannot serve stale query-cache hits during seeding.
+- `Loader` clears the per-connection query cache after every `bulk_insert` batch and in the `run` `ensure` block, preventing cached bind-values from accumulating across batches.
+- Batch arrays are now cleared in-place (`batch.clear`) instead of being replaced by a new object, allowing Ruby's GC to reclaim the memory sooner.
+- The full location records table is released in `run`'s `ensure` block so memory is freed even if an exception interrupts seeding.
+
+### Dependencies
+
+- Updated `json` to 2.19.9.
+
+---
+
+## [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
@@ -94,6 +126,8 @@ Complete rewrite of the gem. Zero runtime dependencies.
 - Rails generator for migrations.
 - Railtie for automatic Rake task loading in Rails apps.
 
+[1.1.4]: https://github.com/denmarkmeralpis/pilipinas/compare/v1.1.3...v1.1.4
+[1.1.3]: https://github.com/denmarkmeralpis/pilipinas/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/denmarkmeralpis/pilipinas/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/denmarkmeralpis/pilipinas/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/denmarkmeralpis/pilipinas/compare/v1.0.0...v1.1.0

data/Gemfile

@@ -17,5 +17,6 @@ group :test do
   gem 'rubocop-rspec',    '~> 3.0',  require: false
   gem 'simplecov',        '~> 0.22', require: false
   gem 'simplecov-console', '~> 0.9', require: false
+  gem 'simplecov-lcov',    '~> 0.8', require: false
   gem 'webmock'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pilipinas (1.1.2)
+    pilipinas (1.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -48,12 +48,12 @@ GEM
     base64 (0.3.0)
     bigdecimal (4.1.2)
     builder (3.3.0)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.7)
     connection_pool (3.0.2)
     crack (1.0.1)
       bigdecimal
       rexml
-    crass (1.0.6)
+    crass (1.0.7)
     date (3.5.1)
     debug (1.11.1)
       irb (~> 1.10)
@@ -68,7 +68,7 @@ GEM
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     hashdiff (1.2.1)
-    i18n (1.14.8)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     io-console (0.8.2)
     irb (1.18.0)
@@ -76,7 +76,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.8)
+    json (2.20.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -86,27 +86,27 @@ GEM
     minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
-    nokogiri (1.19.3-aarch64-linux-gnu)
+    nokogiri (1.19.4-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.3-aarch64-linux-musl)
+    nokogiri (1.19.4-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.3-arm-linux-gnu)
+    nokogiri (1.19.4-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.3-arm-linux-musl)
+    nokogiri (1.19.4-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.3-arm64-darwin)
+    nokogiri (1.19.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-darwin)
+    nokogiri (1.19.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-musl)
+    nokogiri (1.19.4-x86_64-linux-musl)
       racc (~> 1.4)
     parallel (2.1.0)
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    pp (0.6.3)
+    pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
@@ -162,7 +162,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.87.0)
+    rubocop (1.88.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -196,6 +196,7 @@ GEM
       simplecov
       terminal-table
     simplecov-html (0.13.2)
+    simplecov-lcov (0.9.0)
     simplecov_json_formatter (0.1.4)
     sqlite3 (2.9.5-aarch64-linux-gnu)
     sqlite3 (2.9.5-aarch64-linux-musl)
@@ -248,6 +249,7 @@ DEPENDENCIES
   shoulda-matchers (~> 6.0)
   simplecov (~> 0.22)
   simplecov-console (~> 0.9)
+  simplecov-lcov (~> 0.8)
   sqlite3 (~> 2.0)
   webmock
 
@@ -263,10 +265,10 @@ CHECKSUMS
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
   bigdecimal (4.1.2) sha256=53d217666027eab4280346fba98e7d5b66baaae1b9c3c1c0ffe89d48188a3fbd
   builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
-  concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
+  concurrent-ruby (1.3.7) sha256=4412caec3a5ea2e5fdc52076724c071a81f2c0593d83b2ac8cbb8ca63b3151b0
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e
-  crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d
+  crass (1.0.7) sha256=94868719948664c89ddcaf0a37c65048413dfcb1c869470a5f7a7ceb5390b295
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
   debug (1.11.1) sha256=2e0b0ac6119f2207a6f8ac7d4a73ca8eb4e440f64da0a3136c30343146e952b6
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
@@ -277,27 +279,27 @@ CHECKSUMS
   erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9
   generator_spec (0.10.0) sha256=4343152308dcfb30bba7583fc0e79acf8c626597686cfe3e9b168f6ab745b37a
   hashdiff (1.2.1) sha256=9c079dbc513dfc8833ab59c0c2d8f230fa28499cc5efb4b8dd276cf931457cd1
-  i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
+  i18n (1.15.2) sha256=00f9eb62412fe593b2a65a97daa75300d37abb8f7202ec748e94b6d46a9dd1b5
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
-  json (2.19.8) sha256=6354310fd76ef69b87d5bd1f38b40d730613baf90b6803d2d0a48f618d32dfaa
+  json (2.20.0) sha256=9362bc6e55a952b056abf9167cf053358181c904cb70cd6eee0808ea830fc32b
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
   loofah (2.25.1) sha256=d436c73dbd0c1147b16c4a41db097942d217303e1f7728704b37e4df9f6d2e04
   minitest (6.0.6) sha256=153ea36d1d987a62942382b61075745042a2b3123b1cd48f4c3675af9cc7d6f1
-  nokogiri (1.19.3-aarch64-linux-gnu) sha256=46b89e5d7b9e844c2ee360794240c6ea2a4e6fa0c5892a4ed487db621224b639
-  nokogiri (1.19.3-aarch64-linux-musl) sha256=8392dfdcd21be7a94dbbe9ccc138dea01b97b24cb2dc02a114ca98bfb1d9a0b7
-  nokogiri (1.19.3-arm-linux-gnu) sha256=3919d5ffc334ad778a4a9eb88fda7dcb8b1fb58c8a52ac640c6dcd2f038e774f
-  nokogiri (1.19.3-arm-linux-musl) sha256=9ce1cb6346bb9c67b1550eb537aa183ead91e4b6eadb2f36ade02d8dd2a79fb6
-  nokogiri (1.19.3-arm64-darwin) sha256=71b9bd424b1b7abc18b05052a1a3cfd3627abdca62be280854cc411791357e42
-  nokogiri (1.19.3-x86_64-darwin) sha256=77f3fba57d46c53ab31e62fc6c28f705109d1bf6264356c76f132b2be5728d4d
-  nokogiri (1.19.3-x86_64-linux-gnu) sha256=2f5078620fe12e83669b5b17311b32532a8153d02eee7ad06948b926d6080976
-  nokogiri (1.19.3-x86_64-linux-musl) sha256=248c906d2166eca5efb56d52fdee5f9a1f51d69a72e2b64fdac647b4ce39ea3f
+  nokogiri (1.19.4-aarch64-linux-gnu) sha256=1269fb644a6de405057a53dd5c762b1209b43ca7424f839454d3dbc677c31a8f
+  nokogiri (1.19.4-aarch64-linux-musl) sha256=35c65b9ce72b3bb03207bdbe7067915019dc18c1b9b59139684bd6690fdd01af
+  nokogiri (1.19.4-arm-linux-gnu) sha256=a301313e38bb065d68239e79734bcd6f56fb6efaacebde29e9abf2a4735340ca
+  nokogiri (1.19.4-arm-linux-musl) sha256=588923c101bcfa78869734d247d25b598674323e7f22474fc468f6e5647311eb
+  nokogiri (1.19.4-arm64-darwin) sha256=a46db9853286e6597b36ebc6953817d15acf3a299583eb3f89fdc6f91dd63527
+  nokogiri (1.19.4-x86_64-darwin) sha256=7fd17057d3e1f00e9954a74b3cd76595d3d4a5ef233b7ed9599047c204f70551
+  nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a
+  nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b
   parallel (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
   parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
-  pilipinas (1.1.2)
-  pp (0.6.3) sha256=2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6
+  pilipinas (1.1.4)
+  pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
   prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
   psych (5.4.0) sha256=14f72d69a611af663d7d70e4a7b67d9eb1f3ae9f8d916b478961d5a0075ba5b7
@@ -321,7 +323,7 @@ CHECKSUMS
   rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
   rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
-  rubocop (1.87.0) sha256=b9d9ddf55116a513f8ef2c7ae660662d8b49301f118d3f0df61865b33a5c188d
+  rubocop (1.88.0) sha256=e420ddf1662d0ef34bc8a2910ac4b396a7ddda0b51a708264405241734b08e0b
   rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2
@@ -331,6 +333,7 @@ CHECKSUMS
   simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
   simplecov-console (0.9.5) sha256=b1108bcfff5f210143e2b8301698c367b01586f20d25a73e95475a5df6fc6ff6
   simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
+  simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd
   simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
   sqlite3 (2.9.5-aarch64-linux-gnu) sha256=78075b6337d3d182c6d2b4691049ed45cd220826160c9ea18946bf6a1de200dc
   sqlite3 (2.9.5-aarch64-linux-musl) sha256=18c801185deb4adc01ddb281e8f672a39e3d1729979ca91e39439cd3eac0402d

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.4'
 end

metadata

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