sql-cli 1.73.0

SQL query tool for CSV/JSON with both interactive TUI and non-interactive CLI modes - perfect for exploration and automation
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
use crate::recursive_parser::{Lexer, Token};
use crate::where_ast::{ComparisonOp, WhereExpr, WhereValue};
use anyhow::{anyhow, Result};
use chrono::{Datelike, Local};

pub struct WhereParser {
    tokens: Vec<Token>,
    current: usize,
    columns: Vec<String>,
    case_insensitive: bool,
}

impl WhereParser {
    pub fn parse(where_clause: &str) -> Result<WhereExpr> {
        Self::parse_with_columns(where_clause, vec![])
    }

    pub fn parse_with_columns(where_clause: &str, columns: Vec<String>) -> Result<WhereExpr> {
        Self::parse_with_options(where_clause, columns, false)
    }

    pub fn parse_with_options(
        where_clause: &str,
        columns: Vec<String>,
        case_insensitive: bool,
    ) -> Result<WhereExpr> {
        let mut lexer = Lexer::new(where_clause);
        let mut tokens = Vec::new();

        loop {
            let token = lexer.next_token();
            if matches!(token, Token::Eof) {
                break;
            }
            tokens.push(token);
        }

        let mut parser = WhereParser {
            tokens,
            current: 0,
            columns,
            case_insensitive,
        };
        parser.parse_or_expr()
    }

    fn current_token(&self) -> Option<&Token> {
        self.tokens.get(self.current)
    }

    fn peek_token(&self) -> Option<&Token> {
        self.tokens.get(self.current + 1)
    }

    fn advance(&mut self) -> Option<&Token> {
        let token = self.tokens.get(self.current);
        self.current += 1;
        token
    }

    fn expect_identifier(&mut self) -> Result<String> {
        // Check current token before advancing to avoid borrow issues
        let is_numeric_column = if let Some(Token::NumberLiteral(num)) = self.current_token() {
            self.columns.iter().any(|col| col == num)
        } else {
            false
        };

        match self.advance() {
            Some(Token::Identifier(name)) => Ok(name.clone()),
            Some(Token::QuotedIdentifier(name)) => Ok(name.clone()), // Handle quoted column names
            Some(Token::NumberLiteral(num)) => {
                // Check if this number matches a known column name
                if is_numeric_column {
                    Ok(num.clone())
                } else {
                    Err(anyhow!("Expected identifier, got number {}", num))
                }
            }
            _ => Err(anyhow!("Expected identifier")),
        }
    }

    fn parse_value(&mut self) -> Result<WhereValue> {
        match self.current_token() {
            Some(Token::StringLiteral(_)) => {
                if let Some(Token::StringLiteral(s)) = self.advance() {
                    Ok(WhereValue::String(s.clone()))
                } else {
                    unreachable!()
                }
            }
            Some(Token::QuotedIdentifier(_)) => {
                // Handle double-quoted strings as string literals in value context
                if let Some(Token::QuotedIdentifier(s)) = self.advance() {
                    Ok(WhereValue::String(s.clone()))
                } else {
                    unreachable!()
                }
            }
            Some(Token::NumberLiteral(_)) => {
                if let Some(Token::NumberLiteral(n)) = self.advance() {
                    Ok(WhereValue::Number(n.parse::<f64>().unwrap_or(0.0)))
                } else {
                    unreachable!()
                }
            }
            Some(Token::Null) => {
                self.advance();
                Ok(WhereValue::Null)
            }
            Some(Token::DateTime) => {
                self.advance(); // consume DateTime
                self.expect_token(Token::LeftParen)?;

                // Check if empty (today at midnight)
                if matches!(self.current_token(), Some(Token::RightParen)) {
                    self.advance(); // consume )
                    let today = Local::now();
                    let date_str = format!(
                        "{:04}-{:02}-{:02} 00:00:00",
                        today.year(),
                        today.month(),
                        today.day()
                    );
                    Ok(WhereValue::String(date_str))
                } else {
                    // Parse year, month, day, etc.
                    let year = self.parse_number_value()? as i32;
                    self.expect_token(Token::Comma)?;
                    let month = self.parse_number_value()? as u32;
                    self.expect_token(Token::Comma)?;
                    let day = self.parse_number_value()? as u32;

                    let mut hour = 0u32;
                    let mut minute = 0u32;
                    let mut second = 0u32;

                    // Optional time components
                    if matches!(self.current_token(), Some(Token::Comma)) {
                        self.advance(); // consume comma
                        hour = self.parse_number_value()? as u32;

                        if matches!(self.current_token(), Some(Token::Comma)) {
                            self.advance(); // consume comma
                            minute = self.parse_number_value()? as u32;

                            if matches!(self.current_token(), Some(Token::Comma)) {
                                self.advance(); // consume comma
                                second = self.parse_number_value()? as u32;
                            }
                        }
                    }

                    self.expect_token(Token::RightParen)?;

                    let date_str =
                        format!("{year:04}-{month:02}-{day:02} {hour:02}:{minute:02}:{second:02}");
                    Ok(WhereValue::String(date_str))
                }
            }
            _ => Err(anyhow!("Expected value")),
        }
    }

