reydb 1.1.59__py3-none-any.whl → 1.1.61__py3-none-any.whl

reydb/rexec.py

@@ -24,11 +24,12 @@ from reykit.rtime import TimeMark, time_to
 from reykit.rwrap import wrap_runtime
 
 from . import rconn
-from .rbase import DatabaseBase, handle_sql, handle_data
+from .rbase import DatabaseBase, handle_sql, handle_data, extract_path
 
 
 __all__ = (
     'Result',
+    'DatabaseExecuteSuper',
     'DatabaseExecute',
     'DatabaseExecuteAsync'
 )
@@ -40,7 +41,7 @@ Result = Result_
 monkey_sqlalchemy_row_index_field()
 
 
-DatabaseConnectionT = TypeVar('DatabaseConnectionT')
+DatabaseConnectionT = TypeVar('DatabaseConnectionT', 'rconn.DatabaseConnection', 'rconn.DatabaseConnectionAsync')
 
 
 class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
@@ -59,7 +60,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         """
 
         # Build.
-        self.dbconn = dbconn
+        self.conn = dbconn
 
 
     def handle_execute(
@@ -87,7 +88,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         """
 
         # Handle parameter.
-        report = get_first_notnone(report, self.dbconn.db.report)
+        report = get_first_notnone(report, self.conn.db.report)
         sql = handle_sql(sql)
         if data is None:
             if kwdata == {}:
@@ -119,7 +120,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         fields : Select clause content.
             - `None`: Is `SELECT *`.
             - `str`: Join as `SELECT str`.
@@ -139,6 +140,11 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         Parameter `sql`.
         """
 
+        # Handle parameter.
+        database = self.conn.db.database
+        if '.' in table:
+            database, table, _ = extract_path(table)
+
         # Generate SQL.
         sql_list = []
 
@@ -161,7 +167,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         sql_list.append(sql_select)
 
         ## Part 'FROM' syntax.
-        sql_from = f'FROM `{self.dbconn.db.database}`.`{table}`'
+        sql_from = f'FROM `{database}`.`{table}`'
         sql_list.append(sql_from)
 
         ## Part 'WHERE' syntax.
@@ -213,7 +219,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         data : Insert data.
         duplicate : Handle method when constraint error.
             - `None`: Not handled.
@@ -230,6 +236,9 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         """
 
         # Handle parameter.
+        database = self.conn.db.database
+        if '.' in table:
+            database, table, _ = extract_path(table)
 
         ## Data.
         data_table = Table(data)
@@ -296,14 +305,14 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
             ### Not handle.
             case None:
                 sql = (
-                    f'INSERT INTO `{self.dbconn.db.database}`.`{table}`({sql_fields})\n'
+                    f'INSERT INTO `{database}`.`{table}`({sql_fields})\n'
                     f'VALUES({sql_values})'
                 )
 
             ### Ignore.
             case 'ignore':
                 sql = (
-                    f'INSERT IGNORE INTO `{self.dbconn.db.database}`.`{table}`({sql_fields})\n'
+                    f'INSERT IGNORE INTO `{database}`.`{table}`({sql_fields})\n'
                     f'VALUES({sql_values})'
                 )
 
