e621_export_downloader 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7259f8077bf1df8805620f4efa3fbeac43c29616e496bea576518275794c5fef
-  data.tar.gz: 4b23216298e535aeed4ceaeb7f38f581bf6fc6fb68c1f7fa94975e9157f7bf71
+  metadata.gz: c5d969922b067f0eb6f92d7f73497105d17a2d228b86a34931f24eaed48c2312
+  data.tar.gz: f85056aa89a468b019ae03585b53470d0b1c1d8d31c335f1c47e000e7727c743
 SHA512:
-  metadata.gz: 50436457d2de9e91e8f938631484653a71d8102122ec58f77c8c6287454092c38ef6719215a4aa20cb676978d659ce936750338667d892045027b4ee0a0fa0ed
-  data.tar.gz: b8a0c19646cd5b7ed2076b023adabc016962700dcc4c755ef2b66d3f3b018349be45aafca1c4be1dc8c0be9c8f2dd6de5f1529f6ea27f45a04df5660d6f6f1a9
+  metadata.gz: df8d73bb8eaea951cb41e26c0384647f5219ec71518962986d88a014ded3592454e8ea64bf07c2f4acf44a23b42de0e47b1bbda8134dd42631481ccafb6a3615
+  data.tar.gz: c7fce51d4283904e52f3defd64fa1de02a4a624a52983cd571123a9124349f4b71edb934d40f7f68d34dd4bbb28c580b28bc423fd221413082771c0d91ec12e5

data/lib/e621/csv_importable.rb

@@ -49,9 +49,11 @@ module E621
       model.connection.execute("TRUNCATE #{model.quoted_table_name}") if truncate
       indexes.each_key { |name| model.connection.execute("DROP INDEX IF EXISTS #{name}") }
 
-      count = copy_csv(csv_path, chunk_bytes: chunk_bytes)
-
-      indexes.each_value { |ddl| model.connection.execute(ddl) }
+      count = begin
+        copy_csv(csv_path, chunk_bytes: chunk_bytes)
+      ensure
+        indexes.each_value { |ddl| model.connection.execute(ddl) }
+      end
       self.row_count = count
       count
     end

data/lib/e621_export_downloader/export.rb

@@ -55,7 +55,7 @@ module E621ExportDownloader
       client.debug("downloading export", header: ["export:#{type.serialize}"])
 
       FileUtils.mkdir_p(Constants::TEMP_DIR)
-      digest = T.let(client.options.validate_checksum ? Digest::MD5.new : nil, T.nilable(Digest::MD5))
+      digest = T.let(client.options.validate_checksum ? Digest::SHA256.new : nil, T.nilable(Digest::SHA256))
       File.open(file_path, "wb") do |file|
         inflater = Zlib::Inflate.new(Zlib::MAX_WBITS + 16)
 

data/lib/e621_export_downloader/version.rb

@@ -4,7 +4,7 @@
 # loaded by bundler
 module E621ExportDownloader
   module Constants
-    VERSION = "0.0.18"
+    VERSION = "0.0.19"
     WEBSITE = "https://github.com/DonovanDMC/E621ExportDownloader.rb"
   end
 end

