Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(rust,python): sql BETWEEN bounds should be inclusive #8818

Merged
merged 1 commit into from
May 12, 2023
Merged

fix(rust,python): sql BETWEEN bounds should be inclusive #8818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion polars/polars-sql/src/sql_expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ impl SqlExprVisitor<'_> {
if negated {
Ok(expr.clone().lt(low).or(expr.gt(high)))
} else {
Ok(expr.clone().gt(low).and(expr.lt(high)))
Ok(expr.clone().gt_eq(low).and(expr.lt_eq(high)))
}
}

Expand Down
30 changes: 14 additions & 16 deletions py-polars/tests/unit/test_sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,31 +154,29 @@ def test_sql_is_between(foods_ipc_path: Path) -> None:
"""
SELECT *
FROM foods1
WHERE foods1.calories BETWEEN 20 AND 31
LIMIT 4
WHERE foods1.calories BETWEEN 22 AND 30
ORDER BY "calories" DESC, "sugars_g" DESC
"""
)
assert out.to_dict(False) == {
"category": ["fruit", "vegetables", "fruit", "vegetables"],
"calories": [30, 25, 30, 22],
"fats_g": [0.0, 0.0, 0.0, 0.0],
"sugars_g": [5, 2, 3, 3],
}
assert out.rows() == [
("fruit", 30, 0.0, 5),
("vegetables", 30, 0.0, 5),
("fruit", 30, 0.0, 3),
("vegetables", 25, 0.0, 4),
("vegetables", 25, 0.0, 3),
("vegetables", 25, 0.0, 2),
("vegetables", 22, 0.0, 3),
]

out = c.execute(
"""
SELECT *
FROM foods1
WHERE calories NOT BETWEEN 20 AND 31
LIMIT 4
WHERE calories NOT BETWEEN 22 AND 30
ORDER BY "calories" ASC
"""
)
assert out.to_dict(False) == {
"category": ["vegetables", "seafood", "meat", "fruit"],
"calories": [45, 150, 100, 60],
"fats_g": [0.5, 5.0, 5.0, 0.0],
"sugars_g": [2, 0, 0, 11],
}
assert not any((22 <= cal <= 30) for cal in out["calories"])


def test_sql_union() -> None:
Expand Down