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

renames etc.

Browse Source
This commit is contained in:
collerek
2020-08-14 19:36:50 +02:00
parent 0ebecc8610
commit 062d35168f
50 changed files with 398 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_columns.py
View File

@ -4,7 +4,7 @@ import databases
import pytest
import sqlalchemy
import orm
import ormar
from tests.settings import DATABASE_URL
database = databases.Database(DATABASE_URL, force_rollback=True)
@ -15,18 +15,18 @@ def time():
return datetime.datetime.now().time()
class Example(orm.Model):
class Example(ormar.Model):
__tablename__ = "example"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
created = orm.DateTime(default=datetime.datetime.now)
created_day = orm.Date(default=datetime.date.today)
created_time = orm.Time(default=time)
description = orm.Text(nullable=True)
value = orm.Float(nullable=True)
data = orm.JSON(default={})
id = ormar.Integer(primary_key=True)
created = ormar.DateTime(default=datetime.datetime.now)
created_day = ormar.Date(default=datetime.date.today)
created_time = ormar.Time(default=time)
description = ormar.Text(nullable=True)
value = ormar.Float(nullable=True)
data = ormar.JSON(default={})
@pytest.fixture(autouse=True, scope="module")

17
tests/test_fastapi_usage.py
View File

@ -3,8 +3,7 @@ import sqlalchemy
from fastapi import FastAPI
from fastapi.testclient import TestClient
import orm
import orm.fields.foreign_key
import ormar
from tests.settings import DATABASE_URL
app = FastAPI()
@ -13,23 +12,23 @@ database = databases.Database(DATABASE_URL, force_rollback=True)
metadata = sqlalchemy.MetaData()
class Category(orm.Model):
class Category(ormar.Model):
__tablename__ = "categories"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
name = orm.String(length=100)
id = ormar.Integer(primary_key=True)
name = ormar.String(length=100)
class Item(orm.Model):
class Item(ormar.Model):
__tablename__ = "items"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
name = orm.String(length=100)
category = orm.fields.foreign_key.ForeignKey(Category, nullable=True)
id = ormar.Integer(primary_key=True)
name = ormar.String(length=100)
category = ormar.ForeignKey(Category, nullable=True)
@app.post("/items/", response_model=Item)

50
tests/test_foreign_keys.py
View File

@ -2,71 +2,71 @@ import databases
import pytest
import sqlalchemy
import orm
from orm.exceptions import NoMatch, MultipleMatches, RelationshipInstanceError
import ormar
from ormar.exceptions import NoMatch, MultipleMatches, RelationshipInstanceError
from tests.settings import DATABASE_URL
database = databases.Database(DATABASE_URL, force_rollback=True)
metadata = sqlalchemy.MetaData()
class Album(orm.Model):
class Album(ormar.Model):
__tablename__ = "album"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
name = orm.String(length=100)
id = ormar.Integer(primary_key=True)
name = ormar.String(length=100)
class Track(orm.Model):
class Track(ormar.Model):
__tablename__ = "track"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
album = orm.ForeignKey(Album)
title = orm.String(length=100)
position = orm.Integer()
id = ormar.Integer(primary_key=True)
album = ormar.ForeignKey(Album)
title = ormar.String(length=100)
position = ormar.Integer()
class Cover(orm.Model):
class Cover(ormar.Model):
__tablename__ = "covers"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
album = orm.ForeignKey(Album, related_name='cover_pictures')
title = orm.String(length=100)
id = ormar.Integer(primary_key=True)
album = ormar.ForeignKey(Album, related_name='cover_pictures')
title = ormar.String(length=100)
class Organisation(orm.Model):
class Organisation(ormar.Model):
__tablename__ = "org"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
ident = orm.String(length=100)
id = ormar.Integer(primary_key=True)
ident = ormar.String(length=100)
class Team(orm.Model):
class Team(ormar.Model):
__tablename__ = "team"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
org = orm.ForeignKey(Organisation)
name = orm.String(length=100)
id = ormar.Integer(primary_key=True)
org = ormar.ForeignKey(Organisation)
name = ormar.String(length=100)
class Member(orm.Model):
class Member(ormar.Model):
__tablename__ = "member"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
team = orm.ForeignKey(Team)
email = orm.String(length=100)
id = ormar.Integer(primary_key=True)
team = ormar.ForeignKey(Team)
email = ormar.String(length=100)
@pytest.fixture(autouse=True, scope="module")

6
tests/test_model_definition.py
View File

@ -4,9 +4,9 @@ import pydantic
import pytest
import sqlalchemy
import orm.fields as fields
from orm.exceptions import ModelDefinitionError
from orm.models import Model
import ormar.fields as fields
from ormar.exceptions import ModelDefinitionError
from ormar.models import Model
metadata = sqlalchemy.MetaData()

