reydb 1.1.22__py3-none-any.whl → 1.1.24__py3-none-any.whl

reydb/rconn.py

@@ -149,12 +149,11 @@ class DBConnection(Database):
         Result object.
         """
 
-        # Handle parameter.by priority.
+        # Handle parameter by priority.
         report = get_first_notnone(report, self.default_report)
 
         # Handle parameter.
-        if type(sql) == str:
-            sql = sqlalchemy_text(sql)
+        sql = self.handle_sql(sql)
         if data is None:
             if kwdata == {}:
                 data = []
@@ -165,8 +164,6 @@ class DBConnection(Database):
             data = data_table.to_table()
             for row in data:
                 row.update(kwdata)
-
-        # Handle data.
         data = self.handle_data(data, sql)
 
         # Execute.

reydb/rdb.py

@@ -646,6 +646,32 @@ class Database(BaseDatabase):
         return keep_n, overflow_n
 
 
+    def handle_sql(self, sql: str | TextClause) -> TextClause:
+        """
+        Handle SQL.
+
+        Parameters
+        ----------
+        sql : SQL in method `sqlalchemy.text` format, or TextClause object.
+
+        Returns
+        -------
+        TextClause instance.
+        """
+
+        # Handle parameter.
+        if type(sql) == TextClause:
+            sql = sql.text
+
+        # Handle.
+        sql = sql.strip()
+        if sql[-1] != ';':
+            sql += ';'
+        sql = sqlalchemy_text(sql)
+
+        return sql
+
+
     def handle_data(
         self,
         data: list[dict],
@@ -657,7 +683,7 @@ class Database(BaseDatabase):
         Parameters
         ----------
         data : Data set for filling.
-        sql : SQL in method sqlalchemy.text format, or TextClause object.
+        sql : SQL in method `sqlalchemy.text` format, or TextClause object.
 
         Returns
         -------
@@ -830,12 +856,11 @@ class Database(BaseDatabase):
         Result object.
         """
 
-        # Handle parameter.by priority.
+        # Handle parameter by priority.
         report = get_first_notnone(report, self.default_report)
 
         # Handle parameter.
-        if type(sql) == str:
-            sql = sqlalchemy_text(sql)
+        sql = self.handle_sql(sql)
         if data is None:
             if kwdata == {}:
                 data = []
@@ -846,8 +871,6 @@ class Database(BaseDatabase):
             data = data_table.to_table()
             for row in data:
                 row.update(kwdata)
-
-        # Handle data.
         data = self.handle_data(data, sql)
 
         # Execute.
@@ -1783,7 +1806,7 @@ class Database(BaseDatabase):
         )
         if filter_default:
             where_database = 'WHERE `SCHEMA_NAME` NOT IN :filter_db\n'
-            where_column = 'WHERE `TABLE_SCHEMA` NOT IN :filter_db\n'
+            where_column = '    WHERE `TABLE_SCHEMA` NOT IN :filter_db\n'
         else:
             where_database = where_column = ''
 
@@ -1793,10 +1816,11 @@ class Database(BaseDatabase):
             'FROM `information_schema`.`SCHEMATA`\n'
             f'{where_database}'
             'UNION ALL (\n'
-            'SELECT `TABLE_SCHEMA`, `TABLE_NAME`, `COLUMN_NAME`\n'
-            'FROM `information_schema`.`COLUMNS`\n'
+            '    SELECT `TABLE_SCHEMA`, `TABLE_NAME`, `COLUMN_NAME`\n'
+            '    FROM `information_schema`.`COLUMNS`\n'
             f'{where_column}'
-            'ORDER BY `TABLE_SCHEMA`, `TABLE_NAME`, `ORDINAL_POSITION`)'
+            '    ORDER BY `TABLE_SCHEMA`, `TABLE_NAME`, `ORDINAL_POSITION`\n'
+            ')'
         )
         result = self.execute(sql, filter_db=filter_db)
 

reydb/rfile.py

@@ -29,41 +29,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 +73,7 @@ class DBFile(BaseDatabase):
         ## Database.
         databases = [
             {
-                'name': self.path_names['file']
+                'name': self.db_names['file']
             }
         ]
 
@@ -80,7 +82,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 +94,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 +135,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',
@@ -157,6 +159,33 @@ class DBFile(BaseDatabase):
                 'primary': 'md5',
                 'comment': 'File data table.'
             }
