encode · Dec 1, 2021 · Dec 1, 2021 · Dec 1, 2021 · Dec 1, 2021 · Dec 1, 2021
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,9 +13,9 @@ jobs:
 
     steps:
       - uses: "actions/checkout@v2"
-      - uses: "actions/setup-python@v1"
+      - uses: "actions/setup-python@v2"
         with:
-          python-version: 3.7
+          python-version: 3.11
       - name: "Install dependencies"
         run: "scripts/install"
       - name: "Build package & docs"
@@ -24,4 +24,4 @@ jobs:
         run: "scripts/publish"
         env:
           TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -10,24 +10,14 @@ on:
 jobs:
   tests:
     name: "Python ${{ matrix.python-version }}"
-    runs-on: "ubuntu-latest"
+    if: "!contains(github.event.head_commit.message, 'Bump version') || github.event_name != 'push'"
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_USER: username
-          MYSQL_PASSWORD: password
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_DATABASE: testsuite
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
       postgres:
         image: postgres:14
         env:
@@ -53,11 +43,28 @@ jobs:
         env:
           TEST_DATABASE_URLS: |
             sqlite:///testsuite,
-            sqlite+aiosqlite:///testsuite,
-            mysql://username:password@localhost:3306/testsuite,
-            mysql+aiomysql://username:password@localhost:3306/testsuite,
-            mysql+asyncmy://username:password@localhost:3306/testsuite,
-            postgresql://username:password@localhost:5432/testsuite,
-            postgresql+aiopg://username:password@127.0.0.1:5432/testsuite,
-            postgresql+asyncpg://username:password@localhost:5432/testsuite
+            postgresql://username:password@localhost:5432/testsuite
         run: "scripts/test"
