Rename DB classes

This commit is contained in:
François Voron
2019-10-07 17:34:12 +02:00
parent 51b67b0739
commit 20aa806375
6 changed files with 10 additions and 10 deletions

View File

@ -6,7 +6,7 @@ from fastapi_users.models import UserDB
from fastapi_users.password import get_password_hash, verify_and_update_password
class UserDBInterface:
class BaseUserDatabase:
"""
Common interface exposing methods to list, get, create and update users in
the database.

View File

@ -4,7 +4,7 @@ from databases import Database
from sqlalchemy import Boolean, Column, String
from sqlalchemy.ext.declarative import declarative_base
from fastapi_users.db import UserDBInterface
from fastapi_users.db import BaseUserDatabase
from fastapi_users.models import UserDB
Base = declarative_base()
@ -23,7 +23,7 @@ class User(Base):
users = User.__table__
class SQLAlchemyUserDB(UserDBInterface):
class SQLAlchemyUserDatabase(BaseUserDatabase):
database: Database

View File

@ -2,14 +2,14 @@ from fastapi import APIRouter, Depends, HTTPException
from fastapi.security import OAuth2PasswordRequestForm
from starlette import status
from fastapi_users.db import UserDBInterface
from fastapi_users.db import BaseUserDatabase
from fastapi_users.models import UserCreate, UserDB
from fastapi_users.password import get_password_hash
class UserRouter:
def __new__(cls, userDB: UserDBInterface) -> APIRouter:
def __new__(cls, userDB: BaseUserDatabase) -> APIRouter:
router = APIRouter()
@router.post('/register')

View File

@ -1,6 +1,6 @@
import pytest
from fastapi_users.db import UserDBInterface
from fastapi_users.db import BaseUserDatabase
from fastapi_users.models import UserDB
from fastapi_users.password import get_password_hash
@ -21,7 +21,7 @@ def user() -> UserDB:
return active_user
class MockUserDBInterface(UserDBInterface):
class MockUserDBInterface(BaseUserDatabase):
async def get_by_email(self, email: str) -> UserDB:
if email == active_user.email:

View File

@ -4,11 +4,11 @@ import pytest
import sqlalchemy
from databases import Database
from fastapi_users.db.sqlalchemy import Base, SQLAlchemyUserDB
from fastapi_users.db.sqlalchemy import Base, SQLAlchemyUserDatabase
@pytest.fixture
async def sqlalchemy_user_db() -> SQLAlchemyUserDB:
async def sqlalchemy_user_db() -> SQLAlchemyUserDatabase:
DATABASE_URL = 'sqlite:///./test.db'
database = Database(DATABASE_URL)
@ -19,7 +19,7 @@ async def sqlalchemy_user_db() -> SQLAlchemyUserDB:
await database.connect()
yield SQLAlchemyUserDB(database)
yield SQLAlchemyUserDatabase(database)
Base.metadata.drop_all(engine)