add release docs, change tests
This commit is contained in:
@ -75,7 +75,7 @@ class UndefinedType: # pragma no cover
|
||||
|
||||
Undefined = UndefinedType()
|
||||
|
||||
__version__ = "0.9.8"
|
||||
__version__ = "0.9.9"
|
||||
__all__ = [
|
||||
"Integer",
|
||||
"BigInteger",
|
||||
|
||||
@ -51,8 +51,8 @@ def populate_default_options_values(
|
||||
new_model.Meta.model_fields = model_fields
|
||||
if not hasattr(new_model.Meta, "abstract"):
|
||||
new_model.Meta.abstract = False
|
||||
if not hasattr(new_model.Meta, "order_by"):
|
||||
new_model.Meta.order_by = []
|
||||
if not hasattr(new_model.Meta, "orders_by"):
|
||||
new_model.Meta.orders_by = []
|
||||
|
||||
if any(
|
||||
is_field_an_forward_ref(field) for field in new_model.Meta.model_fields.values()
|
||||
|
||||
@ -252,9 +252,9 @@ def populate_meta_tablename_columns_and_pk(
|
||||
|
||||
new_model.Meta.columns = columns
|
||||
new_model.Meta.pkname = pkname
|
||||
if not new_model.Meta.order_by:
|
||||
if not new_model.Meta.orders_by:
|
||||
# by default we sort by pk name if other option not provided
|
||||
new_model.Meta.order_by.append(pkname)
|
||||
new_model.Meta.orders_by.append(pkname)
|
||||
return new_model
|
||||
|
||||
|
||||
|
||||
@ -71,7 +71,7 @@ class ModelMeta:
|
||||
signals: SignalEmitter
|
||||
abstract: bool
|
||||
requires_ref_update: bool
|
||||
order_by: List[str]
|
||||
orders_by: List[str]
|
||||
|
||||
|
||||
def add_cached_properties(new_model: Type["Model"]) -> None:
|
||||
|
||||
@ -314,7 +314,7 @@ class SqlJoin:
|
||||
self.used_aliases.append(self.next_alias)
|
||||
|
||||
def _set_default_primary_key_order_by(self) -> None:
|
||||
for order_by in self.next_model.Meta.order_by:
|
||||
for order_by in self.next_model.Meta.orders_by:
|
||||
clause = ormar.OrderAction(
|
||||
order_str=order_by, model_cls=self.next_model, alias=self.next_alias,
|
||||
)
|
||||
|
||||
@ -71,7 +71,7 @@ class Query:
|
||||
self.sorted_orders[clause] = clause.get_text_clause()
|
||||
|
||||
if not current_table_sorted:
|
||||
for order_by in self.model_cls.Meta.order_by:
|
||||
for order_by in self.model_cls.Meta.orders_by:
|
||||
clause = ormar.OrderAction(order_str=order_by, model_cls=self.model_cls)
|
||||
self.sorted_orders[clause] = clause.get_text_clause()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user