database/semver_ord: Return null if version number can't be parsed

Author: Turbo87

crates/crates_io_database/tests/semver_ord.rs

@@ -1,6 +1,6 @@
 use crates_io_test_db::TestDatabase;
 use diesel::prelude::*;
-use diesel::sql_types::Text;
+use diesel::sql_types::{Nullable, Text};
 use diesel_async::RunQueryDsl;
 use std::fmt::Debug;
 
@@ -14,15 +14,16 @@ async fn test_jsonb_output() {
 
         #[derive(QueryableByName)]
         struct Row {
-            #[diesel(sql_type = Text)]
-            output: String,
+            #[diesel(sql_type = Nullable<Text>)]
+            output: Option<String>,
         }
 
         diesel::sql_query(query)
             .get_result::<Row>(&mut conn)
             .await
             .unwrap()
             .output
+            .unwrap_or_default()
     };
 
     insta::assert_snapshot!(check("0.0.0").await, @r#"
[0, 0, 0, {}]"#);
@@ -32,7 +33,7 @@ async fn test_jsonb_output() {
     insta::assert_snapshot!(check("1.0.0-0.HDTV-BluRay.1020p.YTSUB.L33TRip.mkv").await, @r#"
[1, 0, 0, [false, 0, true, "HDTV-BluRay", true, "1020p", true, "YTSUB", true, "L33TRip", true, "mkv", null, null, null, null, null, null, null, null, ""]]"#);
 
     // Invalid version string
-    insta::assert_snapshot!(check("foo").await, @"[null, null, null, {}]");
+    insta::assert_snapshot!(check("foo").await, @"");
 
     // Version string with a lot of prerelease identifiers
     insta::assert_snapshot!(check("1.2.3-1.2.3.4.5.6.7.8.9.10.11.12.13.14.15.16.17.end").await, @r#"
[1, 2, 3, [false, 1, false, 2, false, 3, false, 4, false, 5, false, 6, false, 7, false, 8, false, 9, false, 10, "11.12.13.14.15.16.17.end"]]"#);

migrations/2025-03-06-060640_semver_ord/up.sql

@@ -18,6 +18,10 @@ declare
     prerelease_part text;
     i int := 0;
 begin
+    if match_result is null then
+        return null;
+    end if;
+
     if match_result[4] is null then
         -- A JSONB object has higher precedence than an array, and versions with
         -- prerelease specifiers should have lower precedence than those without.
@@ -67,7 +71,7 @@ comment on function semver_ord is 'Converts a semver string into a JSONB array f
 -- Add corresponding column to the `versions` table.
 
 alter table versions
-    add semver_ord jsonb default 'null'::jsonb not null;
+    add semver_ord jsonb;
 
 comment on column versions.semver_ord is 'JSONB representation of the version number for sorting purposes.';