deev 1.2.0__tar.gz → 1.2.2__tar.gz

{deev-1.2.0/src/deev.egg-info → deev-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deev
-Version: 1.2.0
+Version: 1.2.2
 Summary: ..an entity framework for Python.
 Author-email: Shaun Wilson <mrshaunwilson@msn.com>
 License-Expression: MIT

{deev-1.2.0 → deev-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deev"
-version = "1.2.0"
+version = "1.2.2"
 description = "..an entity framework for Python."
 keywords = ["DB", "database", "entity framework", "mapper"]
 authors = [

{deev-1.2.0 → deev-1.2.2}/src/deev/__init__.py

@@ -11,8 +11,8 @@ from .utils import connect
 from . import common, entities, mongodb, mysql, translation, utils, validation
 
 
-__version__ = '1.2.0'
-__commit__ = '785cdba'
+__version__ = '1.2.2'
+__commit__ = '96178a5'
 __all__ = [
     '__version__', '__commit__',
     'ConnectionString',

{deev-1.2.0 → deev-1.2.2}/src/deev/mongodb/MongoTableAdapter.py

@@ -87,14 +87,14 @@ class MongoTableAdapter(Generic[TEntity]):
         """Return the table/collection name (from explicit override or entity spec)."""
         return self.__table_name if self.__table_name is not None else self.__entity_spec.table_name
 
-    def __get_database(self):
+    def __get_database(self) -> pymongo.database.Database[Any]:
         """Return the pymongo database from the cursor's session."""
         mongo_session = getattr(self.__context.cursor(), 'mongo_session', None)  # type: ignore[union-attr]
         if mongo_session is None:
             raise DbError('Cursor does not have a mongo_session attribute.')
         return mongo_session._client[self.__database_name]  # type: ignore[attr-defined]
 
-    def _get_collection(self) -> pymongo.collection.Collection:
+    def _get_collection(self) -> pymongo.collection.Collection[Any]:
         """Get the MongoDB collection for this adapter."""
         db = self.__get_database()
         return db[self.__get_collection_name()]
@@ -103,12 +103,31 @@ class MongoTableAdapter(Generic[TEntity]):
         """Utility method for creating the target table."""
         self.__deferred_init()
         collection_name = self.__get_collection_name()
-        session_cursor = getattr(self.__context.cursor(), 'mongo_session', None)  # type: ignore[union-attr]
-        if session_cursor is None:
-            raise DbError('Cursor does not have a mongo_session attribute.')
-        db = session_cursor.client[self.__database_name]
-        db[collection_name].insert_one({'_id': 'deev_initialised'})  # type: ignore[attr-defined]
-        db[collection_name].delete_one({'_id': 'deev_initialised'})
+        connection = cast(pymongo.MongoClient[Any], getattr(self.__context, 'mongo_connection', None))
+        db = connection.get_database(self.__database_name)
+        mongo_session = getattr(self.__context.cursor(), 'mongo_session', None)
+        if collection_name not in db.list_collection_names():
+            collection: pymongo.collection.Collection[Any]
+            if len(self.primary_key) > 0:
+                collection = db[collection_name]
+            else:
+                collection = db.create_collection(
+                    name=collection_name,
+                    session=mongo_session,
+                    check_exists=True
+                    # TODO: implement validation as much as is possible between entity spec and mongodb
+                    # validator=
+                    # validationLevel=
+                    # validationAction=
+                )
+            collection.create_index(
+                {
+                    k: 1
+                    for k in self.primary_key
+                },
+                session=mongo_session,
+                unique=True
+            )
 
     def commit(self) -> None:
         self.__context.commit()

{deev-1.2.0 → deev-1.2.2}/src/deev/utils.py

@@ -26,7 +26,7 @@ def connect(connectionstring: ConnectionString | str) -> DbConnection:
             import pymongo
             if connectionstring.database is None:
                 raise DbError(f'ConnectionString is missing `database` component: {connectionstring}')
-            mongo_uri = f'mongodb://{connectionstring.user}:{connectionstring.password}@{connectionstring.server}'
+            mongo_uri = f'mongodb://{connectionstring.user}:{connectionstring.password}@{connectionstring.server}/{connectionstring.database}'
             return MongoProxyConnection(
                 pymongo.MongoClient(mongo_uri),
                 database_name=connectionstring.database

{deev-1.2.0 → deev-1.2.2/src/deev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deev
-Version: 1.2.0
+Version: 1.2.2
 Summary: ..an entity framework for Python.
 Author-email: Shaun Wilson <mrshaunwilson@msn.com>
 License-Expression: MIT