If a segment in the pattern is ''%d'', it will match any non-empty segment that is an integer. If a segment in the pattern is ''%s'', it will match any non-empty segment in the path

Author: Olivier Auverlot

examples/official-site/sqlpage/migrations/08_functions.sql

@@ -549,21 +549,21 @@ VALUES (
 
 ```sql
 select ''text'' AS component;
-select sqlpage.is_path_matching(sqlpage.path(),''/api/%/%/%'') AS contents;
+select sqlpage.is_path_matching(sqlpage.path(),''/api/v1/user/%d/%s'') AS contents;
 ```
 
 #### Result
 
-`/api/v1/user/42`
+`/api/v1/user/42/name`
 
 #### Notes
 
 - The pattern is a list of segments separated by ''/''.
 - If the path is NULL, or the pattern is NULL, it will return an empty string.
 - If the path and pattern have different numbers of segments, it will return an empty string.
 - If the path and pattern have the same number of segments, it will compare them segment by segment.
-- If a segment in the pattern is ''%'', it will match any non-empty segment in the path.
-- If a segment in the pattern is a string, it will match the corresponding segment in the path if they are equal.
+- If a segment in the pattern is ''%d'', it will match any non-empty segment that is an integer.
+- If a segment in the pattern is ''%s'', it will match any non-empty segment in the path.
 - If all segments match, it will return the path.
 - Otherwise, it will return an empty string.
 '

src/webserver/database/sqlpage_functions/functions.rs

@@ -829,10 +829,15 @@ async fn is_path_matching<'a>(
     }
 
     for (ps, pat_s) in path_segments.iter().zip(pattern_segments.iter()) {
-        if *pat_s == "%" {
+        if *pat_s == "%s" {
             if ps.is_empty() {
                 return Some(Cow::Borrowed(""));
             }
+        } else if *pat_s == "%d" {
+            let ps_decoded = percent_encoding::percent_decode_str(ps).decode_utf8_lossy();
+            if ps_decoded.is_empty() || ps_decoded.parse::<i64>().is_err() {
+                return Some(Cow::Borrowed(""));
+            }
         } else {
             let ps_decoded = percent_encoding::percent_decode_str(ps).decode_utf8_lossy();
             let pat_s_decoded = percent_encoding::percent_decode_str(pat_s).decode_utf8_lossy();