database-wrapper-mysql 0.2.17__tar.gz → 0.2.23__tar.gz

{database_wrapper_mysql-0.2.17 → database_wrapper_mysql-0.2.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: database_wrapper_mysql
-Version: 0.2.17
+Version: 0.2.23
 Summary: database_wrapper for MySQL database
 Author-email: Gints Murans <gm@gm.lv>
 License: GNU General Public License v3.0 (GPL-3.0)
@@ -32,7 +32,7 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: database_wrapper==0.2.17
+Requires-Dist: database_wrapper==0.2.23
 Requires-Dist: mysqlclient>=2.2.2
 
 # database_wrapper_mysql

{database_wrapper_mysql-0.2.17 → database_wrapper_mysql-0.2.23}/database_wrapper_mysql/__init__.py

@@ -8,7 +8,7 @@ Part of the database_wrapper package
 
 import logging
 
-from .connector import MyConfig, MySQL, MySqlConnection, MySqlDictCursor
+from .connector import Mysql, MysqlConfig, MysqlConnection, MysqlDictCursor, MysqlTypedDictCursor
 from .db_wrapper_mysql import DBWrapperMysql
 
 # Set the logger to a quiet default, can be enabled if needed
@@ -19,12 +19,13 @@ if logger.level == logging.NOTSET:
 
 __all__ = [
     # Wrappers
-    "DBWrapperMysql",
+    DBWrapperMysql,
     # Connectors
-    "MySQL",
+    Mysql,
     # Connection and Cursor types
-    "MySqlConnection",
-    "MySqlDictCursor",
+    MysqlConnection,
+    MysqlDictCursor,
+    MysqlTypedDictCursor,
     # Helpers
-    "MyConfig",
+    MysqlConfig,
 ]

{database_wrapper_mysql-0.2.17 → database_wrapper_mysql-0.2.23}/database_wrapper_mysql/connector.py

@@ -1,12 +1,12 @@
 from typing import Any, NotRequired, TypedDict
 
-from MySQLdb.connections import Connection as MySqlConnection
-from MySQLdb.cursors import DictCursor as MySqlDictCursor
+from MySQLdb.connections import Connection as MysqlConnection
+from MySQLdb.cursors import DictCursor as MysqlDictCursor
 
 from database_wrapper import DatabaseBackend
 
 
-class MyConfig(TypedDict):
+class MysqlConfig(TypedDict):
     hostname: str
     port: NotRequired[int]
     username: str
@@ -17,12 +17,20 @@ class MyConfig(TypedDict):
     kwargs: NotRequired[dict[str, Any]]
 
 
-class MySQL(DatabaseBackend):
+class MysqlTypedDictCursor(MysqlDictCursor):
+    def fetchone(self) -> dict[str, Any] | None:
+        return super().fetchone()
+
+    def fetchall(self) -> tuple[dict[str, Any], ...]:
+        return super().fetchall()
+
+
+class Mysql(DatabaseBackend):
     """
     MySQL database backend
 
     :param config: Configuration for MySQL
-    :type config: MyConfig
+    :type config: MysqlConfig
 
     Defaults:
         port = 0 - See comment below
@@ -30,10 +38,10 @@ class MySQL(DatabaseBackend):
         collation = utf8_general_ci
     """
 
-    config: MyConfig
+    config: MysqlConfig
 
-    connection: MySqlConnection
-    cursor: MySqlDictCursor
+    connection: MysqlConnection
+    cursor: MysqlTypedDictCursor
 
     ##################
     ### Connection ###
@@ -58,7 +66,7 @@ class MySQL(DatabaseBackend):
             self.config["kwargs"] = {}
 
         self.logger.debug("Connecting to DB")
-        self.connection = MySqlConnection(
+        self.connection = MysqlConnection(
             host=self.config["hostname"],
             user=self.config["username"],
             passwd=self.config["password"],
@@ -77,11 +85,11 @@ class MySQL(DatabaseBackend):
             use_unicode=True,
             charset=self.config["charset"],
             collation=self.config["collation"],
-            cursorclass=MySqlDictCursor,
+            cursorclass=MysqlTypedDictCursor,
             **self.config["kwargs"],
         )
         # TODO: Typings issue
-        self.cursor = self.connection.cursor(MySqlDictCursor)
+        self.cursor = self.connection.cursor(MysqlTypedDictCursor)
 
     def ping(self) -> bool:
         try:

{database_wrapper_mysql-0.2.17 → database_wrapper_mysql-0.2.23}/database_wrapper_mysql/db_wrapper_mysql.py

@@ -3,13 +3,13 @@ from typing import Any
 
 from database_wrapper import DBWrapper
 
-from .connector import MySqlDictCursor
+from .connector import MysqlTypedDictCursor
 
 
 class DBWrapperMysql(DBWrapper):
     """Wrapper for MySQL database"""
 
-    db_cursor: MySqlDictCursor | None
+    db_cursor: MysqlTypedDictCursor | None
     """ MySQL cursor object """
 
     #######################
@@ -20,14 +20,14 @@ class DBWrapperMysql(DBWrapper):
     # We are overriding the __init__ method for the type hinting
     def __init__(
         self,
-        db_cursor: MySqlDictCursor | None = None,
+        db_cursor: MysqlTypedDictCursor | None = None,
         logger: logging.Logger | None = None,
     ):
         """
         Initializes a new instance of the DBWrapper class.
 
         Args:
-            db_cursor (MySqlDictCursor): The MySQL database cursor object.
+            db_cursor (MysqlTypedDictCursor): The MySQL database cursor object.
             logger (logging.Logger, optional): The logger object. Defaults to None.
         """
         super().__init__(db_cursor, logger)
@@ -36,12 +36,12 @@ class DBWrapperMysql(DBWrapper):
     ### Setters ###
     ###############
 
-    def set_db_cursor(self, db_cursor: MySqlDictCursor | None) -> None:
+    def set_db_cursor(self, db_cursor: MysqlTypedDictCursor | None) -> None:
         """
         Updates the database cursor object.
 
         Args:
-            db_cursor (MySqlDictCursor): The new database cursor object.
+            db_cursor (MysqlTypedDictCursor): The new database cursor object.
         """
         super().set_db_cursor(db_cursor)
 
@@ -51,7 +51,7 @@ class DBWrapperMysql(DBWrapper):
 
     def log_query(
         self,
-        cursor: MySqlDictCursor,
+        cursor: MysqlTypedDictCursor,
         query: Any,
         params: tuple[Any, ...],
     ) -> None:
@@ -59,7 +59,7 @@ class DBWrapperMysql(DBWrapper):
         Logs the given query and parameters.
 
         Args:
-            cursor (MySqlDictCursor): The cursor used to execute the query.
+            cursor (MysqlTypedDictCursor): The cursor used to execute the query.
             query (Any): The query to log.
             params (tuple[Any, ...]): The parameters to log.
         """

{database_wrapper_mysql-0.2.17 → database_wrapper_mysql-0.2.23}/database_wrapper_mysql.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: database_wrapper_mysql
-Version: 0.2.17
+Version: 0.2.23
 Summary: database_wrapper for MySQL database
 Author-email: Gints Murans <gm@gm.lv>
 License: GNU General Public License v3.0 (GPL-3.0)
@@ -32,7 +32,7 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: database_wrapper==0.2.17
+Requires-Dist: database_wrapper==0.2.23
 Requires-Dist: mysqlclient>=2.2.2
 
 # database_wrapper_mysql

database_wrapper_mysql-0.2.23/database_wrapper_mysql.egg-info/requires.txt

@@ -0,0 +1,2 @@
+database_wrapper==0.2.23
+mysqlclient>=2.2.2

{database_wrapper_mysql-0.2.17 → database_wrapper_mysql-0.2.23}/pyproject.toml

@@ -4,14 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "database_wrapper_mysql"
-version = "0.2.17"
+version = "0.2.23"
 description = "database_wrapper for MySQL database"
 readme = "README.md"
 requires-python = ">=3.8"
-license = {text = "GNU General Public License v3.0 (GPL-3.0)"}
-authors = [
-    {name = "Gints Murans", email = "gm@gm.lv"}
-]
+license = { text = "GNU General Public License v3.0 (GPL-3.0)" }
+authors = [{ name = "Gints Murans", email = "gm@gm.lv" }]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
@@ -31,13 +29,10 @@ classifiers = [
     "Topic :: Database",
     "Topic :: Database :: Front-Ends",
     "Topic :: Software Development",
-    "Topic :: Software Development :: Libraries :: Python Modules"
+    "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 keywords = ["database", "wrapper", "python", "mysql", "mariadb"]
-dependencies = [
-    "database_wrapper == 0.2.17",
-    "mysqlclient >= 2.2.2"
-]
+dependencies = ["database_wrapper == 0.2.23", "mysqlclient >= 2.2.2"]
 
 [project.urls]
 Homepage = "https://github.com/gintsmurans/py_database_wrapper"

database_wrapper_mysql-0.2.17/database_wrapper_mysql.egg-info/requires.txt

@@ -1,2 +0,0 @@
-database_wrapper==0.2.17
-mysqlclient>=2.2.2