data/test/csv_importable_postgres_test.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+require("minitest/autorun")
+require("tempfile")
+require("active_record")
+require("e621_export_downloader")
+require("e621/csv_importable")
+require("e621/row_count")
+
+class CsvImportablePostgresTestModel < ActiveRecord::Base
+  extend(E621::CsvImportable)
+
+  self.table_name = "import_index_test_tags"
+  self.record_timestamps = false
+end
+
+class CsvImportablePostgresTest < Minitest::Test
+  INDEX_NAME = "index_import_index_test_tags_on_name"
+
+  def setup
+    skip("set E621_TEST_DATABASE_URL to run PostgreSQL import tests") unless ENV["E621_TEST_DATABASE_URL"]
+
+    ActiveRecord::Base.establish_connection(ENV.fetch("E621_TEST_DATABASE_URL"))
+    @tempfiles = []
+    setup_schema
+  end
+
+  def teardown
+    return unless ENV["E621_TEST_DATABASE_URL"]
+
+    connection.execute("DROP TABLE IF EXISTS import_index_test_tags")
+    connection.execute("DROP TABLE IF EXISTS e621.row_counts")
+    @tempfiles&.each(&:unlink)
+  end
+
+  def test_recreate_indexes_restores_postgres_indexes_after_successful_import
+    count = CsvImportablePostgresTestModel.import_from_csv(csv_file(successful_csv), truncate: true, recreate_indexes: true, chunk_bytes: 8)
+
+    assert_equal(2, count)
+    assert_equal(2, CsvImportablePostgresTestModel.count)
+    assert_index_exists
+  end
+
+  def test_recreate_indexes_restores_postgres_indexes_after_import_error
+    error = assert_raises(StandardError) do
+      CsvImportablePostgresTestModel.import_from_csv(csv_file(invalid_csv), truncate: true, recreate_indexes: true, chunk_bytes: 8)
+    end
+
+    assert_match(/COPY|missing data|extra data|invalid input/i, error.message)
+    assert_index_exists
+  end
+
+  private
+
+  def setup_schema
+    connection.execute("CREATE SCHEMA IF NOT EXISTS e621")
+    connection.execute(<<~SQL)
+      CREATE TABLE IF NOT EXISTS e621.row_counts (
+        table_name varchar PRIMARY KEY,
+        count bigint NOT NULL DEFAULT 0
+      )
+    SQL
+    connection.execute("DROP TABLE IF EXISTS import_index_test_tags")
+    connection.execute(<<~SQL)
+      CREATE TABLE import_index_test_tags (
+        id bigint PRIMARY KEY,
+        name text NOT NULL,
+        post_count integer NOT NULL
+      )
+    SQL
+    connection.execute("CREATE INDEX #{INDEX_NAME} ON import_index_test_tags (name)")
+  end
+
+  def successful_csv
+    <<~CSV
+      id,name,post_count
+      1,alpha,10
+      2,beta,20
+    CSV
+  end
+
+  def invalid_csv
+    <<~CSV
+      id,name,post_count
+      1,alpha
+    CSV
+  end
+
+  def csv_file(content)
+    file = Tempfile.new(["e621-import", ".csv"])
+    file.write(content)
+    file.close
+    @tempfiles << file
+    file.path
+  end
+
+  def assert_index_exists
+    assert(index_exists?, "expected PostgreSQL index #{INDEX_NAME} to exist")
+  end
+
+  def index_exists?
+    connection.select_value(<<~SQL)
+      SELECT EXISTS (
+        SELECT 1
+        FROM pg_class c
+        JOIN pg_namespace n ON n.oid = c.relnamespace
+        WHERE c.relkind = 'i'
+          AND c.relname = #{connection.quote(INDEX_NAME)}
+      )
+    SQL
+  end
+
+  def connection
+    ActiveRecord::Base.connection
+  end
+end

data/test/export_test.rb

@@ -39,7 +39,7 @@ class ExportChecksumTest < Minitest::Test
   def setup
     @csv_content = "id,name\n1,foo\n"
     @compressed = Zlib.gzip(@csv_content)
-    @checksum = Digest::MD5.hexdigest(@compressed)
+    @checksum = Digest::SHA256.hexdigest(@compressed)
     # split across chunks to exercise streaming, matching how a real download arrives
     midpoint = @compressed.bytesize / 2
     @chunks = [@compressed.byteslice(0, midpoint), @compressed.byteslice(midpoint..)]
@@ -79,14 +79,14 @@ class ExportChecksumTest < Minitest::Test
   end
 
   def test_download_raises_and_removes_the_file_when_checksum_does_not_match
-    export = build_export(checksum: "0" * 32, validate_checksum: true)
+    export = build_export(checksum: "0" * 64, validate_checksum: true)
     error = assert_raises(E621ExportDownloader::ResolveError) { export.download }
     assert_match(/Checksum mismatch/, error.message)
     assert_empty(Dir.children(E621ExportDownloader::Constants::TEMP_DIR))
   end
 
   def test_download_ignores_checksum_mismatch_when_validation_is_disabled
-    export = build_export(checksum: "0" * 32, validate_checksum: false)
+    export = build_export(checksum: "0" * 64, validate_checksum: false)
     path = export.download
     assert(File.exist?(path))
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: e621_export_downloader
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Donovan_DMC
 bindir: exe
 cert_chain: []
-date: 2026-07-05 00:00:00.000000000 Z
+date: 2026-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -223,6 +223,7 @@ files:
 - sorbet/rbi/todo.rbi
 - sorbet/tapioca/config.yml
 - sorbet/tapioca/require.rb
+- test/csv_importable_postgres_test.rb
 - test/export_test.rb
 - test/generators/install_generator_test.rb
 homepage: https://github.com/DonovanDMC/E621ExportDownloader.rb