reydb 1.1.20__py3-none-any.whl → 1.1.21__py3-none-any.whl

reydb/rbuild.py

@@ -67,6 +67,7 @@ class DBBuild(BaseDatabase):
 
         # Set attribute.
         self.rdatabase = rdatabase
+        self._schema: dict[str, dict[str, list[str]]] | None = None
 
 
     def create_database(
@@ -988,20 +989,21 @@ class DBBuild(BaseDatabase):
 
         # Handle parameter.
         database, table, column = self.rdatabase.extract_path(path, 'database')
+        if self._schema is None:
+            self._schema = self.rdatabase.schema(False)
 
         # Judge.
-        if table is None:
-            rinfo = self.rdatabase.info(database)
-        elif column is None:
-            rinfo = self.rdatabase.info(database)(table)
-        else:
-            rinfo = self.rdatabase.info(database)(table)(column)
-        try:
-            rinfo['*']
-        except AssertionError:
-            judge = False
-        else:
-            judge = True
+        judge = not (
+            (database_info := self._schema.get(database)) is None
+            or (
+                table is not None
+                and (table_info := database_info.get(table)) is None
+            )
+            or (
+                column is not None
+                and column not in table_info
+            )
+        )
 
         return judge
 

reydb/rdb.py

@@ -1757,11 +1757,14 @@ class Database(BaseDatabase):
         return dbexecute
 
 
-    @property
-    def schema(self) -> dict[str, dict[str, list]]:
+    def schema(self, filter_default: bool = True) -> dict[str, dict[str, list[str]]]:
         """
         Get schemata of databases and tables and columns.
 
+        Parameters
+        ----------
+        filter_default : Whether filter default database.
+
         Returns
         -------
         Schemata of databases and tables and columns.
@@ -1771,30 +1774,45 @@ class Database(BaseDatabase):
         if self.backend == 'sqlite':
             throw(AssertionError, self.drivername)
 
-        # Select.
+        # Handle parameter.
         filter_db = (
             'information_schema',
-            'mysql',
             'performance_schema',
+            'mysql',
             'sys'
         )
-        result = self.execute_select(
-            'information_schema.COLUMNS',
-            ['TABLE_SCHEMA', 'TABLE_NAME', 'COLUMN_NAME'],
-            '`TABLE_SCHEMA` NOT IN :filter_db',
-            order='`TABLE_SCHEMA`, `TABLE_NAME`, `ORDINAL_POSITION`',
-            filter_db=filter_db
+        if filter_default:
+            where_database = 'WHERE `SCHEMA_NAME` NOT IN :filter_db\n'
+            where_column = 'WHERE `TABLE_SCHEMA` NOT IN :filter_db\n'
+        else:
+            where_database = where_column = ''
+
+        # Select.
+        sql = (
+            'SELECT GROUP_CONCAT(`SCHEMA_NAME`) AS `TABLE_SCHEMA`, NULL AS `TABLE_NAME`, NULL AS `COLUMN_NAME`\n'
+            'FROM `information_schema`.`SCHEMATA`\n'
+            f'{where_database}'
+            'UNION ALL (\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`)'
         )
+        result = self.execute(sql, filter_db=filter_db)
 
         # Convert.
-        database_dict = {}
+        database_names, *_ = result.fetchone()
+        database_names: list[str] = database_names.split(',')
+        schema_dict = {}
         for database, table, column in result:
+            if database in database_names:
+                database_names.remove(database)
 
             ## Index database.
-            if database not in database_dict:
-                database_dict[database] = {table: [column]}
+            if database not in schema_dict:
+                schema_dict[database] = {table: [column]}
                 continue
-            table_dict: dict = database_dict[database]
+            table_dict: dict = schema_dict[database]
 
             ## Index table. 
             if table not in table_dict:
@@ -1805,7 +1823,11 @@ class Database(BaseDatabase):
             ## Add column.
             column_list.append(column)
 
-        return database_dict
+        ## Add empty database.
+        for database_name in database_names:
+            schema_dict[database_name] = None
+
+        return schema_dict
 
 
     @property

reydb/rfile.py

@@ -52,10 +52,18 @@ class DBFile(BaseDatabase):
         # Set attribute.
         self.rdatabase = rdatabase
 
+        ## Database path name.
+        self.path_names = {
+            'file': 'file',
+            'file.information': 'information',
+            'file.data': 'data',
+            'file.stats': 'stats'
+        }
+
 
     def build(self) -> None:
         """
-        Check and build all standard databases and tables.
+        Check and build all standard databases and tables, by `self.path_names`.
         """
 
         # Set parameter.
@@ -63,7 +71,7 @@ class DBFile(BaseDatabase):
         ## Database.
         databases = [
             {
-                'database': 'file'
+                'name': self.path_names['file']
             }
         ]
 
@@ -72,7 +80,7 @@ class DBFile(BaseDatabase):
 
             ### 'information'.
             {
-                'path': ('file', 'information'),
+                'path': (self.path_names['file'], self.path_names['file.information']),
                 'fields': [
                     {
                         'name': 'create_time',
@@ -125,7 +133,7 @@ class DBFile(BaseDatabase):
 
             ### 'data'.
             {
-                'path': ('file', 'data'),
+                'path': (self.path_names['file'], self.path_names['file.data']),
                 'fields': [
                     {
                         'name': 'md5',
@@ -156,7 +164,7 @@ class DBFile(BaseDatabase):
 
             ### 'stats'.
             {
-                'path': ('file', 'stats'),
+                'path': (self.path_names['file'], self.path_names['file.stats']),
                 'items': [
                     {
                         'name': 'count',
@@ -264,7 +272,7 @@ class DBFile(BaseDatabase):
 
         # Exist.
         exist = conn.execute_exist(
-            ('file', 'data'),
+            (self.path_names['file'], self.path_names['file.data']),
             '`md5` = :file_md5',
             file_md5=file_md5
         )
@@ -279,7 +287,7 @@ class DBFile(BaseDatabase):
                 'bytes': file_bytes
             }
             conn.execute_insert(
-                ('file', 'data'),
+                (self.path_names['file'], self.path_names['file.data']),
                 data,
                 'ignore'
             )
@@ -291,7 +299,7 @@ class DBFile(BaseDatabase):
             'note': note
         }
         conn.execute_insert(
-            ('file', 'information'),
+            (self.path_names['file'], self.path_names['file.information']),
             data
         )
 

{reydb-1.1.20.dist-info → reydb-1.1.21.dist-info}/METADATA

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

{reydb-1.1.20.dist-info → reydb-1.1.21.dist-info}/RECORD

@@ -1,14 +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=hn6XUUk3vpIjh1p1HlNU46MMDggIGjTiBobhvq410yM,32214
+reydb/rbuild.py,sha256=_K571-4uVp8qj56PNaXa4FjEWYPLiuxXmo0FiXX_JLk,32343
 reydb/rconn.py,sha256=52k8MceNF6PjAUXIkC6NoDqjhAD_RM2_mueWbMMfoPE,6567
-reydb/rdb.py,sha256=Nf_odkhBt1TamCKtkOs3Mnf0Qvy7vs0vMQ9fRJKgafM,59423
+reydb/rdb.py,sha256=YWsHdxYqw8JXYrsJ-a9zS4eimwhcqM8hxpMmjchrpbw,60365
 reydb/rexec.py,sha256=kc5xSfuEDFW9rcAeJj_x6JWPDSYnHZQXcfSBXFGIhL8,8893
-reydb/rfile.py,sha256=R4IhRWI_VuZIqXQeqKInwExH6u5hLPOElTusdASK5Ec,11644
+reydb/rfile.py,sha256=YD9EAglrWflWCjTiu9ze-ZKlm9x-WzKkXzfLie1kcAQ,12133
 reydb/rinfo.py,sha256=NhcFhzp9gQ49EpAqcFYXcG-FMUXu3qii8WGoHxN6UcQ,14250
 reydb/rparam.py,sha256=EVSz_D4wyiaj5ZKxvdDcECmpbriOUNBBFCzz4bnV6dY,6838
-reydb-1.1.20.dist-info/METADATA,sha256=TMsZaYKfws0lU5fppAfyqd1vA49Ma4zRexs-SuGVAMk,1550
-reydb-1.1.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.20.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.20.dist-info/RECORD,,
+reydb-1.1.21.dist-info/METADATA,sha256=G2IEJUFMkTS4TlT2qUGBlsM7INOAif9xc97YFufvc6c,1550
+reydb-1.1.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.21.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.21.dist-info/RECORD,,