Use ON CONFLICT upsert for genres

Replace the previous IF EXISTS/UPDATE/INSERT logic in the update_genre
PL/pgSQL function with a single INSERT ... ON CONFLICT DO UPDATE to
perform an atomic upsert and avoid races. Reformat the client.execute
call for readability.

.github/workflows/rust-clippy.yml

@@ -0,0 +1,55 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# rust-clippy is a tool that runs a bunch of lints to catch common
+# mistakes in your Rust code and help improve your Rust code.
+# More details at https://github.com/rust-lang/rust-clippy
+# and https://rust-lang.github.io/rust-clippy/
+
+name: rust-clippy analyze
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+  schedule:
+    - cron: '38 0 * * 4'
+
+jobs:
+  rust-clippy-analyze:
+    name: Run rust-clippy analyzing
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      security-events: write
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          components: clippy
+          override: true
+
+      - name: Install required cargo
+        run: cargo install clippy-sarif sarif-fmt
+
+      - name: Run rust-clippy
+        run:
+          cargo clippy
+          --all-features
+          --message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
+        continue-on-error: true
+
+      - name: Upload analysis results to GitHub
+        uses: github/codeql-action/upload-sarif@v4
+        with:
+          sarif_file: rust-clippy-results.sarif
+          wait-for-processing: true

.gitignore

@@ -1,2 +1,3 @@
 /target
-.vscode
+/.vscode
+/bruno

Cargo.toml

@@ -19,7 +19,7 @@ strip = false
 
 
 [dependencies]
-sql-parse = "0.24.0"
+sql-parse = "0.26.0"
 tokio = { version = "1.44.2", features = ["full"] }
 tokio-postgres = { version = "0.7.13", features = ["with-chrono-0_4"] }
 deadpool-postgres = "0.14.1"
@@ -29,18 +29,18 @@ futures =  "0.3.31"
 reqwest = { version = "0.12.15", features = ["stream"] }
 tokio-util = { version = "0.7.14", features = ["compat"] }
 async-compression = { version = "0.4.21", features = ["futures-io", "gzip"] }
-sentry = { version = "0.41.0", features = ["debug-images"] }
+sentry = { version = "0.42.0", features = ["debug-images"] }
 lazy_static = "1.5.0"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 tokio-cron-scheduler = "0.14.0"
 axum = "0.8.1"
-ammonia = "4.0.0"
+ammonia = "4.1.2"
 maplit = "1.0.2"
 
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"]}
-sentry-tracing = "0.41.0"
+sentry-tracing = "0.42.0"
 
 tower-http = { version = "0.6.2", features = ["trace"] }
 dotenvy = "0.15.0"

src/types.rs

@@ -828,30 +828,28 @@ impl FromVecExpression<Genre> for Genre {
 #[async_trait]
 impl Update for Genre {
     async fn before_update(client: &Client) -> Result<(), Box<tokio_postgres::Error>> {
-        match client.execute(
-            "
-            CREATE OR REPLACE FUNCTION update_book_sequence(source_ smallint, book_ integer, genre_ integer) RETURNS void AS $$
-                DECLARE
-                    book_id integer := -1;
-                    genre_id integer := -1;
+        match client
+            .execute(
+                "
+            CREATE OR REPLACE FUNCTION update_genre(
+                source_ smallint, remote_id_ int, code_ varchar, description_ varchar, meta_ varchar
+            ) RETURNS void AS $$
                 BEGIN
-                    SELECT id INTO book_id FROM books WHERE source = source_ AND remote_id = book_;
-
-                    IF book_id IS NULL THEN
-                        RETURN;
-                    END IF;
-
-                    SELECT id INTO genre_id FROM genres WHERE source = source_ AND remote_id = genre_;
-                    IF EXISTS (SELECT * FROM book_genres WHERE book = book_id AND genre = genre_id) THEN
-                        RETURN;
-                    END IF;
-                    INSERT INTO book_genres (book, genre) VALUES (book_id, genre_id);
+                    INSERT INTO genres (source, remote_id, code, description, meta)
+                        VALUES (source_, remote_id_, code_, description_, meta_)
+                    ON CONFLICT (source, remote_id) DO UPDATE SET
+                        code = EXCLUDED.code,
+                        description = EXCLUDED.description,
+                        meta = EXCLUDED.meta;
                 END;
             $$ LANGUAGE plpgsql;
-            "
-            , &[]).await {
-                Ok(_) => Ok(()),
-                Err(err) => Err(Box::new(err)),
+            ",
+                &[],
+            )
+            .await
+        {
+            Ok(_) => Ok(()),
+            Err(err) => Err(Box::new(err)),
         }
     }
 

src/updater.rs

@@ -55,7 +55,7 @@ async fn download_file(filename_str: &str) -> Result<(), Box<dyn std::error::Err
 
     let data = response
         .bytes_stream()
-        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+        .map_err(std::io::Error::other)
         .into_async_read();
 
     let decoder = GzipDecoder::new(data);