@@ -140,7 +140,7 @@ def schema(self):
140140 def pkname (self ):
141141 return self .model_cls .pkname
142142
143- def build_select_expression (self ):
143+ def _build_select_expression (self ):
144144 tables = [self .table ]
145145 select_from = self .table
146146
@@ -340,7 +340,7 @@ def select_related(self, related):
340340 )
341341
342342 async def exists (self ) -> bool :
343- expr = self .build_select_expression ()
343+ expr = self ._build_select_expression ()
344344 expr = sqlalchemy .exists (expr ).select ()
345345 return await self .database .fetch_val (expr )
346346
@@ -365,33 +365,33 @@ def offset(self, offset: int):
365365 )
366366
367367 async def count (self ) -> int :
368- expr = self .build_select_expression ().alias ("subquery_for_count" )
368+ expr = self ._build_select_expression ().alias ("subquery_for_count" )
369369 expr = sqlalchemy .func .count ().select ().select_from (expr )
370370 return await self .database .fetch_val (expr )
371371
372372 async def all (self , ** kwargs ):
373373 if kwargs :
374374 return await self .filter (** kwargs ).all ()
375375
376- expr = self .build_select_expression ()
376+ expr = self ._build_select_expression ()
377377 rows = await self .database .fetch_all (expr )
378378 return [
379- self .model_cls .from_row (row , select_related = self ._select_related )
379+ self .model_cls ._from_row (row , select_related = self ._select_related )
380380 for row in rows
381381 ]
382382
383383 async def get (self , ** kwargs ):
384384 if kwargs :
385385 return await self .filter (** kwargs ).get ()
386386
387- expr = self .build_select_expression ().limit (2 )
387+ expr = self ._build_select_expression ().limit (2 )
388388 rows = await self .database .fetch_all (expr )
389389
390390 if not rows :
391391 raise NoMatch ()
392392 if len (rows ) > 1 :
393393 raise MultipleMatches ()
394- return self .model_cls .from_row (rows [0 ], select_related = self ._select_related )
394+ return self .model_cls ._from_row (rows [0 ], select_related = self ._select_related )
395395
396396 async def first (self , ** kwargs ):
397397 if kwargs :
@@ -550,7 +550,7 @@ async def load(self):
550550 setattr (self , key , value )
551551
552552 @classmethod
553- def from_row (cls , row , select_related = []):
553+ def _from_row (cls , row , select_related = []):
554554 """
555555 Instantiate a model instance, given a database row.
556556 """
@@ -561,10 +561,10 @@ def from_row(cls, row, select_related=[]):
561561 if "__" in related :
562562 first_part , remainder = related .split ("__" , 1 )
563563 model_cls = cls .fields [first_part ].target
564- item [first_part ] = model_cls .from_row (row , select_related = [remainder ])
564+ item [first_part ] = model_cls ._from_row (row , select_related = [remainder ])
565565 else :
566566 model_cls = cls .fields [related ].target
567- item [related ] = model_cls .from_row (row )
567+ item [related ] = model_cls ._from_row (row )
568568
569569 # Pull out the regular column values.
570570 for column in cls .table .columns :
0 commit comments