Skip to content
This repository was archived by the owner on Aug 19, 2025. It is now read-only.

Change private methods to internal #133

Merged
aminalaee merged 1 commit into from
Nov 17, 2021
Merged

Change private methods to internal #133

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions orm/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def schema(self):
def pkname(self):
return self.model_cls.pkname

def build_select_expression(self):
def _build_select_expression(self):
tables = [self.table]
select_from = self.table

Expand Down Expand Up @@ -340,7 +340,7 @@ def select_related(self, related):
)

async def exists(self) -> bool:
expr = self.build_select_expression()
expr = self._build_select_expression()
expr = sqlalchemy.exists(expr).select()
return await self.database.fetch_val(expr)

Expand All @@ -365,33 +365,33 @@ def offset(self, offset: int):
)

async def count(self) -> int:
expr = self.build_select_expression().alias("subquery_for_count")
expr = self._build_select_expression().alias("subquery_for_count")
expr = sqlalchemy.func.count().select().select_from(expr)
return await self.database.fetch_val(expr)

async def all(self, **kwargs):
if kwargs:
return await self.filter(**kwargs).all()

expr = self.build_select_expression()
expr = self._build_select_expression()
rows = await self.database.fetch_all(expr)
return [
self.model_cls.from_row(row, select_related=self._select_related)
self.model_cls._from_row(row, select_related=self._select_related)
for row in rows
]

async def get(self, **kwargs):
if kwargs:
return await self.filter(**kwargs).get()

expr = self.build_select_expression().limit(2)
expr = self._build_select_expression().limit(2)
rows = await self.database.fetch_all(expr)

if not rows:
raise NoMatch()
if len(rows) > 1:
raise MultipleMatches()
return self.model_cls.from_row(rows[0], select_related=self._select_related)
return self.model_cls._from_row(rows[0], select_related=self._select_related)

async def first(self, **kwargs):
if kwargs:
Expand Down Expand Up @@ -550,7 +550,7 @@ async def load(self):
setattr(self, key, value)

@classmethod
def from_row(cls, row, select_related=[]):
def _from_row(cls, row, select_related=[]):
"""
Instantiate a model instance, given a database row.
"""
Expand All @@ -561,10 +561,10 @@ def from_row(cls, row, select_related=[]):
if "__" in related:
first_part, remainder = related.split("__", 1)
model_cls = cls.fields[first_part].target
item[first_part] = model_cls.from_row(row, select_related=[remainder])
item[first_part] = model_cls._from_row(row, select_related=[remainder])
else:
model_cls = cls.fields[related].target
item[related] = model_cls.from_row(row)
item[related] = model_cls._from_row(row)

# Pull out the regular column values.
for column in cls.table.columns:
Expand Down