Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,14 @@ public DateTimeLiteral(Token token, DateTime value) : base(token)
{
Value = value;
}
}

public sealed class DateLiteral : QueryExpression
{
public DateTime Value { get; set; }

public DateLiteral(Token token, DateTime value) : base(token)
{
Value = value;
}
}
5 changes: 5 additions & 0 deletions src/GoatQuery/src/Evaluator/FilterEvaluator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ public static Result<Expression> Evaluate(QueryExpression expression, ParameterE
case DateTimeLiteral literal:
value = Expression.Constant(literal.Value, property.Type);
break;
case DateLiteral literal:
property = Expression.Property(property, "Date");

value = Expression.Constant(literal.Value.Date, property.Type);
break;
default:
return Result.Fail($"Unsupported literal type: {exp.Right.GetType().Name}");
}
Expand Down
11 changes: 11 additions & 0 deletions src/GoatQuery/src/Lexer/Lexer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ public Token NextToken()

if (IsDigit(token.Literal[0]))
{
if (IsDate(token.Literal))
{
token.Type = TokenType.DATE;
return token;
}

if (IsDateTime(token.Literal))
{
token.Type = TokenType.DATETIME;
Expand Down Expand Up @@ -103,6 +109,11 @@ public Token NextToken()
return token;
}

private bool IsDate(string value)
{
return DateTime.TryParseExact(value, new[] { "yyyy-MM-dd" }, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out _);
}

private bool IsDateTime(string value)
{
return DateTime.TryParse(value, out _);
Expand Down
10 changes: 8 additions & 2 deletions src/GoatQuery/src/Parser/Parser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ private Result<InfixExpression> ParseFilterStatement()

var statement = new InfixExpression(_currentToken, identifier, _currentToken.Literal);

if (!PeekTokenIn(TokenType.STRING, TokenType.INT, TokenType.GUID, TokenType.DATETIME, TokenType.DECIMAL, TokenType.FLOAT, TokenType.DOUBLE))
if (!PeekTokenIn(TokenType.STRING, TokenType.INT, TokenType.GUID, TokenType.DATETIME, TokenType.DECIMAL, TokenType.FLOAT, TokenType.DOUBLE, TokenType.DATE))
{
return Result.Fail("Invalid value type within filter");
}
Expand All @@ -152,7 +152,7 @@ private Result<InfixExpression> ParseFilterStatement()
return Result.Fail("Value must be a string when using 'contains' operand");
}

if (statement.Operator.In(Keywords.Lt, Keywords.Lte, Keywords.Gt, Keywords.Gte) && !CurrentTokenIn(TokenType.INT, TokenType.DECIMAL, TokenType.FLOAT, TokenType.DOUBLE, TokenType.DATETIME))
if (statement.Operator.In(Keywords.Lt, Keywords.Lte, Keywords.Gt, Keywords.Gte) && !CurrentTokenIn(TokenType.INT, TokenType.DECIMAL, TokenType.FLOAT, TokenType.DOUBLE, TokenType.DATETIME, TokenType.DATE))
{
return Result.Fail($"Value must be an integer when using '{statement.Operator}' operand");
}
Expand Down Expand Up @@ -204,6 +204,12 @@ private Result<InfixExpression> ParseFilterStatement()
statement.Right = new DateTimeLiteral(_currentToken, dateTimeValue);
}
break;
case TokenType.DATE:
if (DateTime.TryParse(_currentToken.Literal, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out var dateValue))
{
statement.Right = new DateLiteral(_currentToken, dateValue);
}
break;
}

return statement;
Expand Down
1 change: 1 addition & 0 deletions src/GoatQuery/src/Token/Token.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public enum TokenType
DOUBLE,
GUID,
DATETIME,
DATE,
LPAREN,
RPAREN,
}
Expand Down
10 changes: 5 additions & 5 deletions src/GoatQuery/tests/Filter/FilterLexerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ public static IEnumerable<object[]> Parameters()
{
new (TokenType.IDENT, "dateOfBirth"),
new (TokenType.IDENT, "eq"),
new (TokenType.DATETIME, "2000-01-01"),
new (TokenType.DATE, "2000-01-01"),
}
};

Expand All @@ -342,7 +342,7 @@ public static IEnumerable<object[]> Parameters()
{
new (TokenType.IDENT, "dateOfBirth"),
new (TokenType.IDENT, "lt"),
new (TokenType.DATETIME, "2000-01-01"),
new (TokenType.DATE, "2000-01-01"),
}
};

Expand All @@ -353,7 +353,7 @@ public static IEnumerable<object[]> Parameters()
{
new (TokenType.IDENT, "dateOfBirth"),
new (TokenType.IDENT, "lte"),
new (TokenType.DATETIME, "2000-01-01"),
new (TokenType.DATE, "2000-01-01"),
}
};

Expand All @@ -364,7 +364,7 @@ public static IEnumerable<object[]> Parameters()
{
new (TokenType.IDENT, "dateOfBirth"),
new (TokenType.IDENT, "gt"),
new (TokenType.DATETIME, "2000-01-01"),
new (TokenType.DATE, "2000-01-01"),
}
};

Expand All @@ -375,7 +375,7 @@ public static IEnumerable<object[]> Parameters()
{
new (TokenType.IDENT, "dateOfBirth"),
new (TokenType.IDENT, "gte"),
new (TokenType.DATETIME, "2000-01-01"),
new (TokenType.DATE, "2000-01-01"),
}
};

Expand Down
5 changes: 5 additions & 0 deletions src/GoatQuery/tests/Filter/FilterTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@ public static IEnumerable<object[]> Parameters()
new[] { _users["Egg"] }
};

yield return new object[] {
"dateOfBirth eq 2020-05-09",
new[] { _users["Jane"] }
};

yield return new object[] {
"dateOfBirth lt 2010-01-01",
new[] { _users["John"], _users["Apple"], _users["Harry"], _users["Egg"] }
Expand Down
Loading