    // Parse OR expressions (lowest precedence)
    fn parse_or_expr(&mut self) -> Result<WhereExpr> {
        let mut left = self.parse_and_expr()?;

        while let Some(Token::Or) = self.current_token() {
            self.advance(); // consume OR
            let right = self.parse_and_expr()?;
            left = WhereExpr::Or(Box::new(left), Box::new(right));
        }

        Ok(left)
    }

    // Parse AND expressions
    fn parse_and_expr(&mut self) -> Result<WhereExpr> {
        let mut left = self.parse_not_expr()?;

        while let Some(Token::And) = self.current_token() {
            self.advance(); // consume AND
            let right = self.parse_not_expr()?;
            left = WhereExpr::And(Box::new(left), Box::new(right));
        }

        Ok(left)
    }

    // Parse NOT expressions
    fn parse_not_expr(&mut self) -> Result<WhereExpr> {
        if let Some(Token::Not) = self.current_token() {
            self.advance(); // consume NOT
            let expr = self.parse_comparison_expr()?;
            Ok(WhereExpr::Not(Box::new(expr)))
        } else {
            self.parse_comparison_expr()
        }
    }

    // Parse comparison expressions
    fn parse_comparison_expr(&mut self) -> Result<WhereExpr> {
        // Check for parentheses
        if let Some(Token::LeftParen) = self.current_token() {
            self.advance(); // consume (
            let expr = self.parse_or_expr()?;
            match self.advance() {
                Some(Token::RightParen) => Ok(expr),
                _ => Err(anyhow!("Expected closing parenthesis")),
            }
        } else {
            self.parse_primary_expr()
        }
    }

