reydb 1.1.38__py3-none-any.whl → 1.1.40__py3-none-any.whl

reydb/rbase.py

@@ -9,11 +9,33 @@
 """
 
 
-from reykit.rbase import Base
+from typing import Any, TypedDict, Literal
+from sqlalchemy.engine.base import Engine, Connection
+from sqlalchemy.engine.url import URL
+from reykit.rbase import Base, throw
+from reykit.rre import search
 
 
 __all__ = (
     'DatabaseBase',
+    'extract_url',
+    'extract_engine'
+)
+
+
+URLParameter = TypedDict(
+    'URLParameter',
+    {
+        'drivername': str,
+        'backend': str,
+        'driver': str | None,
+        'username': str | None,
+        'password': str | None,
+        'host': str | None,
+        'port': str | None,
+        'database': str | None,
+        'query': dict[str, str] | None
+    }
 )
 
 
@@ -21,3 +43,147 @@ class DatabaseBase(Base):
     """
     Database base type.
     """
+
+
+def extract_url(url: str | URL) -> URLParameter:
+    """
+    Extract parameters from URL of string.
+
+    Parameters
+    ----------
+    url : URL of string.
+
+    Returns
+    -------
+    URL parameters.
+    """
+
+    # Extract.
+    match url:
+
+        ## Type str.
+        case str():
+            pattern_remote = r'^([^+]+)\+?([^:]+)??://([^:]+):([^@]+)@([^:]+):(\d+)[/]?([^\?]+)?\??(\S+)?$'
+            pattern_local = r'^([^+]+)\+?([^:]+)??:////?([^\?]+)[\?]?(\S+)?$'
+
+            ### Server.
+            if (result_remote := search(pattern_remote, url)) is not None:
+                (
+                    backend,
+                    driver,
+                    username,
+                    password,
+                    host,
+                    port,
+                    database,
+                    query_str
+                ) = result_remote
+                port = int(port)
+
+            ### SQLite.
+            elif (result_local := search(pattern_local, url)) is not None:
+                username = password = host = port = None
+                (
+                    backend,
+                    driver,
+                    database,
+                    query_str
+                ) = result_local
+
+            ### Throw exception.
+            else:
+                throw(ValueError, url)
+
+            if query_str is not None:
+                query = {
+                    key: value
+                    for query_item_str in query_str.split('&')
+                    for key, value in (query_item_str.split('=', 1),)
+                }
+            else:
+                query = {}
+
+        ## Type URL.
+        case URL():
+            drivername = url.drivername
+            username = url.username
+            password = url.password
+            host = url.host
+            port = url.port
+            database = url.database
+            query = dict(url.query)
+
+    ## Drivername.
+    if driver is None:
+        drivername = backend
+    else:
+        drivername = f'{backend}+{driver}'
+
+    # Generate parameter.
+    params = {
+        'drivername': drivername,
+        'backend': backend,
+        'driver': driver,
+        'username': username,
+        'password': password,
+        'host': host,
+        'port': port,
+        'database': database,
+        'query': query
+    }
+
+    return params
+
+
+def extract_engine(engine: Engine | Connection) -> dict[
+    Literal[
+        'drivername', 'username', 'password', 'host', 'port', 'database', 'query',
+        'pool_size', 'max_overflow', 'pool_timeout', 'pool_recycle'
+    ],
+    Any
+]:
+    """
+    Extract parameters from `Engine` or `Connection` object.
+
+    Parameters
+    ----------
+    engine : Engine or Connection object.
+
+    Returns
+    -------
+    Extracted parameters.
+    """
+
+    ## Extract Engine object from Connection boject.
+    if type(engine) == Connection:
+        engine = engine.engine
+
+    ## Extract.
+    drivername: str = engine.url.drivername
+    username: str | None = engine.url.username
+    password: str | None = engine.url.password
+    host: str | None = engine.url.host
+    port: str | None = engine.url.port
+    database: str | None = engine.url.database
+    query: dict[str, str] = dict(engine.url.query)
+    pool_size: int = engine.pool._pool.maxsize
+    max_overflow: int = engine.pool._max_overflow
+    pool_timeout: float = engine.pool._timeout
+    pool_recycle: int = engine.pool._recycle
+
+    # Generate parameter.
+    params = {
+        'drivername': drivername,
+        'username': username,
+        'password': password,
+        'host': host,
+        'port': port,
+        'database': database,
+        'query': query,
+        'pool_size': pool_size,
+        'max_overflow': max_overflow,
+        'pool_timeout': pool_timeout,
+        'pool_recycle': pool_recycle
+    }
+
+    return params

reydb/rbuild.py

@@ -52,22 +52,22 @@ class DatabaseBuild(DatabaseBase):
     """
 
 
