diff --git a/docs/releases.md b/docs/releases.md index 833f0e1..98f1234 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -19,6 +19,7 @@ ## Other * Performance optimizations +* Split tests into packages based on tested area # 0.10.1 diff --git a/ormar/models/newbasemodel.py b/ormar/models/newbasemodel.py index 1c066c6..a2a1f1f 100644 --- a/ormar/models/newbasemodel.py +++ b/ormar/models/newbasemodel.py @@ -584,8 +584,8 @@ class NewBaseModel(pydantic.BaseModel, ModelTableProxy, metaclass=ModelMetaclass nested_model = getattr(self, field) if isinstance(nested_model, MutableSequence): dict_instance[field] = self._extract_nested_models_from_list( - relation_map=self._skip_ellipsis( - relation_map, field, default_return=dict() # type: ignore + relation_map=self._skip_ellipsis( # type: ignore + relation_map, field, default_return=dict() ), models=nested_model, include=self._skip_ellipsis(include, field), diff --git a/tests/test_deferred/__init__.py b/tests/test_deferred/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_forward_cross_refs.py b/tests/test_deferred/test_forward_cross_refs.py similarity index 100% rename from tests/test_forward_cross_refs.py rename to tests/test_deferred/test_forward_cross_refs.py diff --git a/tests/test_forward_refs.py b/tests/test_deferred/test_forward_refs.py similarity index 100% rename from tests/test_forward_refs.py rename to tests/test_deferred/test_forward_refs.py diff --git a/tests/test_more_same_table_joins.py b/tests/test_deferred/test_more_same_table_joins.py similarity index 100% rename from tests/test_more_same_table_joins.py rename to tests/test_deferred/test_more_same_table_joins.py diff --git a/tests/test_same_table_joins.py b/tests/test_deferred/test_same_table_joins.py similarity index 100% rename from tests/test_same_table_joins.py rename to tests/test_deferred/test_same_table_joins.py diff --git a/tests/test_encryption/__init__.py b/tests/test_encryption/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_encrypted_columns.py b/tests/test_encryption/test_encrypted_columns.py similarity index 100% rename from tests/test_encrypted_columns.py rename to tests/test_encryption/test_encrypted_columns.py diff --git a/tests/test_exclude_include_dict/__init__.py b/tests/test_exclude_include_dict/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_dumping_model_to_dict.py b/tests/test_exclude_include_dict/test_dumping_model_to_dict.py similarity index 100% rename from tests/test_dumping_model_to_dict.py rename to tests/test_exclude_include_dict/test_dumping_model_to_dict.py diff --git a/tests/test_excludable_items.py b/tests/test_exclude_include_dict/test_excludable_items.py similarity index 100% rename from tests/test_excludable_items.py rename to tests/test_exclude_include_dict/test_excludable_items.py diff --git a/tests/test_excluding_fields_in_fastapi.py b/tests/test_exclude_include_dict/test_excluding_fields_in_fastapi.py similarity index 100% rename from tests/test_excluding_fields_in_fastapi.py rename to tests/test_exclude_include_dict/test_excluding_fields_in_fastapi.py diff --git a/tests/test_excluding_fields_with_default.py b/tests/test_exclude_include_dict/test_excluding_fields_with_default.py similarity index 100% rename from tests/test_excluding_fields_with_default.py rename to tests/test_exclude_include_dict/test_excluding_fields_with_default.py diff --git a/tests/test_excluding_subset_of_columns.py b/tests/test_exclude_include_dict/test_excluding_subset_of_columns.py similarity index 100% rename from tests/test_excluding_subset_of_columns.py rename to tests/test_exclude_include_dict/test_excluding_subset_of_columns.py diff --git a/tests/test_fastapi/__init__.py b/tests/test_fastapi/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_choices_schema.py b/tests/test_fastapi/test_choices_schema.py similarity index 100% rename from tests/test_choices_schema.py rename to tests/test_fastapi/test_choices_schema.py diff --git a/tests/test_docs_with_multiple_relations_to_one.py b/tests/test_fastapi/test_docs_with_multiple_relations_to_one.py similarity index 100% rename from tests/test_docs_with_multiple_relations_to_one.py rename to tests/test_fastapi/test_docs_with_multiple_relations_to_one.py diff --git a/tests/test_fastapi_docs.py b/tests/test_fastapi/test_fastapi_docs.py similarity index 100% rename from tests/test_fastapi_docs.py rename to tests/test_fastapi/test_fastapi_docs.py diff --git a/tests/test_fastapi_usage.py b/tests/test_fastapi/test_fastapi_usage.py similarity index 100% rename from tests/test_fastapi_usage.py rename to tests/test_fastapi/test_fastapi_usage.py diff --git a/tests/test_inheritance_concrete_fastapi.py b/tests/test_fastapi/test_inheritance_concrete_fastapi.py similarity index 98% rename from tests/test_inheritance_concrete_fastapi.py rename to tests/test_fastapi/test_inheritance_concrete_fastapi.py index 217fe3c..a4a8310 100644 --- a/tests/test_inheritance_concrete_fastapi.py +++ b/tests/test_fastapi/test_inheritance_concrete_fastapi.py @@ -6,7 +6,7 @@ from fastapi import FastAPI from starlette.testclient import TestClient from tests.settings import DATABASE_URL -from tests.test_inheritance_concrete import ( # type: ignore +from tests.test_inheritance.test_inheritance_concrete import ( # type: ignore Category, Subject, Person, diff --git a/tests/test_inheritance_mixins_fastapi.py b/tests/test_fastapi/test_inheritance_mixins_fastapi.py similarity index 94% rename from tests/test_inheritance_mixins_fastapi.py rename to tests/test_fastapi/test_inheritance_mixins_fastapi.py index bfd6979..681f5ef 100644 --- a/tests/test_inheritance_mixins_fastapi.py +++ b/tests/test_fastapi/test_inheritance_mixins_fastapi.py @@ -6,7 +6,7 @@ from fastapi import FastAPI from starlette.testclient import TestClient from tests.settings import DATABASE_URL -from tests.test_inheritance_mixins import Category, Subject, metadata, db as database # type: ignore +from tests.test_inheritance.test_inheritance_mixins import Category, Subject, metadata, db as database # type: ignore app = FastAPI() app.state.database = database diff --git a/tests/test_json_field_fastapi.py b/tests/test_fastapi/test_json_field_fastapi.py similarity index 100% rename from tests/test_json_field_fastapi.py rename to tests/test_fastapi/test_json_field_fastapi.py diff --git a/tests/test_more_reallife_fastapi.py b/tests/test_fastapi/test_more_reallife_fastapi.py similarity index 100% rename from tests/test_more_reallife_fastapi.py rename to tests/test_fastapi/test_more_reallife_fastapi.py diff --git a/tests/test_wekref_exclusion.py b/tests/test_fastapi/test_wekref_exclusion.py similarity index 100% rename from tests/test_wekref_exclusion.py rename to tests/test_fastapi/test_wekref_exclusion.py diff --git a/tests/test_inheritance/__init__.py b/tests/test_inheritance/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_inheritance_concrete.py b/tests/test_inheritance/test_inheritance_concrete.py similarity index 100% rename from tests/test_inheritance_concrete.py rename to tests/test_inheritance/test_inheritance_concrete.py diff --git a/tests/test_inheritance_mixins.py b/tests/test_inheritance/test_inheritance_mixins.py similarity index 100% rename from tests/test_inheritance_mixins.py rename to tests/test_inheritance/test_inheritance_mixins.py diff --git a/tests/test_meta_constraints/__init__.py b/tests/test_meta_constraints/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_unique_constraints.py b/tests/test_meta_constraints/test_unique_constraints.py similarity index 100% rename from tests/test_unique_constraints.py rename to tests/test_meta_constraints/test_unique_constraints.py diff --git a/tests/test_model_definition/__init__.py b/tests/test_model_definition/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_model_definition/pks_and_fks/__init__.py b/tests/test_model_definition/pks_and_fks/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_non_integer_pkey.py b/tests/test_model_definition/pks_and_fks/test_non_integer_pkey.py similarity index 100% rename from tests/test_non_integer_pkey.py rename to tests/test_model_definition/pks_and_fks/test_non_integer_pkey.py diff --git a/tests/test_saving_string_pks.py b/tests/test_model_definition/pks_and_fks/test_saving_string_pks.py similarity index 100% rename from tests/test_saving_string_pks.py rename to tests/test_model_definition/pks_and_fks/test_saving_string_pks.py diff --git a/tests/test_uuid_fks.py b/tests/test_model_definition/pks_and_fks/test_uuid_fks.py similarity index 100% rename from tests/test_uuid_fks.py rename to tests/test_model_definition/pks_and_fks/test_uuid_fks.py diff --git a/tests/test_aliases.py b/tests/test_model_definition/test_aliases.py similarity index 100% rename from tests/test_aliases.py rename to tests/test_model_definition/test_aliases.py diff --git a/tests/test_columns.py b/tests/test_model_definition/test_columns.py similarity index 100% rename from tests/test_columns.py rename to tests/test_model_definition/test_columns.py diff --git a/tests/test_model_definition.py b/tests/test_model_definition/test_model_definition.py similarity index 100% rename from tests/test_model_definition.py rename to tests/test_model_definition/test_model_definition.py diff --git a/tests/test_models.py b/tests/test_model_definition/test_models.py similarity index 100% rename from tests/test_models.py rename to tests/test_model_definition/test_models.py diff --git a/tests/test_properties.py b/tests/test_model_definition/test_properties.py similarity index 100% rename from tests/test_properties.py rename to tests/test_model_definition/test_properties.py diff --git a/tests/test_pydantic_only_fields.py b/tests/test_model_definition/test_pydantic_only_fields.py similarity index 100% rename from tests/test_pydantic_only_fields.py rename to tests/test_model_definition/test_pydantic_only_fields.py diff --git a/tests/test_save_status.py b/tests/test_model_definition/test_save_status.py similarity index 100% rename from tests/test_save_status.py rename to tests/test_model_definition/test_save_status.py diff --git a/tests/test_saving_nullable_fields.py b/tests/test_model_definition/test_saving_nullable_fields.py similarity index 100% rename from tests/test_saving_nullable_fields.py rename to tests/test_model_definition/test_saving_nullable_fields.py diff --git a/tests/test_server_default.py b/tests/test_model_definition/test_server_default.py similarity index 100% rename from tests/test_server_default.py rename to tests/test_model_definition/test_server_default.py diff --git a/tests/test_model_methods/__init__.py b/tests/test_model_methods/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_load_all.py b/tests/test_model_methods/test_load_all.py similarity index 100% rename from tests/test_load_all.py rename to tests/test_model_methods/test_load_all.py diff --git a/tests/test_save_related.py b/tests/test_model_methods/test_save_related.py similarity index 100% rename from tests/test_save_related.py rename to tests/test_model_methods/test_save_related.py diff --git a/tests/test_saving_related.py b/tests/test_model_methods/test_saving_related.py similarity index 100% rename from tests/test_saving_related.py rename to tests/test_model_methods/test_saving_related.py diff --git a/tests/test_ordering/__init__.py b/tests/test_ordering/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_default_model_order.py b/tests/test_ordering/test_default_model_order.py similarity index 100% rename from tests/test_default_model_order.py rename to tests/test_ordering/test_default_model_order.py diff --git a/tests/test_default_relation_order.py b/tests/test_ordering/test_default_relation_order.py similarity index 100% rename from tests/test_default_relation_order.py rename to tests/test_ordering/test_default_relation_order.py diff --git a/tests/test_default_through_relation_order.py b/tests/test_ordering/test_default_through_relation_order.py similarity index 100% rename from tests/test_default_through_relation_order.py rename to tests/test_ordering/test_default_through_relation_order.py diff --git a/tests/test_proper_order_of_sorting_apply.py b/tests/test_ordering/test_proper_order_of_sorting_apply.py similarity index 100% rename from tests/test_proper_order_of_sorting_apply.py rename to tests/test_ordering/test_proper_order_of_sorting_apply.py diff --git a/tests/test_queries/__init__.py b/tests/test_queries/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_aggr_functions.py b/tests/test_queries/test_aggr_functions.py similarity index 100% rename from tests/test_aggr_functions.py rename to tests/test_queries/test_aggr_functions.py diff --git a/tests/test_deep_relations_select_all.py b/tests/test_queries/test_deep_relations_select_all.py similarity index 100% rename from tests/test_deep_relations_select_all.py rename to tests/test_queries/test_deep_relations_select_all.py diff --git a/tests/test_filter_groups.py b/tests/test_queries/test_filter_groups.py similarity index 100% rename from tests/test_filter_groups.py rename to tests/test_queries/test_filter_groups.py diff --git a/tests/test_isnull_filter.py b/tests/test_queries/test_isnull_filter.py similarity index 100% rename from tests/test_isnull_filter.py rename to tests/test_queries/test_isnull_filter.py diff --git a/tests/test_or_filters.py b/tests/test_queries/test_or_filters.py similarity index 100% rename from tests/test_or_filters.py rename to tests/test_queries/test_or_filters.py diff --git a/tests/test_order_by.py b/tests/test_queries/test_order_by.py similarity index 100% rename from tests/test_order_by.py rename to tests/test_queries/test_order_by.py diff --git a/tests/test_pagination.py b/tests/test_queries/test_pagination.py similarity index 100% rename from tests/test_pagination.py rename to tests/test_queries/test_pagination.py diff --git a/tests/test_queryproxy_on_m2m_models.py b/tests/test_queries/test_queryproxy_on_m2m_models.py similarity index 100% rename from tests/test_queryproxy_on_m2m_models.py rename to tests/test_queries/test_queryproxy_on_m2m_models.py diff --git a/tests/test_queryset_level_methods.py b/tests/test_queries/test_queryset_level_methods.py similarity index 100% rename from tests/test_queryset_level_methods.py rename to tests/test_queries/test_queryset_level_methods.py diff --git a/tests/test_reserved_sql_keywords_escaped.py b/tests/test_queries/test_reserved_sql_keywords_escaped.py similarity index 100% rename from tests/test_reserved_sql_keywords_escaped.py rename to tests/test_queries/test_reserved_sql_keywords_escaped.py diff --git a/tests/test_reverse_fk_queryset.py b/tests/test_queries/test_reverse_fk_queryset.py similarity index 100% rename from tests/test_reverse_fk_queryset.py rename to tests/test_queries/test_reverse_fk_queryset.py diff --git a/tests/test_selecting_subset_of_columns.py b/tests/test_queries/test_selecting_subset_of_columns.py similarity index 100% rename from tests/test_selecting_subset_of_columns.py rename to tests/test_queries/test_selecting_subset_of_columns.py diff --git a/tests/test_relations/__init__.py b/tests/test_relations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_cascades.py b/tests/test_relations/test_cascades.py similarity index 100% rename from tests/test_cascades.py rename to tests/test_relations/test_cascades.py diff --git a/tests/test_database_fk_creation.py b/tests/test_relations/test_database_fk_creation.py similarity index 100% rename from tests/test_database_fk_creation.py rename to tests/test_relations/test_database_fk_creation.py diff --git a/tests/test_foreign_keys.py b/tests/test_relations/test_foreign_keys.py similarity index 100% rename from tests/test_foreign_keys.py rename to tests/test_relations/test_foreign_keys.py diff --git a/tests/test_m2m_through_fields.py b/tests/test_relations/test_m2m_through_fields.py similarity index 100% rename from tests/test_m2m_through_fields.py rename to tests/test_relations/test_m2m_through_fields.py diff --git a/tests/test_many_to_many.py b/tests/test_relations/test_many_to_many.py similarity index 100% rename from tests/test_many_to_many.py rename to tests/test_relations/test_many_to_many.py diff --git a/tests/test_prefetch_related.py b/tests/test_relations/test_prefetch_related.py similarity index 100% rename from tests/test_prefetch_related.py rename to tests/test_relations/test_prefetch_related.py diff --git a/tests/test_prefetch_related_multiple_models_relation.py b/tests/test_relations/test_prefetch_related_multiple_models_relation.py similarity index 100% rename from tests/test_prefetch_related_multiple_models_relation.py rename to tests/test_relations/test_prefetch_related_multiple_models_relation.py diff --git a/tests/test_relations_default_exception.py b/tests/test_relations/test_relations_default_exception.py similarity index 100% rename from tests/test_relations_default_exception.py rename to tests/test_relations/test_relations_default_exception.py diff --git a/tests/test_select_related_with_limit.py b/tests/test_relations/test_select_related_with_limit.py similarity index 100% rename from tests/test_select_related_with_limit.py rename to tests/test_relations/test_select_related_with_limit.py diff --git a/tests/test_select_related_with_m2m_and_pk_name_set.py b/tests/test_relations/test_select_related_with_m2m_and_pk_name_set.py similarity index 100% rename from tests/test_select_related_with_m2m_and_pk_name_set.py rename to tests/test_relations/test_select_related_with_m2m_and_pk_name_set.py diff --git a/tests/test_selecting_proper_table_prefix.py b/tests/test_relations/test_selecting_proper_table_prefix.py similarity index 100% rename from tests/test_selecting_proper_table_prefix.py rename to tests/test_relations/test_selecting_proper_table_prefix.py diff --git a/tests/test_through_relations_fail.py b/tests/test_relations/test_through_relations_fail.py similarity index 100% rename from tests/test_through_relations_fail.py rename to tests/test_relations/test_through_relations_fail.py diff --git a/tests/test_signals/__init__.py b/tests/test_signals/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_signals.py b/tests/test_signals/test_signals.py similarity index 100% rename from tests/test_signals.py rename to tests/test_signals/test_signals.py diff --git a/tests/test_signals_for_relations.py b/tests/test_signals/test_signals_for_relations.py similarity index 100% rename from tests/test_signals_for_relations.py rename to tests/test_signals/test_signals_for_relations.py diff --git a/tests/test_utils/__init__.py b/tests/test_utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_models_helpers.py b/tests/test_utils/test_models_helpers.py similarity index 100% rename from tests/test_models_helpers.py rename to tests/test_utils/test_models_helpers.py diff --git a/tests/test_queryset_utils.py b/tests/test_utils/test_queryset_utils.py similarity index 100% rename from tests/test_queryset_utils.py rename to tests/test_utils/test_queryset_utils.py