    // Parse primary expressions (columns, methods, comparisons)
    fn parse_primary_expr(&mut self) -> Result<WhereExpr> {
        let column = self.expect_identifier()?;

        // Check for method calls
        if let Some(Token::Dot) = self.current_token() {
            self.advance(); // consume .
            let method = self.expect_identifier()?;

            match method.as_str() {
                "Contains" => {
                    self.expect_token(Token::LeftParen)?;
                    let value = self.parse_string_value()?;
                    self.expect_token(Token::RightParen)?;
                    if self.case_insensitive {
                        Ok(WhereExpr::ContainsIgnoreCase(column, value))
                    } else {
                        Ok(WhereExpr::Contains(column, value))
                    }
                }
                "StartsWith" => {
                    self.expect_token(Token::LeftParen)?;
                    let value = self.parse_string_value()?;
                    self.expect_token(Token::RightParen)?;
                    if self.case_insensitive {
                        Ok(WhereExpr::StartsWithIgnoreCase(column, value))
                    } else {
                        Ok(WhereExpr::StartsWith(column, value))
                    }
                }
                "EndsWith" => {
                    self.expect_token(Token::LeftParen)?;
                    let value = self.parse_string_value()?;
                    self.expect_token(Token::RightParen)?;
                    if self.case_insensitive {
                        Ok(WhereExpr::EndsWithIgnoreCase(column, value))
                    } else {
                        Ok(WhereExpr::EndsWith(column, value))
                    }
                }
                "Length" => {
                    self.expect_token(Token::LeftParen)?;
                    self.expect_token(Token::RightParen)?;

                    // Parse comparison operator
                    let op = self.parse_comparison_op()?;
                    let value = self.parse_number_value()?;
                    Ok(WhereExpr::Length(column, op, value as i64))
                }
                "ToLower" => {
                    self.expect_token(Token::LeftParen)?;
                    self.expect_token(Token::RightParen)?;

                    // Parse comparison operator
                    let op = self.parse_comparison_op()?;
                    let value = self.parse_string_value()?;
                    Ok(WhereExpr::ToLower(column, op, value))
                }
                "ToUpper" => {
                    self.expect_token(Token::LeftParen)?;
                    self.expect_token(Token::RightParen)?;

                    // Parse comparison operator
                    let op = self.parse_comparison_op()?;
                    let value = self.parse_string_value()?;
                    Ok(WhereExpr::ToUpper(column, op, value))
                }
                "IsNullOrEmpty" => {
                    self.expect_token(Token::LeftParen)?;
                    self.expect_token(Token::RightParen)?;
                    Ok(WhereExpr::IsNullOrEmpty(column))
                }
                _ => Err(anyhow!("Unknown method: {}", method)),
            }
        } else {
            // Check for operators
            match self.current_token() {
                Some(Token::Equal) => {
                    self.advance();
                    let value = self.parse_value()?;
                    Ok(WhereExpr::Equal(column, value))
                }
                Some(Token::NotEqual) => {
                    self.advance();
                    let value = self.parse_value()?;
                    Ok(WhereExpr::NotEqual(column, value))
                }
                Some(Token::GreaterThan) => {
                    self.advance();
                    let value = self.parse_value()?;
                    Ok(WhereExpr::GreaterThan(column, value))
                }
                Some(Token::GreaterThanOrEqual) => {
                    self.advance();
                    let value = self.parse_value()?;
                    Ok(WhereExpr::GreaterThanOrEqual(column, value))
                }
                Some(Token::LessThan) => {
                    self.advance();
                    let value = self.parse_value()?;
                    Ok(WhereExpr::LessThan(column, value))
                }
                Some(Token::LessThanOrEqual) => {
                    self.advance();
                    let value = self.parse_value()?;
                    Ok(WhereExpr::LessThanOrEqual(column, value))
                }
                Some(Token::Between) => {
                    self.advance();
                    let lower = self.parse_value()?;
                    self.expect_token(Token::And)?;
                    let upper = self.parse_value()?;
                    Ok(WhereExpr::Between(column, lower, upper))
                }
                Some(Token::In) => {
                    self.advance();
                    self.expect_token(Token::LeftParen)?;
                    let values = self.parse_value_list()?;
                    self.expect_token(Token::RightParen)?;
                    if self.case_insensitive {
                        Ok(WhereExpr::InIgnoreCase(column, values))
                    } else {
                        Ok(WhereExpr::In(column, values))
                    }
                }
                Some(Token::Not) if matches!(self.peek_token(), Some(Token::In)) => {
                    self.advance(); // consume NOT
                    self.advance(); // consume IN
                    self.expect_token(Token::LeftParen)?;
                    let values = self.parse_value_list()?;
                    self.expect_token(Token::RightParen)?;
                    if self.case_insensitive {
                        Ok(WhereExpr::NotInIgnoreCase(column, values))
                    } else {
                        Ok(WhereExpr::NotIn(column, values))
                    }
                }
                Some(Token::Like) => {
                    self.advance();
                    let pattern = self.parse_string_value()?;
                    Ok(WhereExpr::Like(column, pattern))
                }
                Some(Token::Is) => {
                    self.advance();
                    match self.current_token() {
                        Some(Token::Null) => {
                            self.advance();
                            Ok(WhereExpr::IsNull(column))
                        }
                        Some(Token::Not) if matches!(self.peek_token(), Some(Token::Null)) => {
                            self.advance(); // consume NOT
                            self.advance(); // consume NULL
                            Ok(WhereExpr::IsNotNull(column))
                        }
                        _ => Err(anyhow!("Expected NULL or NOT NULL after IS")),
                    }
                }
                _ => Err(anyhow!("Expected operator after column")),
            }
        }
    }