-    def __init__(self, rdatabase: Database | DatabaseConnection) -> None:
+    def __init__(self, database: Database | DatabaseConnection) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
+        database : Database or DatabaseConnection instance.
         """
 
         # SQLite.
-        if rdatabase.backend == 'sqlite':
-            text='not suitable for SQLite databases'
+        if database.backend == 'sqlite':
+            text = 'not suitable for SQLite databases'
             throw(AssertionError, text=text)
 
         # Set attribute.
-        self.rdatabase = rdatabase
+        self.database = database
         self._schema: dict[str, dict[str, list[str]]] | None = None
 
 
@@ -98,7 +98,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -285,7 +285,7 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.rdatabase.extract_path(path)
+        database, table, _ = self.database.extract_path(path)
         if fields.__class__ == dict:
             fields = [fields]
         if primary.__class__ == str:
@@ -347,7 +347,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -375,7 +375,7 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, view, _ = self.rdatabase.extract_path(path)
+        database, view, _ = self.database.extract_path(path)
 
         # Generate SQL.
         select = select.replace('\n', '\n    ')
@@ -383,7 +383,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -476,7 +476,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -502,14 +502,14 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.rdatabase.extract_path(path)
+        database, table, _ = self.database.extract_path(path)
 
         # Generate.
         sql = f'DROP TABLE `{database}`.`{table}`'
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -535,14 +535,14 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, view, _ = self.rdatabase.extract_path(path)
+        database, view, _ = self.database.extract_path(path)
 
         # Generate SQL.
         sql = 'DROP VIEW `%s`.`%s`' % (database, view)
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -592,7 +592,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -649,7 +649,7 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.rdatabase.extract_path(path)
+        database, table, _ = self.database.extract_path(path)
         if fields.__class__ == dict:
             fields = [fields]
         if primary.__class__ == str:
@@ -707,7 +707,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -739,7 +739,7 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.rdatabase.extract_path(path)
+        database, table, _ = self.database.extract_path(path)
         if fields.__class__ == str:
             fields = [fields]
         if indexes.__class__ == str:
@@ -778,7 +778,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -829,7 +829,7 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.rdatabase.extract_path(path)
+        database, table, _ = self.database.extract_path(path)
         if fields.__class__ == dict:
             fields = [fields]
 
@@ -897,7 +897,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -925,14 +925,14 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, view, _ = self.rdatabase.extract_path(path)
+        database, view, _ = self.database.extract_path(path)
 
         # Generate SQL.
         sql = 'ALTER VIEW `%s`.`%s` AS\n%s' % (database, view, select)
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -958,14 +958,14 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.rdatabase.extract_path(path)
+        database, table, _ = self.database.extract_path(path)
 
         # Generate.
         sql = f'TRUNCATE TABLE `{database}`.`{table}`'
 
         # Execute.
         if execute:
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
         return sql
 
@@ -989,9 +989,9 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, column = self.rdatabase.extract_path(path, 'database')
+        database, table, column = self.database.extract_path(path, 'database')
         if self._schema is None:
-            self._schema = self.rdatabase.schema(False)
+            self._schema = self.database.schema(False)
 
         # Judge.
         judge = (
@@ -1081,7 +1081,7 @@ class DatabaseBuild(DatabaseBase):
             database = params['name']
 
             ## Exist.
-            exist = self.rdatabase.build.exist((database, None, None))
+            exist = self.database.build.exist((database, None, None))
             if exist:
                 continue
 
@@ -1092,7 +1092,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
             ## Report.
             text = f"Database '{database}' build completed."
@@ -1101,10 +1101,10 @@ class DatabaseBuild(DatabaseBase):
         # Table.
         for params in tables:
             path = params['path']
-            database, table, _ = self.rdatabase.extract_path(path)
+            database, table, _ = self.database.extract_path(path)
 
             ## Exist.
-            exist = self.rdatabase.build.exist((database, table, None))
+            exist = self.database.build.exist((database, table, None))
             if exist:
                 continue
 
@@ -1115,7 +1115,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
             ## Report.
             text = f"Table '{table}' of database '{database}' build completed."
@@ -1124,10 +1124,10 @@ class DatabaseBuild(DatabaseBase):
         # View.
         for params in views:
             path = params['path']
-            database, view, _ = self.rdatabase.extract_path(path)
+            database, view, _ = self.database.extract_path(path)
 
             ## Exist.
-            exist = self.rdatabase.build.exist((database, view, None))
+            exist = self.database.build.exist((database, view, None))
             if exist:
                 continue
 
@@ -1138,7 +1138,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
             ## Report.
             text = f"View '{view}' of database '{database}' build completed."
@@ -1147,10 +1147,10 @@ class DatabaseBuild(DatabaseBase):
         # View stats.
         for params in views_stats:
             path = params['path']
-            database, view, _ = self.rdatabase.extract_path(path)
+            database, view, _ = self.database.extract_path(path)
 
             ## Exist.
-            exist = self.rdatabase.build.exist((database, view, None))
+            exist = self.database.build.exist((database, view, None))
             if exist:
                 continue
 
@@ -1161,7 +1161,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.rdatabase.execute(sql)
+            self.database.execute(sql)
 
             ## Report.
             text = f"View '{view}' of database '{database}' build completed."

reydb/rconfig.py

@@ -56,7 +56,7 @@ class DatabaseConfig(object):
 
         # SQLite.
         if database.backend == 'sqlite':
-            text='not suitable for SQLite databases'
+            text = 'not suitable for SQLite databases'
             throw(AssertionError, text=text)
 
         # Build.

reydb/rconn.py

@@ -52,7 +52,6 @@ class DatabaseConnection(Database):
         self.rdatabase = rdatabase
         self.begin = None
         self.begin_count = 0
-        self.drivername = rdatabase.drivername
         self.username = rdatabase.username
         self.password = rdatabase.password
         self.host = rdatabase.host

reydb/rdb.py

@@ -13,9 +13,9 @@ from typing import Any, Literal, overload
 from collections.abc import Iterable, Generator
 from enum import EnumType
 from urllib.parse import quote as urllib_quote
+from pymysql.constants.CLIENT import MULTI_STATEMENTS
 from sqlalchemy import create_engine as sqlalchemy_create_engine, text as sqlalchemy_text
 from sqlalchemy.engine.base import Engine, Connection
-from sqlalchemy.engine.url import URL
 from sqlalchemy.sql.elements import TextClause
 from sqlalchemy.exc import OperationalError
 from reykit.rbase import throw, is_iterable, get_first_notnone
@@ -27,7 +27,7 @@ from reykit.rtable import TableData, Table
 from reykit.rtext import join_data_text
 from reykit.rwrap import wrap_runtime, wrap_retry
 
-from .rbase import DatabaseBase
+from .rbase import DatabaseBase, extract_url
 
 
 __all__ = (
@@ -45,6 +45,7 @@ monkey_sqlalchemy_row_index_field()
 class Database(DatabaseBase):
     """
     Database type.
