v1.0.18

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Run Unit Tests
+name: Run Pytest
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
       - "!main"
 
 jobs:
-  run_tests:
+  pytest:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -33,7 +33,7 @@ jobs:
 
       - name: Run tests
         run: |  
-          python -m poetry run coverage run --omit=./tests/* --source=./ddcDatabases -m pytest -v
+          python -m poetry run coverage run --omit=./tests/* -m pytest -v
 
       - name: Generate Coverage Report
         run: |  
@@ -44,3 +44,4 @@ jobs:
 #        uses: codecov/codecov-action@v5
 #        with:
 #            token: ${{ secrets.CODECOV_TOKEN }}
+#            slug: ddc/ddcDatabases

.github/workflows/workflow.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Run tests
         run: |  
-          python -m poetry run coverage run --omit=./tests/* --source=./ddcDatabases -m pytest -v
+          python -m poetry run coverage run --omit=./tests/* -m pytest -v
 
       - name: Generate Coverage Report
         run: |  
@@ -43,6 +43,7 @@ jobs:
 #        uses: codecov/codecov-action@v5
 #        with:
 #            token: ${{ secrets.CODECOV_TOKEN }}
+#            slug: ddc/ddcDatabases
 
       - name: Build package with poetry
         run: |  

README.md

@@ -1,11 +1,12 @@
 # Databases Connection and Queries
 
+[![Donate](https://img.shields.io/badge/Donate-PayPal-brightgreen.svg?style=plastic)](https://www.paypal.com/ncp/payment/6G9Z78QHUD4RJ)
 [![License](https://img.shields.io/pypi/l/ddcDatabases)](https://github.com/ddc/ddcDatabases/blob/master/LICENSE)
-[![Python](https://img.shields.io/pypi/pyversions/ddcDatabases.svg)](https://www.python.org)
 [![PyPi](https://img.shields.io/pypi/v/ddcDatabases.svg)](https://pypi.python.org/pypi/ddcDatabases)
 [![PyPI Downloads](https://static.pepy.tech/badge/ddcDatabases)](https://pepy.tech/projects/ddcDatabases)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A//actions-badge.atrox.dev/ddc/ddcDatabases/badge?ref=main&label=build&logo=none)](https://actions-badge.atrox.dev/ddc/ddcDatabases/goto?ref=main)
+[![Python](https://img.shields.io/pypi/pyversions/ddcDatabases.svg)](https://www.python.org)
 
 [//]: # ([![codecov](https://codecov.io/github/ddc/ddcDatabases/graph/badge.svg?token=E942EZII4Q)](https://codecov.io/github/ddc/ddcDatabases))
 
@@ -35,7 +36,7 @@ pip install ddcDatabases[pgsql]
 # Databases
 + Parameters for all classes are declared as OPTIONAL falling back to [.env](./ddcDatabases/.env.example)  file variables
 + All examples are using [db_utils.py](ddcDatabases/db_utils.py)
-+ By default, the MSSQL class will open a session to the database, but the engine can be available
++ By default, the MSSQL class will open a session to the database, but the engine can be available at `session.bind`
 + SYNC sessions defaults:
   + `autoflush is True`
   + `expire_on_commit is True`
@@ -73,7 +74,8 @@ with Sqlite() as session:
 #### Sync Engine
 ```python
 from ddcDatabases import Sqlite
-with Sqlite().engine() as engine:
+with Sqlite() as session:
+    engine = session.bind
     ...
 ```
 
@@ -126,14 +128,16 @@ async with MSSQL() as session:
 #### Sync Engine
 ```python
 from ddcDatabases import MSSQL
-with MSSQL().engine() as engine:
+with MSSQL() as session:
+    engine = session.bind
     ...
 ```
 
 #### Async Engine
 ```python
 from ddcDatabases import MSSQL
-async with MSSQL().async_engine() as engine:
+async with MSSQL() as session:
+    engine = await session.bind
     ...
 ```
 
@@ -184,14 +188,16 @@ async with PostgreSQL() as session:
 #### Sync Engine
 ```python
 from ddcDatabases import PostgreSQL
-with PostgreSQL().engine() as engine:
+with PostgreSQL() as session:
+    engine = session.bind
     ...
 ```
 
 #### Async Engine
 ```python
 from ddcDatabases import PostgreSQL
-async with PostgreSQL().async_engine() as engine:
+async with PostgreSQL() as session:
+    engine = await session.bind
     ...
 ```
 

pyproject.toml

@@ -2,9 +2,10 @@
 requires = ["poetry-core>=1.9.1"]
 build-backend = "poetry.core.masonry.api"
 
+
 [tool.poetry]
 name = "ddcDatabases"
-version = "1.0.17"
+version = "1.0.18"
 description = "Databases Connection and Queries"
 license = "MIT"
 readme = "README.md"
@@ -33,9 +34,11 @@ classifiers = [
     "Natural Language :: English",
 ]
 
+
 [tool.poetry.group.test]
 optional = true
 
+
 [tool.poetry.dependencies]
 python = "^3.10"
 aioodbc = "^0.5.0"
@@ -46,20 +49,29 @@ pyodbc = "^5.2.0"
 SQLAlchemy = "^2.0.36"
 pytest = "^8.3.4"
 
+
 [tool.poetry.extras]
 mssql = [ "pyodbc", "aioodbc" ]
 pgsql = [ "psycopg2-binary", "asyncpg" ]
 all = [ "pyodbc", "aioodbc", "psycopg2-binary", "asyncpg" ]
 
+
 [tool.poetry.group.test.dependencies]
 coverage = "^7.6.9"
 faker = "^33.1.0"
 poethepoet = "^0.31.1"
 pytest = "^8.3.4"
 
+
+[tool.coverage.run]
+omit = [
+    "tests/*",
+]
+
+
 [tool.poe.tasks]
-_test = "poetry run coverage run --omit=./tests/* --source=./ddcDatabases -m pytest -v"
-_coverage_report = "poetry run coverage report"
-_coverage_xml = "poetry run coverage xml"
+_test = "coverage run -m pytest -v"
+_coverage_report = "coverage report"
+_coverage_xml = "coverage xml"
 tests = ["_test", "_coverage_report", "_coverage_xml"]
 test = ["tests"]

tests/conftest.py

@@ -2,14 +2,14 @@
 import pytest
 from sqlalchemy.pool import StaticPool
 from ddcDatabases import Sqlite
-from tests.data.base_data import get_fake_test_data, sqlite_filename
+from tests.data.base_data import get_fake_test_data
 
 
 @pytest.fixture(name="sqlite_session", scope="session")
 def sqlite_session():
     extra_engine_args = {"poolclass": StaticPool}
     with Sqlite(
-        filepath=sqlite_filename,
+        filepath=":memory:",
         extra_engine_args=extra_engine_args,
     ) as session:
         yield session

tests/dal/test_model_dal.py → tests/dal/model_dal_test.py

@@ -2,7 +2,7 @@
 import sqlalchemy as sa
 from ddcDatabases import DBUtils
 from ddcDatabases.exceptions import DBFetchAllException
-from tests.models.test_model import ModelTest
+from tests.models.model_test import ModelTest
 
 
 class ModelDalTest:

tests/data/base_data.py

@@ -2,9 +2,6 @@
 from faker import Faker
 
 
-sqlite_filename = "test.db"
-
-
 def _set_randoms():
     _faker = Faker(locale="en_US")
     return {

tests/unit/test_sqlite.py

@@ -1,45 +1,42 @@
 # -*- coding: utf-8 -*-
-import os
-import pytest
-from ddcDatabases import Sqlite
-from tests.dal.test_model_dal import ModelDalTest
-from tests.data.base_data import sqlite_filename
-from tests.models.test_model import ModelTest
+from tests.dal.model_dal_test import ModelDalTest
+from tests.models.model_test import ModelTest
 
 
 class TestSQLite:
     @classmethod
     def setup_class(cls):
-        with Sqlite(sqlite_filename).engine() as engine:
-            ModelTest.__table__.create(engine)
+        """ setup_class """
+        pass
 
     @classmethod
     def teardown_class(cls):
-        os.remove(sqlite_filename)
+        """ teardown_class """
+        pass
 
-    @pytest.fixture(autouse=True, scope="class")
-    def test_insert(self, sqlite_session, fake_test_data):
+    def test_sqlite(self, sqlite_session, fake_test_data):
+        ModelTest.__table__.create(sqlite_session.bind)
         sqlite_session.add(ModelTest(**fake_test_data))
         config_dal = ModelDalTest(sqlite_session)
         config_id = fake_test_data["id"]
         results = config_dal.get(config_id)
         assert len(results) == 1
 
-    def test_get(self, sqlite_session, fake_test_data):
+        # test_get
         test_dal = ModelDalTest(sqlite_session)
         config_id = fake_test_data["id"]
         results = test_dal.get(config_id)
         assert len(results) == 1
 
-    def test_update_str(self, sqlite_session, fake_test_data):
+        # test_update_str
         test_dal = ModelDalTest(sqlite_session)
         _id = fake_test_data["id"]
         name = "Test_1"
         test_dal.update_name(name, _id)
         results = test_dal.get(_id)
         assert results[0]["name"] == name
 
-    def test_update_bool(self, sqlite_session, fake_test_data):
+        # test_update_bool
         test_dal = ModelDalTest(sqlite_session)
         _id = fake_test_data["id"]
         status = (True, False,)