    fn parse_comparison_op(&mut self) -> Result<ComparisonOp> {
        match self.advance() {
            Some(Token::Equal) => Ok(ComparisonOp::Equal),
            Some(Token::NotEqual) => Ok(ComparisonOp::NotEqual),
            Some(Token::GreaterThan) => Ok(ComparisonOp::GreaterThan),
            Some(Token::GreaterThanOrEqual) => Ok(ComparisonOp::GreaterThanOrEqual),
            Some(Token::LessThan) => Ok(ComparisonOp::LessThan),
            Some(Token::LessThanOrEqual) => Ok(ComparisonOp::LessThanOrEqual),
            _ => Err(anyhow!("Expected comparison operator")),
        }
    }

    fn parse_string_value(&mut self) -> Result<String> {
        match self.advance() {
            Some(Token::StringLiteral(s)) => Ok(s.clone()),
            Some(Token::QuotedIdentifier(s)) => Ok(s.clone()), // Handle double-quoted strings
            _ => Err(anyhow!("Expected string literal")),
        }
    }

    fn parse_number_value(&mut self) -> Result<f64> {
        match self.advance() {
            Some(Token::NumberLiteral(n)) => {
                n.parse::<f64>().map_err(|_| anyhow!("Invalid number"))
            }
            _ => Err(anyhow!("Expected number literal")),
        }
    }

    fn parse_value_list(&mut self) -> Result<Vec<WhereValue>> {
        let mut values = vec![self.parse_value()?];

        while let Some(Token::Comma) = self.current_token() {
            self.advance(); // consume comma
            values.push(self.parse_value()?);
        }

        Ok(values)
    }