@@ -323,7 +332,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
                     ]
                 )
                 sql = (
-                    f'INSERT INTO `{self.dbconn.db.database}`.`{table}`({sql_fields})\n'
+                    f'INSERT INTO `{database}`.`{table}`({sql_fields})\n'
                     f'VALUES({sql_values})\n'
                     'ON DUPLICATE KEY UPDATE\n'
                     f'    {update_content}'
@@ -344,7 +353,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         data : Update data, clause `SET` and `WHERE` and `ORDER BY` and `LIMIT` content.
             - `Key`: Table field.
                 `literal['order']`: Clause `ORDER BY` content, join as `ORDER BY str`.
@@ -367,6 +376,9 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         """
 
         # Handle parameter.
+        database = self.conn.db.database
+        if '.' in table:
+            database, table, _ = extract_path(table)
 
         ## Data.
         data_table = Table(data)
@@ -408,7 +420,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
             if type(where_fields) == str:
                 where_fields = [where_fields]
         sqls_list = []
-        sql_update = f'UPDATE `{self.dbconn.db.database}`.`{table}`'
+        sql_update = f'UPDATE `{database}`.`{table}`'
         for index, row in enumerate(data):
             sql_parts = [sql_update]
             for key, value in row.items():
@@ -484,7 +496,7 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         where : Clause `WHERE` content, join as `WHERE str`.
         order : Clause `ORDER BY` content, join as `ORDER BY str`.
         limit : Clause `LIMIT` content, join as `LIMIT int/str`.
@@ -494,11 +506,16 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         Parameter `sql`.
         """
 
+        # Handle parameter.
+        database = self.conn.db.database
+        if '.' in table:
+            database, table, _ = extract_path(table)
+
         # Generate SQL.
         sqls = []
 
         ## Part 'DELETE' syntax.
-        sql_delete = f'DELETE FROM `{self.dbconn.db.database}`.`{table}`'
+        sql_delete = f'DELETE FROM `{database}`.`{table}`'
         sqls.append(sql_delete)
 
         ## Part 'WHERE' syntax.
@@ -525,25 +542,24 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
     def handle_copy(
         self,
         table: str,
+        fields: str | Iterable[str] | None = None,
         where: str | None = None,
-        limit: int | str | tuple[int, int] | None = None,
-        **kwdata: Any
+        limit: int | str | tuple[int, int] | None = None
     ) -> Result:
         """
         Execute inesrt SQL of copy records.
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
+        fields : Select clause content.
+            - `None`: Is `SELECT *`.
+            - `str`: Join as `SELECT str`.
+            - `Iterable[str]`: Join as `SELECT str`.
         where : Clause `WHERE` content, join as `WHERE str`.
         limit : Clause `LIMIT` content.
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
-        kwdata : Keyword parameters for filling.
-            - `In 'WHERE' syntax`: Fill 'WHERE' syntax.
-            - `Not in 'WHERE' syntax`: Fill 'INSERT' and 'SELECT' syntax.
-                `str and first character is ':'`: Use this syntax.
-                `Any`: Use this value.
 
         Returns
         -------
@@ -551,73 +567,27 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         """
 
         # Handle parameter.
-        table_info: list[dict] = self.dbconn.db.info(self.dbconn.db.database)(table)()
-        field_key = 'COLUMN_NAME'
-        fields = [
-            row[field_key]
-            for row in table_info
-        ]
-        pattern = '(?<!\\\\):(\\w+)'
-        if type(where) == str:
-            where_keys = findall(pattern, where)
-        else:
-            where_keys = ()
+        database = self.conn.db.database
+        if '.' in table:
+            database, table, _ = extract_path(table)
+        if fields is None:
+            fields = '*'
+        elif type(fields) != str:
+            fields = ', '.join(fields)
 
         # Generate SQL.
         sqls = []
 
         ## Part 'INSERT' syntax.
-        sql_fields = ', '.join(
-            f'`{field}`'
-            for field in fields
-            if field not in kwdata
-        )
-        if kwdata != {}:
-            sql_fields_kwdata = ', '.join(
-                f'`{field}`'
-                for field in kwdata
-                if field not in where_keys
-            )
-            sql_fields_filter = filter(
-                lambda sql: sql != '',
-                (
-                    sql_fields,
-                    sql_fields_kwdata
-                )
-            )
-            sql_fields = ', '.join(sql_fields_filter)
-        sql_insert = f'INSERT INTO `{self.dbconn.db.database}`.`{table}`({sql_fields})'
+        sql_insert = f'INSERT INTO `{database}`.`{table}`'
+        if fields != '*':
+            sql_insert += f'({fields})'
         sqls.append(sql_insert)
 
         ## Part 'SELECT' syntax.
-        sql_values = ', '.join(
-            f'`{field}`'
-            for field in fields
-            if field not in kwdata
-        )
-        if kwdata != {}:
-            sql_values_kwdata = ', '.join(
-                value[1:]
-                if (
-                    type(value) == str
-                    and value.startswith(':')
-                    and value != ':'
-                )
-                else f':{field}'
-                for field, value in kwdata.items()
-                if field not in where_keys
-            )
-            sql_values_filter = filter(
-                lambda sql: sql != '',
-                (
-                    sql_values,
-                    sql_values_kwdata
-                )
-            )
-            sql_values = ', '.join(sql_values_filter)
         sql_select = (
-            f'SELECT {sql_values}\n'
-            f'FROM `{self.dbconn.db.database}`.`{table}`'
+            f'SELECT {fields}\n'
+            f'FROM `{database}`.`{table}`'
         )
         sqls.append(sql_select)
 
@@ -677,13 +647,13 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         sql, data, report = self.handle_execute(sql, data, report, **kwdata)
 
         # Transaction.
-        self.dbconn.get_begin()
+        self.conn.get_begin()
 
         # Execute.
 
         ## Report.
         if report:
-            execute = wrap_runtime(self.dbconn.execute, to_return=True)
+            execute = wrap_runtime(self.conn.connection.execute, to_return=True, to_print=False)
             result, report_runtime, *_ = execute(sql, data)
             report_info = (
                 f'{report_runtime}\n'
@@ -701,12 +671,12 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
 
         ## Not report.
         else:
-            result = self.dbconn.conn.execute(sql, data)
+            result = self.conn.connection.execute(sql, data)
 
         # Automatic commit.
-        if self.dbconn.autocommit:
-            self.dbconn.commit()
-            self.dbconn.close()
+        if self.conn.autocommit:
+            self.conn.commit()
+            self.conn.close()
 
         return result
 
@@ -731,7 +701,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         fields : Select clause content.
             - `None`: Is `SELECT *`.
             - `str`: Join as `SELECT str`.
@@ -790,7 +760,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         data : Insert data.
         duplicate : Handle method when constraint error.
             - `None`: Not handled.
@@ -842,7 +812,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         data : Update data, clause `SET` and `WHERE` and `ORDER BY` and `LIMIT` content.
             - `Key`: Table field.
                 `literal['order']`: Clause `ORDER BY` content, join as `ORDER BY str`.
@@ -901,7 +871,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         where : Clause `WHERE` content, join as `WHERE str`.
         order : Clause `ORDER BY` content, join as `ORDER BY str`.
         limit : Clause `LIMIT` content, join as `LIMIT int/str`.
@@ -935,6 +905,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
     def copy(
         self,
         table: str,
+        fields: str | Iterable[str] | None = None,
         where: str | None = None,
         limit: int | str | tuple[int, int] | None = None,
         report: bool | None = None,
@@ -945,18 +916,16 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
+        fields : Select clause content.
+            - `None`: Is `SELECT *`.
+            - `str`: Join as `SELECT str`.
+            - `Iterable[str]`: Join as `SELECT str`.
         where : Clause `WHERE` content, join as `WHERE str`.
         limit : Clause `LIMIT` content.
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
-        report : Whether report SQL execute information.
-            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
-            - `In 'WHERE' syntax`: Fill 'WHERE' syntax.
-            - `Not in 'WHERE' syntax`: Fill 'INSERT' and 'SELECT' syntax.
-                `str and first character is ':'`: Use this syntax.
-                `Any`: Use this value.
 
         Returns
         -------
@@ -973,7 +942,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         """
 
         # Handle parameter.
-        sql = self.handle_copy(table, where, limit, **kwdata)
+        sql = self.handle_copy(table, fields, where, limit)
 
         # Execute SQL.
         result = self.execute(sql, report=report, **kwdata)
@@ -993,7 +962,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         where : Match condition, `WHERE` clause content, join as `WHERE str`.
             - `None`: Match all.
             - `str`: Match condition.
@@ -1034,7 +1003,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         where : Match condition, `WHERE` clause content, join as `WHERE str`.
             - `None`: Match all.
             - `str`: Match condition.
@@ -1198,7 +1167,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         sql, data, report = self.handle_execute(sql, data, report, **kwdata)
 
         # Transaction.
-        await self.dbconn.get_begin()
+        await self.conn.get_begin()
 
         # Execute.
 
@@ -1206,7 +1175,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         if report:
             tm = TimeMark()
             tm()
-            result = await self.dbconn.conn.execute(sql, data)
+            result = await self.conn.connection.execute(sql, data)
             tm()
 
             ### Generate report.
@@ -1238,13 +1207,13 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
 
         ## Not report.
         else:
-            result = await self.dbconn.conn.execute(sql, data)
+            result = await self.conn.connection.execute(sql, data)
 
         # Automatic commit.
-        if self.dbconn.autocommit:
-            await self.dbconn.commit()
-            await self.dbconn.close()
-            await self.dbconn.db.dispose()
+        if self.conn.autocommit:
+            await self.conn.commit()
+            await self.conn.close()
+            await self.conn.db.dispose()
 
         return result
 
@@ -1269,7 +1238,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         fields : Select clause content.
             - `None`: Is `SELECT *`.
             - `str`: Join as `SELECT str`.
@@ -1328,7 +1297,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         data : Insert data.
         duplicate : Handle method when constraint error.
             - `None`: Not handled.
@@ -1380,7 +1349,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         data : Update data, clause `SET` and `WHERE` and `ORDER BY` and `LIMIT` content.
             - `Key`: Table field.
                 `literal['order']`: Clause `ORDER BY` content, join as `ORDER BY str`.
@@ -1439,7 +1408,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         where : Clause `WHERE` content, join as `WHERE str`.
         order : Clause `ORDER BY` content, join as `ORDER BY str`.
         limit : Clause `LIMIT` content, join as `LIMIT int/str`.
@@ -1473,6 +1442,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
     async def copy(
         self,
         table: str,
+        fields: str | Iterable[str] | None = None,
         where: str | None = None,
         limit: int | str | tuple[int, int] | None = None,
         report: bool | None = None,
@@ -1483,18 +1453,16 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
+        fields : Select clause content.
+            - `None`: Is `SELECT *`.
+            - `str`: Join as `SELECT str`.
+            - `Iterable[str]`: Join as `SELECT str`.
         where : Clause `WHERE` content, join as `WHERE str`.
         limit : Clause `LIMIT` content.
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
-        report : Whether report SQL execute information.
-            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
-            - `In 'WHERE' syntax`: Fill 'WHERE' syntax.
-            - `Not in 'WHERE' syntax`: Fill 'INSERT' and 'SELECT' syntax.
-                `str and first character is ':'`: Use this syntax.
-                `Any`: Use this value.
 
         Returns
         -------
@@ -1511,7 +1479,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         """
 
         # Handle parameter.
-        sql = self.handle_copy(table, where, limit, **kwdata)
+        sql = self.handle_copy(table, fields, where, limit)
 
         # Execute SQL.
         result = await self.execute(sql, report=report, **kwdata)
@@ -1531,7 +1499,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         where : Match condition, `WHERE` clause content, join as `WHERE str`.
             - `None`: Match all.
             - `str`: Match condition.
@@ -1572,7 +1540,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
 
         Parameters
         ----------
-        table : Table name.
+        table : Table name, can include database name.
         where : Match condition, `WHERE` clause content, join as `WHERE str`.
             - `None`: Match all.
             - `str`: Match condition.

reydb/rfile.py

@@ -56,7 +56,7 @@ class DatabaseFile(DatabaseBase):
 
     def build_db(self) -> None:
         """
-        Check and build all standard databases and tables, by `self.db_names`.
+        Check and build database tables, by `self.db_names`.
         """
 
         # Set parameter.
@@ -327,7 +327,7 @@ class DatabaseFile(DatabaseBase):
 
         # Exist.
         exist = conn.execute.exist(
-            (self.db_names['file'], self.db_names['file.data']),
+            self.db_names['file.data'],
             '`md5` = :file_md5',
             file_md5=file_md5
         )
@@ -342,7 +342,7 @@ class DatabaseFile(DatabaseBase):
                 'bytes': file_bytes
             }
             conn.execute.insert(
-                (self.db_names['file'], self.db_names['file.data']),
+                self.db_names['file.data'],
                 data,
                 'ignore'
             )
@@ -354,7 +354,7 @@ class DatabaseFile(DatabaseBase):
             'note': note
         }
         conn.execute.insert(
-            (self.db_names['file'], self.db_names['file.information']),
+            self.db_names['file.information'],
             data
         )