+  bump_version:
+    name: Bump the version
+    needs: [ tests ]
+    if: "!contains(github.event.head_commit.message, 'Bump version') && github.ref == 'refs/heads/master' && github.event_name == 'push'"
+    runs-on: ubuntu-22.04
+    steps:
+    - name: actions/checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 100
+        persist-credentials: false
+        submodules: true
+    - name: current_version
+      run: echo "current_version=$(grep '__version__' morcilla/__init__.py | cut -d\" -f2)" >> $GITHUB_ENV
+    - name: FragileTech/bump-version
+      uses: FragileTech/bump-version@main
+      with:
+        current_version: "${{ env.current_version }}"
+        files: morcilla/__init__.py
+        commit_name: Groundskeeper Willie
+        commit_email: bot@athenian.co
+        login: gkwillie
+        token: ${{ secrets.GKWILLIE_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ __pycache__/
 *.egg-info/
 htmlcov/
 venv/
+.idea
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,52 +1,43 @@
-# Databases
+# Morcilla
 
 <p>
-<a href="https://github.com/encode/databases/actions">
-    <img src="https://github.com/encode/databases/workflows/Test%20Suite/badge.svg" alt="Test Suite">
+<a href="https://github.com/athenianco/morcilla/actions">
+    <img src="https://github.com/athenianco/morcilla/workflows/Test%20Suite/badge.svg" alt="Test Suite">
 </a>
-<a href="https://pypi.org/project/databases/">
-    <img src="https://badge.fury.io/py/databases.svg" alt="Package version">
+<a href="https://pypi.org/project/morcilla/">
+    <img src="https://badge.fury.io/py/morcilla.svg" alt="Package version">
 </a>
 </p>
 
-Databases gives you simple asyncio support for a range of databases.
+Morcilla gives you simple and high-performant asyncio support for a range of databases.
+The project is a hard fork of [encode/databases](https://github.com/encode/databases).
 
 It allows you to make queries using the powerful [SQLAlchemy Core][sqlalchemy-core]
-expression language, and provides support for PostgreSQL, MySQL, and SQLite.
+expression language, and provides support for PostgreSQL and SQLite.
 
-Databases is suitable for integrating against any async Web framework, such as [Starlette][starlette],
-[Sanic][sanic], [Responder][responder], [Quart][quart], [aiohttp][aiohttp], [Tornado][tornado], or [FastAPI][fastapi].
+Morcilla is suitable for integrating against any async Web framework.
 
-**Documentation**: [https://www.encode.io/databases/](https://www.encode.io/databases/)
-
-**Requirements**: Python 3.6+
+**Requirements**: Python 3.8+
 
 ---
 
 ## Installation
 
 ```shell
-$ pip install databases
+$ pip install morcilla
 ```
 
 You can install the required database drivers with:
 
 ```shell
-$ pip install databases[postgresql]
-$ pip install databases[mysql]
-$ pip install databases[sqlite]
+$ pip install morcilla[postgresql]
+$ pip install morcilla[sqlite]
 ```
 
-Default driver support is provided using one of [asyncpg][asyncpg], [aiomysql][aiomysql], or [aiosqlite][aiosqlite].
-
-You can also use other database drivers supported by `databases`:
+Default driver support is provided using one of [asyncpg][asyncpg] or [aiosqlite][aiosqlite].
 
-```shel
-$ pip install databases[postgresql+aiopg]
-$ pip install databases[mysql+asyncmy]
-```
 
-Note that if you are using any synchronous SQLAlchemy functions such as `engine.create_all()` or [alembic][alembic] migrations then you still have to install a synchronous DB driver: [psycopg2][psycopg2] for PostgreSQL and [pymysql][pymysql] for MySQL.
+Note that if you are using any synchronous SQLAlchemy functions such as `engine.create_all()` or [alembic][alembic] migrations then you still have to install a synchronous DB driver: [psycopg2][psycopg2] for PostgreSQL.
 
 ---
 
@@ -56,7 +47,7 @@ For this example we'll create a very simple SQLite database to run some
 queries against.
 
 ```shell
-$ pip install databases[sqlite]
+$ pip install morcilla[sqlite]
 $ pip install ipython
 ```
 
@@ -67,7 +58,7 @@ expressions directly from the console.
 
 ```python
 # Create a database instance, and connect to it.
-from databases import Database
+from morcilla import Database
 database = Database('sqlite:///example.db')
 await database.connect()
 
@@ -90,26 +81,28 @@ rows = await database.fetch_all(query=query)
 print('High Scores:', rows)
 ```
 
-Check out the documentation on [making database queries](https://www.encode.io/databases/database_queries/)
-for examples of how to start using databases together with SQLAlchemy core expressions.
+Check out the documentation on [making database queries](https://www.encode.io/morcilla/database_queries/)
+for examples of how to start using morcilla together with SQLAlchemy core expressions.
+
+## Why hard fork?
 
+Morcilla satisfies one particular requirement that Athenian has: to provide the best performance
+at any cost, while sacrificing as little developer experience as possible. Hence it rejects
+the uniform Record interface that `encode/databases` provides in favor of native backend objects.
+Thus there is no guarantee that the same code will work equally successful for all the supported
+DB backends. Besides, we have optimized Morcilla for asyncpg, so e.g. asyncpg performs JSON serialization and
+deserialization instead of sqlalchemy for performance boost. The character of the changes is
+very much breaking the existing code, and they should not be submitted upstream.
 
-<p align="center">&mdash; ⭐️ &mdash;</p>
-<p align="center"><i>Databases is <a href="https://github.com/encode/databases/blob/master/LICENSE.md">BSD licensed</a> code. Designed & built in Brighton, England.</i></p>
+Finally, we are going to add new backends such as Clickhouse in the future.
+
+## Why "morcilla"?
+
+Morcilla means blood sausage in Spanish. So the name reflects the ~bloody mess~ gory nature of the code.
 
 [sqlalchemy-core]: https://docs.sqlalchemy.org/en/latest/core/
 [sqlalchemy-core-tutorial]: https://docs.sqlalchemy.org/en/latest/core/tutorial.html
 [alembic]: https://alembic.sqlalchemy.org/en/latest/
 [psycopg2]: https://www.psycopg.org/
-[pymysql]: https://github.com/PyMySQL/PyMySQL
 [asyncpg]: https://github.com/MagicStack/asyncpg
-[aiomysql]: https://github.com/aio-libs/aiomysql
 [aiosqlite]: https://github.com/jreese/aiosqlite
-
-[starlette]: https://github.com/encode/starlette
-[sanic]: https://github.com/huge-success/sanic
-[responder]: https://github.com/kennethreitz/responder
-[quart]: https://gitlab.com/pgjones/quart
-[aiohttp]: https://github.com/aio-libs/aiohttp
-[tornado]: https://github.com/tornadoweb/tornado
-[fastapi]: https://github.com/tiangolo/fastapi
diff --git a/databases/__init__.py b/databases/__init__.py
-Original file line number
+Diff line change
@@ @@ -8,3 +8,4 @@ __pycache__/ @@
     *.egg-info/
     htmlcov/
     venv/
+    .idea