database/semver_ord: Add remaining prerelease identifiers as final text item

Author: Turbo87

crates/crates_io_database/tests/semver_ord.rs

@@ -26,16 +26,16 @@ async fn test_jsonb_output() {
     };
 
     insta::assert_snapshot!(check("0.0.0").await, @r#"
[0, 0, 0, {}]"#);
-    insta::assert_snapshot!(check("1.0.0-alpha.1").await, @r#"[1, 0, 0, [true, "alpha", false, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null]]"#);
+    insta::assert_snapshot!(check("1.0.0-alpha.1").await, @r#"[1, 0, 0, [true, "alpha", false, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ""]]"#);
 
-    // https://crates.io/crates/cursed-trying-to-break-cargo/1.0.0-0.HDTV-BluRay.1020p.YTSUB.L33TRip.mkv – thanks @Gankra!
-    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, null, null, null, null, null, null, null, null, null, null]]"#);
+    // see https://crates.io/crates/cursed-trying-to-break-cargo/1.0.0-0.HDTV-BluRay.1020p.YTSUB.L33TRip.mkv – thanks @Gankra!
+    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, {}]");
 
     // 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, @"[1, 2, 3, [false, 1, false, 2, false, 3, false, 4, false, 5, false, 6, false, 7, false, 8, false, 9, false, 10, false, 11, false, 12, false, 13, false, 14, false, 15, false, 16]]");
+    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"]]"#);
 }
 
 /// This test checks that the `semver_ord` function orders versions correctly.

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

@@ -2,18 +2,19 @@
 
 create or replace function semver_ord(num varchar) returns jsonb as $$
 declare
-    -- We need to ensure that the array has the same length for all versions
-    -- since shorter arrays have lower precedence in JSONB. Since we also need
-    -- to add a boolean value for each part of the prerelease string, this
-    -- results in us supporting up to 15 parts in the prerelease string.
-    -- Everything beyond that will be ignored.
-    prerelease_array_length constant int := 30;
+    -- We need to ensure that the prerelease array has the same length for all
+    -- versions since shorter arrays have lower precedence in JSONB. We store
+    -- the first 10 parts of the prerelease string as pairs of booleans and
+    -- numbers or text values, and then a final text item for the remaining
+    -- parts.
+    max_prerelease_parts constant int := 10;
 
     -- We ignore the "build metadata" part of the semver string, since it has
     -- no impact on the version ordering.
     match_result text[] := regexp_match(num, '^(\d+).(\d+).(\d+)(?:-([0-9A-Za-z\-.]+))?');
 
     prerelease jsonb;
+    prerelease_parts text[];
     prerelease_part text;
     i int := 0;
 begin
@@ -22,11 +23,13 @@ begin
         -- prerelease specifiers should have lower precedence than those without.
         prerelease := json_build_object();
     else
-        prerelease := to_jsonb(array_fill(NULL::bool, ARRAY[prerelease_array_length]));
+        prerelease := to_jsonb(array_fill(NULL::bool, ARRAY[max_prerelease_parts * 2 + 1]));
 
         -- Split prerelease string by `.` and "append" items to
         -- the `prerelease` array.
-        foreach prerelease_part in array string_to_array(match_result[4], '.')
+        prerelease_parts := string_to_array(match_result[4], '.');
+
+        foreach prerelease_part in array prerelease_parts[1:max_prerelease_parts + 1]
         loop
             -- Parse parts as numbers if they consist of only digits.
             if regexp_like(prerelease_part, '^\d+$') then
@@ -42,8 +45,10 @@ begin
 
             -- Exit the loop if we have reached the maximum number of parts.
             i := i + 2;
-            exit when i > prerelease_array_length;
+            exit when i >= max_prerelease_parts * 2;
         end loop;
+
+        prerelease := jsonb_set(prerelease, array[(max_prerelease_parts * 2)::text], to_jsonb(array_to_string(prerelease_parts[max_prerelease_parts + 1:], '.')));
     end if;
 
     -- Return an array with the major, minor, patch, and prerelease parts.