rename classes

dj_db_conn_pool/backends/jdbc/mixins.py

@@ -5,7 +5,7 @@
 import jpype.dbapi2
 
 from dj_db_conn_pool.backends.jdbc.utils import CursorWrapper
-from dj_db_conn_pool.core.mixins import PersistentDatabaseWrapperMixin
+from dj_db_conn_pool.core.mixins import DatabasePoolWrapperMixin
 
 logger = logging.getLogger(__name__)
 
@@ -22,7 +22,7 @@ def do_ping(self, dbapi_connection):
             return False
 
 
-class JDBCDatabaseWrapperMixin(PersistentDatabaseWrapperMixin):
+class JDBCDatabaseWrapperMixin(DatabasePoolWrapperMixin):
     Database = jpype.dbapi2
 
     @property

dj_db_conn_pool/backends/mysql/base.py

@@ -3,12 +3,12 @@
 from django.db.backends.mysql import base
 from sqlalchemy.dialects.mysql.mysqldb import MySQLDialect_mysqldb as MySQLDialect
 
-from dj_db_conn_pool.core.mixins import PersistentDatabaseWrapperMixin
+from dj_db_conn_pool.core.mixins import DatabasePoolWrapperMixin
 
 logger = logging.getLogger(__name__)
 
 
-class DatabaseWrapper(PersistentDatabaseWrapperMixin, base.DatabaseWrapper):
+class DatabaseWrapper(DatabasePoolWrapperMixin, base.DatabaseWrapper):
     class SQLAlchemyDialect(MySQLDialect):
         pass
 

dj_db_conn_pool/backends/odbc/mixins.py

@@ -1,10 +1,10 @@
 import pyodbc
 from django.conf import ImproperlyConfigured
 
-from dj_db_conn_pool.core.mixins import PersistentDatabaseWrapperMixin
+from dj_db_conn_pool.core.mixins import DatabasePoolWrapperMixin
 
 
-class ODBCWrapperMixin(PersistentDatabaseWrapperMixin):
+class ODBCDatabaseWrapperMixin(DatabasePoolWrapperMixin):
     def _get_new_connection(self, conn_params):
         try:
             driver = self.settings_dict['ODBC_OPTIONS']['DRIVER']

dj_db_conn_pool/backends/odbc/oceanbase/oracle/base.py

@@ -1,10 +1,10 @@
 from django.db.backends.oracle import base
 from sqlalchemy.dialects.oracle.base import OracleDialect
 
-from dj_db_conn_pool.backends.odbc.mixins import ODBCWrapperMixin
+from dj_db_conn_pool.backends.odbc.mixins import ODBCDatabaseWrapperMixin
 
 
-class DatabaseWrapper(ODBCWrapperMixin, base.DatabaseWrapper):
+class DatabaseWrapper(ODBCDatabaseWrapperMixin, base.DatabaseWrapper):
     class SQLAlchemyDialect(OracleDialect):
         pass
 

dj_db_conn_pool/backends/oracle/base.py

@@ -1,10 +1,10 @@
 from django.db.backends.oracle import base
 from sqlalchemy.dialects.oracle.base import OracleDialect
 
-from dj_db_conn_pool.core.mixins import PersistentDatabaseWrapperMixin
+from dj_db_conn_pool.core.mixins import DatabasePoolWrapperMixin
 
 
-class DatabaseWrapper(PersistentDatabaseWrapperMixin, base.DatabaseWrapper):
+class DatabaseWrapper(DatabasePoolWrapperMixin, base.DatabaseWrapper):
     class SQLAlchemyDialect(OracleDialect):
         pass
 

dj_db_conn_pool/backends/postgresql/mixins.py

@@ -7,10 +7,10 @@
 except ModuleNotFoundError:
     from sqlalchemy.dialects.postgresql.psycopg2 import PGDialect_psycopg2 as PGDialect
 
-from dj_db_conn_pool.core.mixins import PersistentDatabaseWrapperMixin
+from dj_db_conn_pool.core.mixins import DatabasePoolWrapperMixin
 
 
-class PGDatabaseWrapperMixin(PersistentDatabaseWrapperMixin):
+class PGDatabaseWrapperMixin(DatabasePoolWrapperMixin):
     class SQLAlchemyDialect(PGDialect):
         pass
 

dj_db_conn_pool/core/base.py

@@ -8,12 +8,12 @@
 from django.db.backends.base.operations import BaseDatabaseOperations
 from sqlalchemy.engine.default import DefaultDialect
 
-from dj_db_conn_pool.core.mixins.core import PersistentDatabaseWrapperMixin
+from dj_db_conn_pool.core.mixins.core import DatabasePoolWrapperMixin
 
 logger = logging.getLogger(__name__)
 
 
-class BaseDatabasePoolWrapper(PersistentDatabaseWrapperMixin, base.BaseDatabaseWrapper):
+class BaseDatabasePoolWrapper(DatabasePoolWrapperMixin, base.BaseDatabaseWrapper):
     client_class = BaseDatabaseClient
 
     creation_class = BaseDatabaseCreation

dj_db_conn_pool/core/mixins/__init__.py

@@ -1 +1 @@
-from .core import PersistentDatabaseWrapperMixin
+from .core import DatabasePoolWrapperMixin

dj_db_conn_pool/core/mixins/core.py

@@ -9,7 +9,7 @@
 logger = logging.getLogger(__name__)
 
 
-class PersistentDatabaseWrapperMixin:
+class DatabasePoolWrapperMixin:
     def __init__(self, *args, **kwargs):
         # override creation_class
         self.creation_class = type('DatabaseCreationWrapper', (DatabaseCreationMixin, self.creation_class), {})