Skip to content
Closed
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
8 changes: 4 additions & 4 deletions src/postgrest/src/postgrest/base_request_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ def limit(self: Self, size: int, *, foreign_table: Optional[str] = None) -> Self
.. versionchanged:: 0.10.3
Allow limiting results returned for foreign tables with the foreign_table parameter.
"""
self.request.params = self.request.params.add(
self.request.params = self.request.params.set(
f"{foreign_table}.limit" if foreign_table else "limit",
size,
)
Expand All @@ -619,7 +619,7 @@ def offset(self: Self, size: int) -> Self:
Args:
size: The number of the row to start at
"""
self.request.params = self.request.params.add(
self.request.params = self.request.params.set(
"offset",
size,
)
Expand All @@ -628,10 +628,10 @@ def offset(self: Self, size: int) -> Self:
def range(
self: Self, start: int, end: int, foreign_table: Optional[str] = None
) -> Self:
self.request.params = self.request.params.add(
self.request.params = self.request.params.set(
f"{foreign_table}.offset" if foreign_table else "offset", start
)
self.request.params = self.request.params.add(
self.request.params = self.request.params.set(
f"{foreign_table}.limit" if foreign_table else "limit",
end - start + 1,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,25 @@ async def test_rpc_with_range():
]


async def test_limit_twice():
query = rest_client().from_("countries").select("*").limit(1).limit(2)

assert query.request.params["limit"] == "2"


async def test_offset_twice():
query = rest_client().from_("countries").select("*").offset(1).offset(2)

assert query.request.params["offset"] == "2"


async def test_range_twice():
query = rest_client().from_("countries").select("*").range(0, 1).range(2, 3)

assert query.request.params["offset"] == "2"
assert query.request.params["limit"] == "2"


async def test_rpc_post_with_args():
res = (
await rest_client()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,25 @@ def test_rpc_with_range():
]


def test_limit_twice():
query = rest_client().from_("countries").select("*").limit(1).limit(2)

assert query.request.params["limit"] == "2"


def test_offset_twice():
query = rest_client().from_("countries").select("*").offset(1).offset(2)

assert query.request.params["offset"] == "2"


def test_range_twice():
query = rest_client().from_("countries").select("*").range(0, 1).range(2, 3)

assert query.request.params["offset"] == "2"
assert query.request.params["limit"] == "2"


def test_rpc_post_with_args():
res = (
rest_client()
Expand Down