reydb 1.1.23__py3-none-any.whl → 1.1.25__py3-none-any.whl

reydb/rbuild.py

@@ -15,7 +15,8 @@ from reykit.rbase import throw
 from reykit.rstdout import ask
 
 from .rbase import BaseDatabase
-from .rconn import Database, DBConnection
+from .rconn import DBConnection
+from .rdb import Database
 
 
 __all__ = (

reydb/rconn.py

@@ -107,6 +107,7 @@ class DBConnection(Database):
             sqls = [
                 sql_part.strip()
                 for sql_part in sql.text.split(';')
+                if sql_part != ''
             ]
             if data == []:
                 echo(report_info, *sqls, title='SQL')

reydb/rdb.py

@@ -753,6 +753,7 @@ class Database(BaseDatabase):
         syntax = [
             search('[a-zA-Z]+', sql_part).upper()
             for sql_part in sql.split(';')
+            if sql_part != ''
         ]
 
         return syntax
@@ -819,6 +820,7 @@ class Database(BaseDatabase):
                 sqls = [
                     sql_part.strip()
                     for sql_part in sql.text.split(';')
+                    if sql_part != ''
                 ]
                 if data == []:
                     echo(report_info, *sqls, title='SQL')

reydb/rexec.py

@@ -14,7 +14,8 @@ from reykit.rbase import throw
 from reykit.rtable import TableData
 
 from .rbase import BaseDatabase
-from .rconn import Database, DBConnection, Result
+from .rconn import DBConnection
+from .rdb import Database, Result
 
 
 __all__ = (

reydb/rfile.py

@@ -15,7 +15,8 @@ from reykit.rbase import throw
 from reykit.ros import File, Folder, get_md5
 
 from .rbase import BaseDatabase
-from .rconn import Database, DBConnection
+from .rconn import DBConnection
+from .rdb import Database
 
 
 __all__ = (
@@ -29,41 +30,43 @@ FileInfo = TypedDict('FileInfo', {'create_time': datetime, 'md5': str, 'name': s
 class DBFile(BaseDatabase):
     """
     Database file type.
+    Can create database used `self.build` method.
     """
 
 
     def __init__(
         self,
-        rdatabase: Database | DBConnection
+        database: Database | DBConnection
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DBConnection instance.
+        database : Database or DBConnection instance.
         """
 
         # SQLite.
-        if rdatabase.backend == 'sqlite':
+        if database.backend == 'sqlite':
             text='not suitable for SQLite databases'
             throw(AssertionError, text=text)
 
         # Set attribute.
-        self.rdatabase = rdatabase
+        self.database = database
 
         ## Database path name.
-        self.path_names = {
+        self.db_names = {
             'file': 'file',
             'file.information': 'information',
             'file.data': 'data',
-            'file.stats': 'stats'
+            'file.stats': 'stats',
+            'file.data_information': 'data_information'
         }
 
 
     def build(self) -> None:
         """
-        Check and build all standard databases and tables, by `self.path_names`.
+        Check and build all standard databases and tables, by `self.db_names`.
         """
 
         # Set parameter.
@@ -71,7 +74,7 @@ class DBFile(BaseDatabase):
         ## Database.
         databases = [
             {
-                'name': self.path_names['file']
+                'name': self.db_names['file']
             }
         ]
 
@@ -80,7 +83,7 @@ class DBFile(BaseDatabase):
 
             ### 'information'.
             {
-                'path': (self.path_names['file'], self.path_names['file.information']),
+                'path': (self.db_names['file'], self.db_names['file.information']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -92,7 +95,7 @@ class DBFile(BaseDatabase):
                         'name': 'file_id',
                         'type': 'mediumint unsigned',
                         'constraint': 'NOT NULL AUTO_INCREMENT',
-                        'comment': 'File self increase ID.'
+                        'comment': 'File ID.'
                     },
                     {
                         'name': 'md5',
@@ -133,7 +136,7 @@ class DBFile(BaseDatabase):
 
             ### 'data'.
             {
-                'path': (self.path_names['file'], self.path_names['file.data']),
+                'path': (self.db_names['file'], self.db_names['file.data']),
                 'fields': [
                     {
                         'name': 'md5',
@@ -165,17 +168,17 @@ class DBFile(BaseDatabase):
 
             ### Data information.
             {
-                'path': ('file', 'data_information'),
+                'path': (self.db_names['file'], self.db_names['file.data_information']),
                 'select': (
                     'SELECT `b`.`last_time`, `a`.`md5`, `a`.`size`, `b`.`names`, `b`.`notes`\n'
-                    'FROM `file`.`data` AS `a`\n'
+                    f'FROM `{self.db_names['file']}`.`{self.db_names['file.data']}` AS `a`\n'
                     'LEFT JOIN (\n'
                     '    SELECT\n'
                     '        `md5`,\n'
                     "        GROUP_CONCAT(DISTINCT(`name`) ORDER BY `create_time` DESC SEPARATOR ' | ') AS `names`,\n"
                     "        GROUP_CONCAT(DISTINCT(`note`) ORDER BY `create_time` DESC SEPARATOR ' | ') AS `notes`,\n"
                     '        MAX(`create_time`) as `last_time`\n'
-                    '    FROM `file`.`information`\n'
+                    f'    FROM `{self.db_names['file']}`.`{self.db_names['file.information']}`\n'
                     '    GROUP BY `md5`\n'
                     '    ORDER BY `last_time` DESC\n'
                     ') AS `b`\n'
@@ -191,13 +194,13 @@ class DBFile(BaseDatabase):
 
             ### 'stats'.
             {
-                'path': (self.path_names['file'], self.path_names['file.stats']),
+                'path': (self.db_names['file'], self.db_names['file.stats']),
                 'items': [
                     {
                         'name': 'count',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.path_names['file']}`.`{self.path_names['file.information']}`'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.information']}`'
                         ),
                         'comment': 'File information count.'
                     },
@@ -205,10 +208,21 @@ class DBFile(BaseDatabase):
                         'name': 'count_data',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            f'FROM `{self.path_names['file']}`.`{self.path_names['file.data']}`'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.data']}`'
                         ),
                         'comment': 'File data unique count.'
                     },
+                    {
+                        'name': 'size_sum',
+                        'select': (
+                            'SELECT CONCAT(\n'
+                            '    ROUND(SUM(`size`) / 1024),\n'
+                            "    ' KB'\n"
+                            ')\n'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.data']}`'
+                        ),
+                        'comment': 'File total size.'
+                    },
                     {
                         'name': 'size_avg',
                         'select': (
@@ -216,7 +230,7 @@ class DBFile(BaseDatabase):
                             '    ROUND(AVG(`size`) / 1024),\n'
                             "    ' KB'\n"
                             ')\n'
-                            f'FROM `{self.path_names['file']}`.`{self.path_names['file.data']}`'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.data']}`'
                         ),
                         'comment': 'File average size.'
                     },
@@ -227,7 +241,7 @@ class DBFile(BaseDatabase):
                             '    ROUND(MAX(`size`) / 1024),\n'
                             "    ' KB'\n"
                             ')\n'
-                            f'FROM `{self.path_names['file']}`.`{self.path_names['file.data']}`'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.data']}`'
                         ),
                         'comment': 'File maximum size.'
                     },
@@ -235,7 +249,7 @@ class DBFile(BaseDatabase):
                         'name': 'last_time',
                         'select': (
                             'SELECT MAX(`create_time`)\n'
-                            f'FROM `{self.path_names['file']}`.`{self.path_names['file.information']}`'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.information']}`'
                         ),
                         'comment': 'File last record create time.'
                     }
@@ -245,7 +259,7 @@ class DBFile(BaseDatabase):
         ]
 
         # Build.
-        self.rdatabase.build.build(databases, tables, views, views_stats)
+        self.database.build.build(databases, tables, views, views_stats)
 
 
     def upload(
@@ -273,7 +287,7 @@ class DBFile(BaseDatabase):
         """
 
         # Handle parameter.
-        conn = self.rdatabase.connect()
+        conn = self.database.connect()
         match source:
 
             ## File path.
@@ -300,7 +314,7 @@ class DBFile(BaseDatabase):
 
         # Exist.
         exist = conn.execute_exist(
-            (self.path_names['file'], self.path_names['file.data']),
+            (self.db_names['file'], self.db_names['file.data']),
             '`md5` = :file_md5',
             file_md5=file_md5
         )
@@ -315,7 +329,7 @@ class DBFile(BaseDatabase):
                 'bytes': file_bytes
             }
             conn.execute_insert(
-                (self.path_names['file'], self.path_names['file.data']),
+                (self.db_names['file'], self.db_names['file.data']),
                 data,
                 'ignore'
             )
@@ -327,7 +341,7 @@ class DBFile(BaseDatabase):
             'note': note
         }
         conn.execute_insert(
-            (self.path_names['file'], self.path_names['file.information']),
+            (self.db_names['file'], self.db_names['file.information']),
             data
         )
 
@@ -380,17 +394,17 @@ class DBFile(BaseDatabase):
         sql = (
             'SELECT `name`, (\n'
             '    SELECT `bytes`\n'
-            f'    FROM `{self.path_names['file']}`.`{self.path_names['file.data']}`\n'
-            f'    WHERE `md5` = `{self.path_names['file.information']}`.`md5`\n'
+            f'    FROM `{self.db_names['file']}`.`{self.db_names['file.data']}`\n'
+            f'    WHERE `md5` = `{self.db_names['file.information']}`.`md5`\n'
             '    LIMIT 1\n'
             ') AS `bytes`\n'
-            f'FROM `{self.path_names['file']}`.`{self.path_names['file.information']}`\n'
+            f'FROM `{self.db_names['file']}`.`{self.db_names['file.information']}`\n'
             'WHERE `file_id` = :file_id\n'
             'LIMIT 1'
         )
 
         # Execute SQL.
-        result = self.rdatabase.execute(sql, file_id=file_id)
+        result = self.database.execute(sql, file_id=file_id)
 
         # Check.
         if result.empty:
@@ -432,17 +446,17 @@ class DBFile(BaseDatabase):
         sql = (
             'SELECT `create_time`, `md5`, `name`, `note`, (\n'
             '    SELECT `size`\n'
-            f'    FROM `{self.path_names['file']}`.`{self.path_names['file.data']}`\n'
+            f'    FROM `{self.db_names['file']}`.`{self.db_names['file.data']}`\n'
             '    WHERE `md5` = `a`.`md5`\n'
             '    LIMIT 1\n'
             ') AS `size`\n'
-            f'FROM `{self.path_names['file']}`.`{self.path_names['file.information']}` AS `a`\n'
+            f'FROM `{self.db_names['file']}`.`{self.db_names['file.information']}` AS `a`\n'
             'WHERE `file_id` = :file_id\n'
             'LIMIT 1'
         )
 
         # Execute SQL.
-        result = self.rdatabase.execute(sql, file_id=file_id)
+        result = self.database.execute(sql, file_id=file_id)
 
         # Check.
         if result.empty:
@@ -453,6 +467,3 @@ class DBFile(BaseDatabase):
         info = table[0]
 
         return info
-
-
-    __call__ = build

reydb/rinfo.py

@@ -14,7 +14,8 @@ from typing import Any, Literal, overload
 from reykit.rbase import throw
 
 from .rbase import BaseDatabase
-from .rconn import Database, DBConnection
+from .rconn import DBConnection
+from .rdb import Database
 
 
 __all__ = (

reydb/rparam.py

@@ -12,7 +12,8 @@
 from typing import overload
 
 from .rbase import BaseDatabase
-from .rconn import Database, DBConnection
+from .rconn import DBConnection
+from .rdb import Database
 
 
 __all__ = (

{reydb-1.1.23.dist-info → reydb-1.1.25.dist-info}/METADATA

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

reydb-1.1.25.dist-info/RECORD

@@ -0,0 +1,14 @@
+reydb/__init__.py,sha256=UetBDQylwFTWiPMKF1ZPW45A6mwYWWSYneTesl4xKBY,474
+reydb/rall.py,sha256=i6-ph2cahhTTF17DjUYf6KX3DNxhEvy6iedlSeF4ibI,341
+reydb/rbase.py,sha256=HMhxr7_TyzAusrv5dcc1hf3PmxGWj7m63kKcr5Ikbf4,312
+reydb/rbuild.py,sha256=LiYGOMZFnZi-aVGfWpKT2aEHks4ygbEubweB0-fczfQ,32344
+reydb/rconn.py,sha256=XmT4IizNYxCNi1zl88HCgHwkLcWMRWWBcDLwuvjV6aE,6542
+reydb/rdb.py,sha256=aHWBjgMr4w3yTbYwo0oN21t_SVbaLanUGUYeoRgAfpc,60965
+reydb/rexec.py,sha256=ezYqSxW6PvvILugnlWtq-BoxfBHAec9f2P5mgIp_heA,8910
+reydb/rfile.py,sha256=qsn6Gro9quVGf6nWo2aNtBZh0gjvY_EEpx4xSgRDMG4,14292
+reydb/rinfo.py,sha256=p8_nlOHWqnJCD0NRgbsxqnM2VKTDNO9jj4vwgd1HvG0,14267
+reydb/rparam.py,sha256=d8Ijn86ieYlWsHjAwIjrVujynfgKtMF1E-q41wGtd9Y,6855
+reydb-1.1.25.dist-info/METADATA,sha256=lmwYmLqHo0qrAW2fh7Qqh9nKO9JTRgK1w-8UGNnDAk8,1550
+reydb-1.1.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.25.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.25.dist-info/RECORD,,

reydb-1.1.23.dist-info/RECORD

@@ -1,14 +0,0 @@
-reydb/__init__.py,sha256=UetBDQylwFTWiPMKF1ZPW45A6mwYWWSYneTesl4xKBY,474
-reydb/rall.py,sha256=i6-ph2cahhTTF17DjUYf6KX3DNxhEvy6iedlSeF4ibI,341
-reydb/rbase.py,sha256=HMhxr7_TyzAusrv5dcc1hf3PmxGWj7m63kKcr5Ikbf4,312
-reydb/rbuild.py,sha256=ppsaGWTC3S-zwQDj3keL3oF5TddORTuEpfqNElj6thU,32327
-reydb/rconn.py,sha256=ZZDssqBCb1GQT61xG1N96-wYwISTIlKO1nJkgBuwBlI,6507
-reydb/rdb.py,sha256=VVytmnw07MFC-gc3JzjJC50SJTXA0H-oy_pFtYf_ras,60895
-reydb/rexec.py,sha256=kc5xSfuEDFW9rcAeJj_x6JWPDSYnHZQXcfSBXFGIhL8,8893
-reydb/rfile.py,sha256=VUJy7edvHq-D_KyJYm5gYS338l7sqCNAcwf3InpI2So,13664
-reydb/rinfo.py,sha256=NhcFhzp9gQ49EpAqcFYXcG-FMUXu3qii8WGoHxN6UcQ,14250
-reydb/rparam.py,sha256=EVSz_D4wyiaj5ZKxvdDcECmpbriOUNBBFCzz4bnV6dY,6838
-reydb-1.1.23.dist-info/METADATA,sha256=rOz7GTFTvbc5RskNO0ZchI27HxNhFnOL-_4HnEZk6bo,1550
-reydb-1.1.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.23.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.23.dist-info/RECORD,,