Prodream/ormar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix minor code smells

Browse Source
This commit is contained in:
collerek
2021-01-05 15:30:39 +01:00
parent 31b4c2e82b
commit bca77a3687
5 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ormar/fields/foreign_key.py
View File

@ -72,8 +72,6 @@ class UniqueColumns(UniqueConstraint):
Used to avoid importing anything from sqlalchemy by user. Used to avoid importing anything from sqlalchemy by user.
""" """
pass
@dataclass @dataclass
class ForeignKeyConstraint: class ForeignKeyConstraint:

1
ormar/fields/model_fields.py
View File

@ -112,7 +112,6 @@ class ModelFieldFactory:
:param kwargs: all params passed during construction :param kwargs: all params passed during construction
:type kwargs: Any :type kwargs: Any
""" """
pass
class String(ModelFieldFactory, str): class String(ModelFieldFactory, str):

3
ormar/models/helpers/models.py
View File

@ -79,5 +79,4 @@ def validate_related_names_in_relations(
f"default/empty name: '{new_model.get_name() + 's'}'" f"default/empty name: '{new_model.get_name() + 's'}'"
f"\nTip: provide different related_name for FK and/or M2M fields" f"\nTip: provide different related_name for FK and/or M2M fields"
) )
else: previous_related_names.append(field.related_name)
previous_related_names.append(field.related_name)

4
tests/test_inheritance_concrete.py
View File

@ -4,7 +4,6 @@ from typing import List, Optional
import databases import databases
import pytest import pytest
import sqlalchemy
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy import create_engine from sqlalchemy import create_engine
@ -196,8 +195,7 @@ def test_field_redefining_in_concrete_models():
assert changed_field.alias == "creation_date" assert changed_field.alias == "creation_date"
assert any(x.name == "creation_date" for x in RedefinedField.Meta.table.columns) assert any(x.name == "creation_date" for x in RedefinedField.Meta.table.columns)
assert isinstance( assert isinstance(
RedefinedField.Meta.table.columns["creation_date"].type, RedefinedField.Meta.table.columns["creation_date"].type, sa.sql.sqltypes.String,
sqlalchemy.sql.sqltypes.String,
) )

4
tests/test_inheritance_mixins.py
View File

@ -4,12 +4,10 @@ from typing import Optional
import databases import databases
import pytest import pytest
import sqlalchemy
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy import create_engine from sqlalchemy import create_engine
import ormar import ormar
from ormar import ModelDefinitionError
from tests.settings import DATABASE_URL from tests.settings import DATABASE_URL
metadata = sa.MetaData() metadata = sa.MetaData()
@ -94,7 +92,7 @@ def test_field_redefining_in_second_raises_error():
assert any(x.name == "creation_date" for x in RedefinedField2.Meta.table.columns) assert any(x.name == "creation_date" for x in RedefinedField2.Meta.table.columns)
assert isinstance( assert isinstance(
RedefinedField2.Meta.table.columns["creation_date"].type, RedefinedField2.Meta.table.columns["creation_date"].type,
sqlalchemy.sql.sqltypes.String, sa.sql.sqltypes.String,
) )