Make create_all and drop_all async (#135)

Author: aminalaee

README.md

@@ -22,8 +22,6 @@ MySQL, and SQLite. ORM is built with:
 Because ORM is built on SQLAlchemy core, you can use Alembic to provide
 database migrations.
 
-**ORM is still under development: We recommend pinning any dependencies with `orm~=0.2`**
-
 ---
 
 **Documentation**: [https://www.encode.io/orm](https://www.encode.io/orm)
@@ -70,7 +68,7 @@ class Note(orm.Model):
     }
 
 # Create the tables
-models.create_all()
+await models.create_all()
 
 await Note.objects.create(text="Buy the groceries.", completed=False)
 

docs/declaring_models.md

@@ -31,9 +31,9 @@ ORM can create or drop database and tables from models using SQLAlchemy.
 You can use the following methods:
 
 ```python
-models.create_all()
+await models.create_all()
 
-models.drop_all()
+await models.drop_all()
 ```
 
 ## Data types

docs/index.md

@@ -66,7 +66,7 @@ class Note(orm.Model):
     }
 
 # Create the database and tables
-models.create_all()
+await models.create_all()
 
 await Note.objects.create(text="Buy the groceries.", completed=False)
 

orm/models.py

@@ -1,6 +1,5 @@
 import typing
 
-import anyio
 import databases
 import sqlalchemy
 import typesystem
@@ -28,15 +27,8 @@ def __init__(self, database: databases.Database) -> None:
         self.models = {}
         self.metadata = sqlalchemy.MetaData()
 
-    def create_all(self):
+    async def create_all(self):
         url = self._get_database_url()
-        anyio.run(self._create_all, url)
-
-    def drop_all(self):
-        url = self._get_database_url()
-        anyio.run(self._drop_all, url)
-
-    async def _create_all(self, url: str):
         engine = create_async_engine(url)
 
         for model_cls in self.models.values():
@@ -48,7 +40,8 @@ async def _create_all(self, url: str):
 
         await engine.dispose()
 
-    async def _drop_all(self, url: str):
+    async def drop_all(self):
+        url = self._get_database_url()
         engine = create_async_engine(url)
 
         for model_cls in self.models.values():

requirements.txt

@@ -6,6 +6,7 @@ twine
 wheel
 
 # Testing
+anyio>=3.0.0,<4
 autoflake
 black
 codecov

setup.py

@@ -51,7 +51,7 @@ def get_packages(package):
     packages=get_packages(PACKAGE),
     package_data={PACKAGE: ["py.typed"]},
     data_files=[("", ["LICENSE.md"])],
-    install_requires=["anyio>=3.0.0,<4", "databases~=0.5", "typesystem==0.3.1"],
+    install_requires=["databases~=0.5", "typesystem==0.3.1"],
     extras_require={
         "postgresql": ["asyncpg"],
         "mysql": ["aiomysql"],

tests/conftest.py

@@ -1,6 +1,6 @@
 import pytest
 
 
-@pytest.fixture
+@pytest.fixture(scope="module")
 def anyio_backend():
     return ("asyncio", {"debug": True})

tests/test_columns.py

@@ -54,10 +54,10 @@ class User(orm.Model):
 
 
 @pytest.fixture(autouse=True, scope="module")
-def create_test_database():
-    models.create_all()
+async def create_test_database():
+    await models.create_all()
     yield
-    models.drop_all()
+    await models.drop_all()
 
 
 @pytest.fixture(autouse=True)

tests/test_foreignkey.py

@@ -76,10 +76,10 @@ class Person(orm.Model):
 
 
 @pytest.fixture(autouse=True, scope="module")
-def create_test_database():
-    models.create_all()
+async def create_test_database():
+    await models.create_all()
     yield
-    models.drop_all()
+    await models.drop_all()
 
 
 @pytest.fixture(autouse=True)

tests/test_models.py

@@ -33,10 +33,10 @@ class Product(orm.Model):
 
 
 @pytest.fixture(autouse=True, scope="function")
-def create_test_database():
-    models.create_all()
+async def create_test_database():
+    await models.create_all()
     yield
-    models.drop_all()
+    await models.drop_all()
 
 
 @pytest.fixture(autouse=True)