    fn expect_token(&mut self, expected: Token) -> Result<()> {
        match self.advance() {
            Some(token) if std::mem::discriminant(token) == std::mem::discriminant(&expected) => {
                Ok(())
            }
            Some(token) => Err(anyhow!("Expected {:?}, got {:?}", expected, token)),
            None => Err(anyhow!("Unexpected end of input")),
        }
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn test_simple_comparison() {
        let expr = WhereParser::parse("price > 100").unwrap();
        match expr {
            WhereExpr::GreaterThan(col, val) => {
                assert_eq!(col, "price");
                assert_eq!(val, WhereValue::Number(100.0));
            }
            _ => panic!("Wrong expression type"),
        }
    }

    #[test]
    fn test_and_expression() {
        let expr = WhereParser::parse("price > 100 AND category = \"Electronics\"").unwrap();
        match expr {
            WhereExpr::And(left, right) => {
                match left.as_ref() {
                    WhereExpr::GreaterThan(col, val) => {
                        assert_eq!(col, "price");
                        assert_eq!(val, &WhereValue::Number(100.0));
                    }
                    _ => panic!("Wrong left expression"),
                }
                match right.as_ref() {
                    WhereExpr::Equal(col, val) => {
                        assert_eq!(col, "category");
                        assert_eq!(val, &WhereValue::String("Electronics".to_string()));
                    }
                    _ => panic!("Wrong right expression"),
                }
            }
            _ => panic!("Wrong expression type"),
        }
    }

    #[test]
    fn test_between_with_and() {
        let expr = WhereParser::parse(
            "category = \"Electronics\" AND price BETWEEN 100 AND 500 AND quantity > 0",
        )
        .unwrap();
        // This should parse as: (category = "Electronics") AND (price BETWEEN 100 AND 500) AND (quantity > 0)
        match expr {
            WhereExpr::And(left, right) => {
                // The parser is left-associative, so it's ((category = "Electronics") AND (price BETWEEN 100 AND 500)) AND (quantity > 0)
                match left.as_ref() {
                    WhereExpr::And(ll, lr) => {
                        match ll.as_ref() {
                            WhereExpr::Equal(col, val) => {
                                assert_eq!(col, "category");
                                assert_eq!(val, &WhereValue::String("Electronics".to_string()));
                            }
                            _ => panic!("Wrong leftmost expression"),
                        }
                        match lr.as_ref() {
                            WhereExpr::Between(col, lower, upper) => {
                                assert_eq!(col, "price");
                                assert_eq!(lower, &WhereValue::Number(100.0));
                                assert_eq!(upper, &WhereValue::Number(500.0));
                            }
                            _ => panic!("Wrong middle expression"),
                        }
                    }
                    _ => panic!("Wrong left structure"),
                }
                match right.as_ref() {
                    WhereExpr::GreaterThan(col, val) => {
                        assert_eq!(col, "quantity");
                        assert_eq!(val, &WhereValue::Number(0.0));
                    }
                    _ => panic!("Wrong right expression"),
                }
            }
            _ => panic!("Wrong expression type"),
        }
    }

    #[test]
    fn test_parentheses_precedence() {
        // Test that parentheses override default precedence
        // Default: a = 1 OR b = 2 AND c = 3 -> a = 1 OR (b = 2 AND c = 3)
        let expr1 = WhereParser::parse("a = 1 OR b = 2 AND c = 3").unwrap();
        match expr1 {
            WhereExpr::Or(left, right) => {
                // Left should be a = 1
                match left.as_ref() {
                    WhereExpr::Equal(col, val) => {
                        assert_eq!(col, "a");
                        assert_eq!(val, &WhereValue::Number(1.0));
                    }
                    _ => panic!("Wrong left expression"),
                }
                // Right should be (b = 2 AND c = 3)
                match right.as_ref() {
                    WhereExpr::And(l, r) => {
                        match l.as_ref() {
                            WhereExpr::Equal(col, val) => {
                                assert_eq!(col, "b");
                                assert_eq!(val, &WhereValue::Number(2.0));
                            }
                            _ => panic!("Wrong AND left"),
                        }
                        match r.as_ref() {
                            WhereExpr::Equal(col, val) => {
                                assert_eq!(col, "c");
                                assert_eq!(val, &WhereValue::Number(3.0));
                            }
                            _ => panic!("Wrong AND right"),
                        }
                    }
                    _ => panic!("Wrong right expression"),
                }
            }
            _ => panic!("Wrong top-level expression"),
        }

        // With parentheses: (a = 1 OR b = 2) AND c = 3
        let expr2 = WhereParser::parse("(a = 1 OR b = 2) AND c = 3").unwrap();
        match expr2 {
            WhereExpr::And(left, right) => {
                // Left should be (a = 1 OR b = 2)
                match left.as_ref() {
                    WhereExpr::Or(l, r) => {
                        match l.as_ref() {
                            WhereExpr::Equal(col, val) => {
                                assert_eq!(col, "a");
                                assert_eq!(val, &WhereValue::Number(1.0));
                            }
                            _ => panic!("Wrong OR left"),
                        }
                        match r.as_ref() {
                            WhereExpr::Equal(col, val) => {
                                assert_eq!(col, "b");
                                assert_eq!(val, &WhereValue::Number(2.0));
                            }
                            _ => panic!("Wrong OR right"),
                        }
                    }
                    _ => panic!("Wrong left expression"),
                }
                // Right should be c = 3
                match right.as_ref() {
                    WhereExpr::Equal(col, val) => {
                        assert_eq!(col, "c");
                        assert_eq!(val, &WhereValue::Number(3.0));
                    }
                    _ => panic!("Wrong right expression"),
                }
            }
            _ => panic!("Wrong top-level expression"),
        }
    }

    #[test]
    fn test_case_conversion_methods() {
        // Test ToLower
        let expr = WhereParser::parse("executionSide.ToLower() = \"buy\"").unwrap();
        match expr {
            WhereExpr::ToLower(col, op, val) => {
                assert_eq!(col, "executionSide");
                assert_eq!(op, ComparisonOp::Equal);
                assert_eq!(val, "buy");
            }
            _ => panic!("Wrong expression type for ToLower"),
        }

        // Test ToUpper
        let expr = WhereParser::parse("status.ToUpper() != \"PENDING\"").unwrap();
        match expr {
            WhereExpr::ToUpper(col, op, val) => {
                assert_eq!(col, "status");
                assert_eq!(op, ComparisonOp::NotEqual);
                assert_eq!(val, "PENDING");
            }
            _ => panic!("Wrong expression type for ToUpper"),
        }
    }

    #[test]
    fn test_is_null_or_empty() {
        // Test IsNullOrEmpty parsing
        let expr = WhereParser::parse("name.IsNullOrEmpty()").unwrap();
        match expr {
            WhereExpr::IsNullOrEmpty(col) => {
                assert_eq!(col, "name");
            }
            _ => panic!("Wrong expression type for IsNullOrEmpty"),
        }

        // Test with quoted identifier
        let expr2 = WhereParser::parse("\"Customer Name\".IsNullOrEmpty()").unwrap();
        match expr2 {
            WhereExpr::IsNullOrEmpty(col) => {
                assert_eq!(col, "Customer Name");
            }
            _ => panic!("Wrong expression type for IsNullOrEmpty with quoted identifier"),
        }
    }

    #[test]
    fn test_is_null_or_empty_in_complex_expression() {
        // Test IsNullOrEmpty in AND expression
        let expr = WhereParser::parse("name.IsNullOrEmpty() OR age > 18").unwrap();
        match expr {
            WhereExpr::Or(left, right) => {
                match *left {
                    WhereExpr::IsNullOrEmpty(col) => {
                        assert_eq!(col, "name");
                    }
                    _ => panic!("Left side should be IsNullOrEmpty"),
                }
                match *right {
                    WhereExpr::GreaterThan(col, val) => {
                        assert_eq!(col, "age");
                        assert_eq!(val, WhereValue::Number(18.0));
                    }
                    _ => panic!("Right side should be GreaterThan"),
                }
            }
            _ => panic!("Should be an OR expression"),
        }
    }

    #[test]
    fn test_numeric_column_names() {
        // Test that numeric column names (like date columns "202204") are recognized as identifiers
        let columns = vec![
            "Borough".to_string(),
            "202202".to_string(),
            "202203".to_string(),
            "202204".to_string(),
            "202205".to_string(),
        ];

        // Test simple comparison with numeric column
        let expr = WhereParser::parse_with_columns("202204 > 2.0", columns.clone()).unwrap();
        match expr {
            WhereExpr::GreaterThan(col, val) => {
                assert_eq!(col, "202204");
                assert_eq!(val, WhereValue::Number(2.0));
            }
            _ => panic!("Expected GreaterThan with numeric column name"),
        }

        // Test complex expression with numeric column
        let expr2 = WhereParser::parse_with_columns(
            "Borough = \"London\" AND 202204 > 1.0",
            columns.clone(),
        )
        .unwrap();
        match expr2 {
            WhereExpr::And(left, right) => {
                match &*left {
                    WhereExpr::Equal(col, val) => {
                        assert_eq!(col, "Borough");
                        assert_eq!(val, &WhereValue::String("London".to_string()));
                    }
                    _ => panic!("Expected Equal on left"),
                }
                match &*right {
                    WhereExpr::GreaterThan(col, val) => {
                        assert_eq!(col, "202204");
                        assert_eq!(val, &WhereValue::Number(1.0));
                    }
                    _ => panic!("Expected GreaterThan on right"),
                }
            }
            _ => panic!("Expected And expression"),
        }

        // Test that numbers not in column list are still treated as literals
        let limited_columns = vec!["price".to_string(), "quantity".to_string()];
        let expr3 = WhereParser::parse_with_columns("price > 100", limited_columns).unwrap();
        match expr3 {
            WhereExpr::GreaterThan(col, val) => {
                assert_eq!(col, "price");
                assert_eq!(val, WhereValue::Number(100.0));
            }
            _ => panic!("Expected GreaterThan"),
        }
    }
}