30
tests/test_models.py
View File

@ -2,32 +2,32 @@ import databases
import pytest
import sqlalchemy
import orm
from orm.exceptions import QueryDefinitionError
import ormar
from ormar.exceptions import QueryDefinitionError
from tests.settings import DATABASE_URL
database = databases.Database(DATABASE_URL, force_rollback=True)
metadata = sqlalchemy.MetaData()
class User(orm.Model):
class User(ormar.Model):
__tablename__ = "users"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
name = orm.String(length=100)
id = ormar.Integer(primary_key=True)
name = ormar.String(length=100)
class Product(orm.Model):
class Product(ormar.Model):
__tablename__ = "product"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
name = orm.String(length=100)
rating = orm.Integer(minimum=1, maximum=5)
in_stock = orm.Boolean(default=False)
id = ormar.Integer(primary_key=True)
name = ormar.String(length=100)
rating = ormar.Integer(minimum=1, maximum=5)
in_stock = ormar.Boolean(default=False)
@pytest.fixture(autouse=True, scope="module")
@ -40,9 +40,9 @@ def create_test_database():
def test_model_class():
assert list(User.__model_fields__.keys()) == ["id", "name"]
assert isinstance(User.__model_fields__["id"], orm.Integer)
assert isinstance(User.__model_fields__["id"], ormar.Integer)
assert User.__model_fields__["id"].primary_key is True
assert isinstance(User.__model_fields__["name"], orm.String)
assert isinstance(User.__model_fields__["name"], ormar.String)
assert User.__model_fields__["name"].length == 100
assert isinstance(User.__table__, sqlalchemy.Table)
@ -82,7 +82,7 @@ async def test_model_crud():
@pytest.mark.asyncio
async def test_model_get():
async with database:
with pytest.raises(orm.NoMatch):
with pytest.raises(ormar.NoMatch):
await User.objects.get()
user = await User.objects.create(name="Tom")
@ -90,7 +90,7 @@ async def test_model_get():
assert lookup == user
user = await User.objects.create(name="Jane")
with pytest.raises(orm.MultipleMatches):
with pytest.raises(ormar.MultipleMatches):
await User.objects.get()
same_user = await User.objects.get(pk=user.id)
@ -108,7 +108,7 @@ async def test_model_filter():
user = await User.objects.get(name="Lucy")
assert user.name == "Lucy"
with pytest.raises(orm.NoMatch):
with pytest.raises(ormar.NoMatch):
await User.objects.get(name="Jim")
await Product.objects.create(name="T-Shirt", rating=5, in_stock=True)

43
tests/test_same_table_joins.py
View File

@ -4,62 +4,61 @@ import databases
import pytest
import sqlalchemy
import orm
import orm.fields.foreign_key
import ormar
from tests.settings import DATABASE_URL
database = databases.Database(DATABASE_URL, force_rollback=True)
metadata = sqlalchemy.MetaData()
class Department(orm.Model):
class Department(ormar.Model):
__tablename__ = "departments"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True, autoincrement=False)
name = orm.String(length=100)
id = ormar.Integer(primary_key=True, autoincrement=False)
name = ormar.String(length=100)
class SchoolClass(orm.Model):
class SchoolClass(ormar.Model):
__tablename__ = "schoolclasses"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
name = orm.String(length=100)
department = orm.fields.foreign_key.ForeignKey(Department, nullable=False)
id = ormar.Integer(primary_key=True)
name = ormar.String(length=100)
department = ormar.ForeignKey(Department, nullable=False)
class Category(orm.Model):
class Category(ormar.Model):
__tablename__ = "categories"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
name = orm.String(length=100)
id = ormar.Integer(primary_key=True)
name = ormar.String(length=100)
class Student(orm.Model):
class Student(ormar.Model):
__tablename__ = "students"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
name = orm.String(length=100)
schoolclass = orm.fields.foreign_key.ForeignKey(SchoolClass)
category = orm.fields.foreign_key.ForeignKey(Category, nullable=True)
id = ormar.Integer(primary_key=True)
name = ormar.String(length=100)
schoolclass = ormar.ForeignKey(SchoolClass)
category = ormar.ForeignKey(Category, nullable=True)
class Teacher(orm.Model):
class Teacher(ormar.Model):
__tablename__ = "teachers"
__metadata__ = metadata
__database__ = database
id = orm.Integer(primary_key=True)
name = orm.String(length=100)
schoolclass = orm.fields.foreign_key.ForeignKey(SchoolClass)
category = orm.fields.foreign_key.ForeignKey(Category, nullable=True)
id = ormar.Integer(primary_key=True)
name = ormar.String(length=100)
schoolclass = ormar.ForeignKey(SchoolClass)
category = ormar.ForeignKey(Category, nullable=True)
@pytest.fixture(scope='module')