+    Based `MySQL` or `SQLite`.
 
     Examples
     --------
@@ -66,7 +67,6 @@ class Database(DatabaseBase):
         username: str,
         password: str,
         database: str | None = None,
-        drivername: str | None = None,
         *,
         pool_size: int = 5,
         max_overflow: int = 10,
@@ -81,7 +81,6 @@ class Database(DatabaseBase):
         self,
         *,
         database: str,
-        drivername: str | None = None,
         pool_size: int = 5,
         max_overflow: int = 10,
         pool_timeout: float = 30.0,
@@ -94,7 +93,6 @@ class Database(DatabaseBase):
     def __init__(
         self,
         *,
-        drivername: str | None = None,
         pool_size: int = 5,
         max_overflow: int = 10,
         pool_timeout: float = 30.0,
@@ -103,25 +101,6 @@ class Database(DatabaseBase):
         **query: str
     ) -> None: ...
 
-    @overload
-    def __init__(
-        self,
-        *,
-        url: str | URL,
-        pool_size: int = 5,
-        max_overflow: int = 10,
-        pool_timeout: float = 30.0,
-        pool_recycle: int | None = None,
-        retry: bool = False
-    ) -> None: ...
-
-    @overload
-    def __init__(
-        self,
-        *,
-        engine: Engine | Connection,
-        retry: bool = False
-    ) -> None: ...
 
     def __init__(
         self,
@@ -130,9 +109,6 @@ class Database(DatabaseBase):
         username: str | None = None,
         password: str | None = None,
         database: str | None = None,
-        drivername: str | Iterable[str] | None = None,
-        url: str | URL | None = None,
-        engine: Engine | Connection | None = None,
         pool_size: int = 5,
         max_overflow: int = 10,
         pool_timeout: float = 30.0,
@@ -149,16 +125,8 @@ class Database(DatabaseBase):
         port : Remote server database port.
         username : Remote server database username.
         password : Remote server database password.
-        database : Remote server database name or local database file path or use memory.
-            When parameters `host`, `port`, `username`, `password`, `database` are all `None`, then is `:memory:`.
-        drivername : Database backend and driver name.
-            - `None`: Automatic select.
-                When is remote server database, then is `mysql+mysqldb` and `mysql+pymysql`, `mysql+mysqlconnector`.
-                When is local database file or use memory, then is `sqlite`.
-            - `str`: Use this value.
-            - `Iterable[str]`: Try one by one use, set value after success.
-        url : Get parameter from server `URL`.
-        engine : Use existing `Engine` or `Connection` object, and get parameter from it.
+        database : Remote server database name or local database file path.
+            - `None`: When parameters `host`, `port`, `username`, `password`, `database` are all `None`, then using memory store.
         pool_size : Number of connections `keep open`.
         max_overflow : Number of connections `allowed overflow`.
         pool_timeout : Number of seconds `wait create` connection.
@@ -172,74 +140,30 @@ class Database(DatabaseBase):
         query : Remote server database parameters.
         """
 
-        # Handle parameter.
-
-        ## From Engine or Connection.
-        if engine is not None:
-            if type(engine) == Connection:
-                engine = engine.engine
-            params = self.extract_engine(engine)
-            username: str | None = params['username']
-            password: str | None = params['password']
-            host: str | None = params['host']
-            port: int | None = params['port']
-            database: str | None = params['database']
-            drivername: str = params['drivername']
-            pool_size: int = params['pool_size']
-            max_overflow: int = params['max_overflow']
-            pool_timeout: float = params['pool_timeout']
-            pool_recycle: int = params['pool_recycle']
-            query: dict = params['query']
-
-        ## From URL.
-        elif url is not None:
-            params = self.extract_url(url)
-            username: str | None = params['username']
-            password: str | None = params['password']
-            host: str | None = params['host']
-            port: int | None = params['port']
-            database: str | None = params['database']
-            drivername: str = params['drivername']
-            query: dict = params['query']
-
         # Handle parameter.
         if type(port) == str:
             port = int(port)
 
-        # Set attribute.
-        self.username: str | None = username
-        self.password: str | None = password
-        self.host: str | None = host
+        # Build.
+        self.username = username
+        self.password = password
+        self.host = host
         self.port: int | None = port
-        self.database: str | None = database
-        self.drivername: str | Iterable[str] = drivername
-        self.engine: Engine | None = engine
-        self.pool_size: int = pool_size
-        self.max_overflow: int = max_overflow
-        self.pool_timeout: float = pool_timeout
+        self.database = database
+        self.pool_size = pool_size
+        self.max_overflow = max_overflow
+        self.pool_timeout = pool_timeout
         if pool_recycle is None:
             self.pool_recycle = -1
         else:
             self.pool_recycle = pool_recycle
-        self.retry: bool = retry
-        self.query: dict[str, str] = query
-        if (
-            self.database is None
-            and self.mode == 'memory'
-        ):
-            self.database = ':memory:'
-        if self.drivername is None:
-            if self.mode == 'server':
-                self.drivername = ('mysql+mysqldb', 'mysql+pymysql', 'mysql+mysqlconnector')
-            else:
-                self.drivername = 'sqlite'
+        self.retry = retry
+        self.query = query
 
         # Create engine.
-        if self.engine is None:
-            self.engine = self.__create_engine()
-        self.drivername: str
+        self.engine = self.__create_engine()
 
-        # Handle attribute.
+        # Server recycle time.
         if pool_recycle is None:
             if self.mode == 'server':
                 wait_timeout = self.variables['wait_timeout']
@@ -248,144 +172,6 @@ class Database(DatabaseBase):
             self.engine.pool._recycle = self.pool_recycle
 
 
-    def extract_url(self, url: str | URL) -> dict[
-        Literal['drivername', 'username', 'password', 'host', 'port', 'database', 'query'],
-        Any
-    ]:
-        """
-        Extract parameters from URL of string.
-
-        Parameters
-        ----------
-        url : URL of string.
-
-        Returns
-        -------
-        Extracted parameters.
-        """
-
-        # Extract.
-        match url:
-
-            ## Type str.
-            case str():
-                pattern_remote = r'^([\w\+]+)://(\w+):(\w+)@(\d+\.\d+\.\d+\.\d+):(\d+)[/]?([^\?]+)?[\?]?(\S+)?$'
-                pattern_local = r'^([\w\+]+):////?([^\?]+)[\?]?(\S+)?$'
-
-                ### Remote.
-                if (result_remote := search(pattern_remote, url)) is not None:
-                    (
-                        drivername,
-                        username,
-                        password,
-                        host,
-                        port,
-                        database,
-                        query_str
-                    ) = result_remote
-                    port = int(port)
-
-                ### Local.
-                elif (result_local := search(pattern_local, url)) is not None:
-                    username = password = host = port = None
-                    (
-                        drivername,
-                        database,
-                        query_str
-                    ) = result_local
-
-                ### Throw exception.
-                else:
-                    throw(ValueError, url)
-
-                drivername: str
-                if query_str is not None:
-                    query = {
-                        key: value
-                        for query_item_str in query_str.split('&')
-                        for key, value in (query_item_str.split('=', 1),)
-                    }
-                else:
-                    query = {}
-
-            ## Type URL.
-            case URL():
-                drivername = url.drivername
-                username = url.username
-                password = url.password
-                host = url.host
-                port = url.port
-                database = url.database
-                query = dict(url.query)
-
-        # Generate parameter.
-        params = {
-            'drivername': drivername,
-            'username': username,
-            'password': password,
-            'host': host,
-            'port': port,
-            'database': database,
-            'query': query
-        }
-
-        return params
-
-
-    def extract_engine(self, engine: Engine | Connection) -> dict[
-        Literal[
-            'drivername', 'username', 'password', 'host', 'port', 'database', 'query',
-            'pool_size', 'max_overflow', 'pool_timeout', 'pool_recycle'
-        ],
-        Any
-    ]:
-        """
-        Extract parameters from `Engine` or `Connection` object.
-
-        Parameters
-        ----------
-        engine : Engine or Connection object.
-
-        Returns
-        -------
-        Extracted parameters.
-        """
-
-        ## Extract Engine object from Connection boject.
-        if type(engine) == Connection:
-            engine = engine.engine
-
-        ## Extract.
-        drivername: str = engine.url.drivername
-        username: str | None = engine.url.username
-        password: str | None = engine.url.password
-        host: str | None = engine.url.host
-        port: str | None = engine.url.port
-        database: str | None = engine.url.database
-        query: dict[str, str] = dict(engine.url.query)
-        pool_size: int = engine.pool._pool.maxsize
-        max_overflow: int = engine.pool._max_overflow
-        pool_timeout: float = engine.pool._timeout
-        pool_recycle: int = engine.pool._recycle
-
-        # Generate parameter.
-        params = {
-            'drivername': drivername,
-            'username': username,
-            'password': password,
-            'host': host,
-            'port': port,
-            'database': database,
-            'query': query,
-            'pool_size': pool_size,
-            'max_overflow': max_overflow,
-            'pool_timeout': pool_timeout,
-            'pool_recycle': pool_recycle
-        }
-
-        return params
-
-
     @overload
     def extract_path(
         self,
@@ -478,30 +264,27 @@ class Database(DatabaseBase):
         """
 
         # Get.
-        value, *_ = self.drivername.split('+', 1)
-        value = value.lower()
+        url_params = extract_url(self.url)
+        backend = url_params['backend']
 
-        return value
+        return backend
 
 
     @property
-    def driver(self) -> str | None:
+    def driver(self) -> str:
         """
         Database driver name.
 
         Returns
         -------
-        name.
+        Name.
         """
 
         # Get.
-        if '+' in self.drivername:
-            _, value = self.drivername.split('+', 1)
-            value = value.lower()
-        else:
-            value = None
+        url_params = extract_url(self.url)
+        driver = url_params['driver']
 
-        return value
+        return driver
 
 
     @property
@@ -542,16 +325,20 @@ class Database(DatabaseBase):
 
         # Generate URL.
 
-        ## Remove.
+        ## Server.
         if self.mode == 'server':
             password = urllib_quote(self.password)
-            url_ = f'{self.drivername}://{self.username}:{password}@{self.host}:{self.port}'
+            url_ = f'mysql+pymysql://{self.username}:{password}@{self.host}:{self.port}'
             if self.database is not None:
                 url_ = f'{url_}/{self.database}'
 
-        ## File or memory.
+        ## File.
+        elif self.mode == 'file':
+            url_ = f'sqlite:///{self.database}'
+
+        ## Memory.
         else:
-            url_ = f'{self.drivername}:///{self.database}'
+            url_ = f'sqlite:///:memory:'
 
         # Add Server parameter.
         if self.query != {}:
@@ -576,44 +363,25 @@ class Database(DatabaseBase):
         """
 
         # Handle parameter.
-        if type(self.drivername) == str:
-            drivernames = (self.drivername,)
+        if self.mode == 'memory':
+            engine_params = {
+                'url': self.url,
+                'pool_recycle': self.pool_recycle
+            }
         else:
-            drivernames = self.drivername
+            engine_params = {
+                'url': self.url,
+                'pool_size': self.pool_size,
+                'max_overflow': self.max_overflow,
+                'pool_timeout': self.pool_timeout,
+                'pool_recycle': self.pool_recycle,
+                'connect_args': {'client_flag': MULTI_STATEMENTS}
+            }
 
         # Create Engine.
-        for drivername in drivernames:
-            self.drivername = drivername
-            if self.mode == 'memory':
-                engine_params = {
-                    'url': self.url,
-                    'pool_recycle': self.pool_recycle
-                }
-            else:
-                engine_params = {
-                    'url': self.url,
-                    'pool_size': self.pool_size,
-                    'max_overflow': self.max_overflow,
-                    'pool_timeout': self.pool_timeout,
-                    'pool_recycle': self.pool_recycle
-                }
-
-            ## Try.
-            try:
-                engine = sqlalchemy_create_engine(**engine_params)
-            except ModuleNotFoundError:
-                pass
-            else:
-                return engine
+        engine = sqlalchemy_create_engine(**engine_params)
 
-        # Throw exception.
-        drivernames_str = ' and '.join(
-            [
-                "'%s'" % dirvername.split('+', 1)[-1]
-                for dirvername in drivernames
-            ]
-        )
-        raise ModuleNotFoundError(f'module {drivernames_str} not fund')
+        return engine
 
 
     @property
@@ -1793,9 +1561,10 @@ class Database(DatabaseBase):
         Schemata of databases and tables and columns.
         """
 
-        # SQLite.
+        # Check.
         if self.backend == 'sqlite':
-            throw(AssertionError, self.drivername)
+            text = 'not suitable for SQLite databases'
+            throw(AssertionError, text=text)
 
         # Handle parameter.
         filter_db = (

reydb/rerror.py

@@ -43,7 +43,7 @@ class DatabaseError(DatabaseBase):
 
         # SQLite.
         if database.backend == 'sqlite':
-            text='not suitable for SQLite databases'
+            text = 'not suitable for SQLite databases'
             throw(AssertionError, text=text)
 
         # Build.

reydb/rfile.py

@@ -43,9 +43,9 @@ class DatabaseFile(DatabaseBase):
         database : Database or DatabaseConnection instance.
         """
 
-        # SQLite.
+        # Check.
         if database.backend == 'sqlite':
-            text='not suitable for SQLite databases'
+            text = 'not suitable for SQLite databases'
             throw(AssertionError, text=text)
 
         # Build.

reydb/rparam.py

@@ -26,7 +26,7 @@ __all__ = (
 
 class DatabaseParameter(DatabaseBase):
     """
-    Database parameters type.
+    Database parameter type.
     """
 
 

{reydb-1.1.38.dist-info → reydb-1.1.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.1.38
+Version: 1.1.40
 Summary: Database method set.
 Project-URL: homepage, https://github.com/reyxbo/reydb/
 Author-email: Rey <reyxbo@163.com>

reydb-1.1.40.dist-info/RECORD

@@ -0,0 +1,16 @@
+reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
+reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
+reydb/rbase.py,sha256=2mP7vSpJHLt-wFkL8tpehYMMIfysyh1Ktg0cR9fjnJk,4821
+reydb/rbuild.py,sha256=iXJ76BNlUflJfMAAEbPuQLyVePyye8aDq7MaXD16Ktw,32419
+reydb/rconfig.py,sha256=1uQG-khhkupKgzC51nYku3P__-qdaSXZB13GdDyKy00,12312
+reydb/rconn.py,sha256=YWscFMjBph9ttPXjzTTpaziTd7v7vnE0b7E4mVpJ6oc,6163
+reydb/rdb.py,sha256=cSh5qVRhkQQVAuYemYOD0MGtJtYIIBGhrjapeiy6sFE,54207
+reydb/rerror.py,sha256=lirCR6yv1-9JsC6ZIKCkS0ezcNojAOAbJpup2xtsyx0,9968
+reydb/rexec.py,sha256=dGdRkG1XR0Z66T0r4nPCSdQzSRWc_Q3t6TPSSrDTIxY,9042
+reydb/rfile.py,sha256=JoXI_YgR5TDR7kh06eU0TngEOkSW8DmcZ4SDjTl22Wk,15255
+reydb/rinfo.py,sha256=KXTkcpTGAD3p9RVKKcnmc_FjJtiKRPk-K5ZepPOnphQ,15253
+reydb/rparam.py,sha256=VTHBW4gnBjLtITrv73Rtb1Ppw3UJu_LXeKy2tJuGIBE,7016
+reydb-1.1.40.dist-info/METADATA,sha256=xQvsJCsasRZEuXV4Aa9eS6IBGKgbXw38vVazAUpcZ0w,1550
+reydb-1.1.40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.40.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.40.dist-info/RECORD,,

reydb-1.1.38.dist-info/RECORD

@@ -1,16 +0,0 @@
-reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
-reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
-reydb/rbase.py,sha256=X8bDBmKyIiLXGvOVnTh5nD0ltkhOPWU6g4BebifOZYY,312
-reydb/rbuild.py,sha256=nGI25Hoj3iWuyRGJhXQWFNJfq5jASzoGOpJL-B9IwE4,32456
-reydb/rconfig.py,sha256=7xcgoN9iRwXxQJjy-J5nJxXVWpBDjFlmebAhqgMOlKA,12310
-reydb/rconn.py,sha256=kdw2xQb0JqSUXM-BD7XfJ-ZqaWHxYkeT8psRhOK43mA,6211
-reydb/rdb.py,sha256=OQ3ztC4G53usAbocqGwTqo1ry1AIGjoWTN7pn8Pn3Uk,62184
-reydb/rerror.py,sha256=xHLvRxu8KBvUdfVS7mD906jx9XTQPGwEl7psBLGEZ5w,9966
-reydb/rexec.py,sha256=dGdRkG1XR0Z66T0r4nPCSdQzSRWc_Q3t6TPSSrDTIxY,9042
-reydb/rfile.py,sha256=7g6hPBz33p-mkGFc6LEmL2hpFes-LM-AWQ0SxgJe2BI,15254
-reydb/rinfo.py,sha256=KXTkcpTGAD3p9RVKKcnmc_FjJtiKRPk-K5ZepPOnphQ,15253
-reydb/rparam.py,sha256=3BGDBD8QshOf2J70ZJ6LJ9PiH-1ZU3ruZwoE0bN6OOw,7017
-reydb-1.1.38.dist-info/METADATA,sha256=rZepbu5fXPQ4IgwbzryzEymQbedw2NvcYi0oJlQnGVI,1550
-reydb-1.1.38.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.38.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.38.dist-info/RECORD,,