Ignore SQL comments in AT warning scans

Author: nicosuave

yardstick-rs/src/sql/measures.rs

@@ -5646,12 +5646,44 @@ fn skip_sql_whitespace(bytes: &[u8], mut i: usize) -> usize {
     i
 }
 
+fn skip_warning_identifier_comment(bytes: &[u8], i: usize) -> Option<usize> {
+    if i + 1 >= bytes.len() {
+        return None;
+    }
+
+    if bytes[i] == b'-' && bytes[i + 1] == b'-' {
+        let mut next = i + 2;
+        while next < bytes.len() && bytes[next] != b'\n' && bytes[next] != b'\r' {
+            next += 1;
+        }
+        return Some(next);
+    }
+
+    if bytes[i] == b'/' && bytes[i + 1] == b'*' {
+        let mut next = i + 2;
+        while next + 1 < bytes.len() {
+            if bytes[next] == b'*' && bytes[next + 1] == b'/' {
+                return Some(next + 2);
+            }
+            next += 1;
+        }
+        return Some(bytes.len());
+    }
+
+    None
+}
+
 fn extract_where_filter_identifiers(where_clause: &str) -> Vec<String> {
     let mut identifiers = Vec::new();
     let bytes = where_clause.as_bytes();
     let mut i = 0;
 
     while i < bytes.len() {
+        if let Some(next) = skip_warning_identifier_comment(bytes, i) {
+            i = next;
+            continue;
+        }
+
         match bytes[i] {
             b'\'' => {
                 i = skip_quoted_sql(bytes, i, b'\'');
@@ -7131,6 +7163,42 @@ FROM orders"#;
         assert!(warning.contains("year"));
     }
 
+    #[test]
+    fn test_at_all_ignores_where_filter_line_comment_identifiers() {
+        let source_dims = HashSet::from([
+            normalize_identifier_name("year"),
+            normalize_identifier_name("region"),
+        ]);
+        let warning = warning_for_at_all_ungrouped_where(
+            "revenue",
+            &[ContextModifier::All("region".to_string())],
+            Some("TRUE -- year"),
+            &["region".to_string()],
+            &source_dims,
+        );
+        assert!(warning.is_none());
+    }
+
+    #[test]
+    fn test_at_all_ignores_at_where_block_comment_identifiers() {
+        let source_dims = HashSet::from([
+            normalize_identifier_name("year"),
+            normalize_identifier_name("region"),
+        ]);
+        let warning = warning_for_at_all_ungrouped_where(
+            "revenue",
+            &[
+                ContextModifier::All("region".to_string()),
+                ContextModifier::Where("1 = 1 /* year */".to_string()),
+            ],
+            Some("year = 2024"),
+            &["region".to_string()],
+            &source_dims,
+        )
+        .unwrap();
+        assert!(warning.contains("year"));
+    }
+
     #[test]
     fn test_at_all_does_not_warn_when_at_where_encodes_filter_dimension() {
         let source_dims = HashSet::from([