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

reydb/rbase.py

@@ -15,8 +15,6 @@ from sqlalchemy.engine.url import URL
 from reykit.rbase import Base, throw
 from reykit.rre import search
 
-from .rbase import DatabaseBase
-
 
 __all__ = (
     'DatabaseBase',
@@ -65,13 +63,14 @@ def extract_url(url: str | URL) -> URLParameter:
 
         ## Type str.
         case str():
-            pattern_remote = r'^([\w\+]+)://(\w+):(\w+)@(\d+\.\d+\.\d+\.\d+):(\d+)[/]?([^\?]+)?[\?]?(\S+)?$'
-            pattern_local = r'^([\w\+]+):////?([^\?]+)[\?]?(\S+)?$'
+            pattern_remote = r'^([^+]+)\+?([^:]+)??://([^:]+):([^@]+)@([^:]+):(\d+)[/]?([^\?]+)?\??(\S+)?$'
+            pattern_local = r'^([^+]+)\+?([^:]+)??:////?([^\?]+)[\?]?(\S+)?$'
 
             ### Server.
             if (result_remote := search(pattern_remote, url)) is not None:
                 (
-                    drivername,
+                    backend,
+                    driver,
                     username,
                     password,
                     host,
@@ -85,7 +84,8 @@ def extract_url(url: str | URL) -> URLParameter:
             elif (result_local := search(pattern_local, url)) is not None:
                 username = password = host = port = None
                 (
-                    drivername,
+                    backend,
+                    driver,
                     database,
                     query_str
                 ) = result_local
@@ -113,12 +113,11 @@ def extract_url(url: str | URL) -> URLParameter:
             database = url.database
             query = dict(url.query)
 
-    ## Backend and dirver.
-    if '+' in drivername:
-        backend, driver = drivername.split('+', 1)
+    ## Drivername.
+    if driver is None:
+        drivername = backend
     else:
-        backend = drivername
-        driver = None
+        drivername = f'{backend}+{driver}'
 
     # Generate parameter.
     params = {

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.1.39
+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.39.dist-info → reydb-1.1.40.dist-info}/RECORD

@@ -1,6 +1,6 @@
 reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
 reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
-reydb/rbase.py,sha256=LQ1r4wh5SolOH5MbkMMwLb4I0Sq8HxDrthgdFp9cdYQ,4837
+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
@@ -10,7 +10,7 @@ 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.39.dist-info/METADATA,sha256=_hw0AJJ6kGH7Y0ZvVL3O4OOIs_o7l1peP7C81NAby4I,1550
-reydb-1.1.39.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.39.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.39.dist-info/RECORD,,
+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,,