Skip to content

[Dev] Add py::is_operator() where appropriate for the DuckDBPyExpression interface #44

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

Merged
merged 2 commits into from
Sep 15, 2025
Merged

[Dev] Add py::is_operator() where appropriate for the DuckDBPyExpression interface #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eff31ec
add 'py::is_operator()' where appropriate
Tishj Sep 10, 2025
864f40d
Merge branch 'v1.4-andium' into pyexpression_is_operator
evertlammerts Sep 15, 2025
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
57 changes: 28 additions & 29 deletions src/duckdb_py/pyexpression/initialize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
FunctionExpression: self '+' expr
)";

m.def("__add__", &DuckDBPyExpression::Add, py::arg("expr"), docs);
m.def("__add__", &DuckDBPyExpression::Add, py::arg("expr"), docs, py::is_operator());
m.def(
"__radd__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Add(a); }, docs);
"__radd__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Add(a); }, docs, py::is_operator());

docs = R"(
Negate the expression.

Returns:
FunctionExpression: -self
)";
m.def("__neg__", &DuckDBPyExpression::Negate, docs);
m.def("__neg__", &DuckDBPyExpression::Negate, docs, py::is_operator());

docs = R"(
Subtract expr from self
Expand All @@ -82,9 +82,9 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '-' expr
)";
m.def("__sub__", &DuckDBPyExpression::Subtract, docs);
m.def("__sub__", &DuckDBPyExpression::Subtract, docs, py::is_operator());
m.def(
"__rsub__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Subtract(a); }, docs);
"__rsub__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Subtract(a); }, docs, py::is_operator());

docs = R"(
Multiply self by expr
Expand All @@ -95,9 +95,9 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '*' expr
)";
m.def("__mul__", &DuckDBPyExpression::Multiply, docs);
m.def("__mul__", &DuckDBPyExpression::Multiply, docs, py::is_operator());
m.def(
"__rmul__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Multiply(a); }, docs);
"__rmul__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Multiply(a); }, docs, py::is_operator());

docs = R"(
Divide self by expr
Expand All @@ -108,13 +108,13 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '/' expr
)";
m.def("__div__", &DuckDBPyExpression::Division, docs);
m.def("__div__", &DuckDBPyExpression::Division, docs, py::is_operator());
m.def(
"__rdiv__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Division(a); }, docs);
"__rdiv__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Division(a); }, docs, py::is_operator());

m.def("__truediv__", &DuckDBPyExpression::Division, docs);
m.def("__truediv__", &DuckDBPyExpression::Division, docs, py::is_operator());
m.def(
"__rtruediv__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Division(a); }, docs);
"__rtruediv__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Division(a); }, docs, py::is_operator());

docs = R"(
(Floor) Divide self by expr
Expand All @@ -125,10 +125,9 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '//' expr
)";
m.def("__floordiv__", &DuckDBPyExpression::FloorDivision, docs);
m.def("__floordiv__", &DuckDBPyExpression::FloorDivision, docs, py::is_operator());
m.def(
"__rfloordiv__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.FloorDivision(a); },
docs);
"__rfloordiv__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.FloorDivision(a); }, docs, py::is_operator());

docs = R"(
Modulo self by expr
Expand All @@ -139,9 +138,9 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '%' expr
)";
m.def("__mod__", &DuckDBPyExpression::Modulo, docs);
m.def("__mod__", &DuckDBPyExpression::Modulo, docs, py::is_operator());
m.def(
"__rmod__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Modulo(a); }, docs);
"__rmod__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Modulo(a); }, docs, py::is_operator());

docs = R"(
Power self by expr
Expand All @@ -152,9 +151,9 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '**' expr
)";
m.def("__pow__", &DuckDBPyExpression::Power, docs);
m.def("__pow__", &DuckDBPyExpression::Power, docs, py::is_operator());
m.def(
"__rpow__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Power(a); }, docs);
"__rpow__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Power(a); }, docs, py::is_operator());

docs = R"(
Create an equality expression between two expressions
Expand All @@ -165,7 +164,7 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '=' expr
)";
m.def("__eq__", &DuckDBPyExpression::Equality, docs);
m.def("__eq__", &DuckDBPyExpression::Equality, docs, py::is_operator());

docs = R"(
Create an inequality expression between two expressions
Expand All @@ -176,7 +175,7 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '!=' expr
)";
m.def("__ne__", &DuckDBPyExpression::Inequality, docs);
m.def("__ne__", &DuckDBPyExpression::Inequality, docs, py::is_operator());

docs = R"(
Create a greater than expression between two expressions
Expand All @@ -187,7 +186,7 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '>' expr
)";
m.def("__gt__", &DuckDBPyExpression::GreaterThan, docs);
m.def("__gt__", &DuckDBPyExpression::GreaterThan, docs, py::is_operator());

docs = R"(
Create a greater than or equal expression between two expressions
Expand All @@ -198,7 +197,7 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '>=' expr
)";
m.def("__ge__", &DuckDBPyExpression::GreaterThanOrEqual, docs);
m.def("__ge__", &DuckDBPyExpression::GreaterThanOrEqual, docs, py::is_operator());

docs = R"(
Create a less than expression between two expressions
Expand All @@ -209,7 +208,7 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '<' expr
)";
m.def("__lt__", &DuckDBPyExpression::LessThan, docs);
m.def("__lt__", &DuckDBPyExpression::LessThan, docs, py::is_operator());

docs = R"(
Create a less than or equal expression between two expressions
Expand All @@ -220,7 +219,7 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '<=' expr
)";
m.def("__le__", &DuckDBPyExpression::LessThanOrEqual, docs);
m.def("__le__", &DuckDBPyExpression::LessThanOrEqual, docs, py::is_operator());

// AND, NOT and OR

Expand All @@ -233,7 +232,7 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '&' expr
)";
m.def("__and__", &DuckDBPyExpression::And, docs);
m.def("__and__", &DuckDBPyExpression::And, docs, py::is_operator());

docs = R"(
Binary-or self together with expr
Expand All @@ -244,15 +243,15 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
Returns:
FunctionExpression: self '|' expr
)";
m.def("__or__", &DuckDBPyExpression::Or, docs);
m.def("__or__", &DuckDBPyExpression::Or, docs, py::is_operator());

docs = R"(
Create a binary-not expression from self

Returns:
FunctionExpression: ~self
)";
m.def("__invert__", &DuckDBPyExpression::Not, docs);
m.def("__invert__", &DuckDBPyExpression::Not, docs, py::is_operator());

docs = R"(
Binary-and self together with expr
Expand All @@ -264,7 +263,7 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
FunctionExpression: expr '&' self
)";
m.def(
"__rand__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.And(a); }, docs);
"__rand__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.And(a); }, docs, py::is_operator());

docs = R"(
Binary-or self together with expr
Expand All @@ -276,7 +275,7 @@ static void InitializeDunderMethods(py::class_<DuckDBPyExpression, shared_ptr<Du
FunctionExpression: expr '|' self
)";
m.def(
"__ror__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Or(a); }, docs);
"__ror__", [](const DuckDBPyExpression &a, const DuckDBPyExpression &b) { return b.Or(a); }, docs, py::is_operator());
}

static void InitializeImplicitConversion(py::class_<DuckDBPyExpression, shared_ptr<DuckDBPyExpression>> &m) {
Expand Down