+
+        ]
+
+        ## View.
+        views = [
+
+            ### 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'
+                    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'
+                    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'
+                    'ON `a`.`md5` = `b`.`md5`\n'
+                    'ORDER BY `last_time` DESC'
+                )
+            }
+
         ]
 
         ## View stats.
@@ -164,13 +193,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'
-                            'FROM `file`.`information`'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.information']}`'
                         ),
                         'comment': 'File information count.'
                     },
@@ -178,10 +207,21 @@ class DBFile(BaseDatabase):
                         'name': 'count_data',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `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': (
@@ -189,7 +229,7 @@ class DBFile(BaseDatabase):
                             '    ROUND(AVG(`size`) / 1024),\n'
                             "    ' KB'\n"
                             ')\n'
-                            'FROM `file`.`data`\n'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.data']}`'
                         ),
                         'comment': 'File average size.'
                     },
@@ -200,7 +240,7 @@ class DBFile(BaseDatabase):
                             '    ROUND(MAX(`size`) / 1024),\n'
                             "    ' KB'\n"
                             ')\n'
-                            'FROM `file`.`data`\n'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.data']}`'
                         ),
                         'comment': 'File maximum size.'
                     },
@@ -208,16 +248,17 @@ class DBFile(BaseDatabase):
                         'name': 'last_time',
                         'select': (
                             'SELECT MAX(`create_time`)\n'
-                            'FROM `file`.`information`'
+                            f'FROM `{self.db_names['file']}`.`{self.db_names['file.information']}`'
                         ),
                         'comment': 'File last record create time.'
                     }
                 ]
             }
+
         ]
 
         # Build.
-        self.rdatabase.build.build(databases, tables, views_stats=views_stats)
+        self.database.build.build(databases, tables, views, views_stats)
 
 
     def upload(
@@ -245,7 +286,7 @@ class DBFile(BaseDatabase):
         """
 
         # Handle parameter.
-        conn = self.rdatabase.connect()
+        conn = self.database.connect()
         match source:
 
             ## File path.
@@ -272,7 +313,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
         )
@@ -287,7 +328,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'
             )
@@ -299,7 +340,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
         )
 
@@ -352,17 +393,17 @@ class DBFile(BaseDatabase):
         sql = (
             'SELECT `name`, (\n'
             '    SELECT `bytes`\n'
-            '    FROM `file`.`data`\n'
-            '    WHERE `md5` = `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'
-            'FROM `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:
@@ -404,17 +445,17 @@ class DBFile(BaseDatabase):
         sql = (
             'SELECT `create_time`, `md5`, `name`, `note`, (\n'
             '    SELECT `size`\n'
-            '    FROM `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'
-            'FROM `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:
@@ -425,6 +466,3 @@ class DBFile(BaseDatabase):
         info = table[0]
 
         return info
-
-
-    __call__ = build

{reydb-1.1.22.dist-info → reydb-1.1.24.dist-info}/METADATA

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

{reydb-1.1.22.dist-info → reydb-1.1.24.dist-info}/RECORD

@@ -2,13 +2,13 @@ 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=52k8MceNF6PjAUXIkC6NoDqjhAD_RM2_mueWbMMfoPE,6567
-reydb/rdb.py,sha256=YWsHdxYqw8JXYrsJ-a9zS4eimwhcqM8hxpMmjchrpbw,60365
+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=YD9EAglrWflWCjTiu9ze-ZKlm9x-WzKkXzfLie1kcAQ,12133
+reydb/rfile.py,sha256=QQBsWB-ulumdmCcOnTOLiOKYFUpBmGWb0IZCI3aCo58,14275
 reydb/rinfo.py,sha256=NhcFhzp9gQ49EpAqcFYXcG-FMUXu3qii8WGoHxN6UcQ,14250
 reydb/rparam.py,sha256=EVSz_D4wyiaj5ZKxvdDcECmpbriOUNBBFCzz4bnV6dY,6838
-reydb-1.1.22.dist-info/METADATA,sha256=3IDok7XwNpaCmBK1ng9uyk-iF9F5wwTroG8DGg5O4EE,1550
-reydb-1.1.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.22.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.22.dist-info/RECORD,,
+reydb-1.1.24.dist-info/METADATA,sha256=9vreMU2KglvIkMrUXQl_ZIRdfNEpTiBZmP0is-Pkg_8,1550
+reydb-1.1.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.24.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.24.dist-info/RECORD,,