reydb 1.1.47__py3-none-any.whl → 1.1.49__py3-none-any.whl

reydb/rfile.py

@@ -43,11 +43,6 @@ class DatabaseFile(DatabaseBase):
         database : Database or DatabaseConnection instance.
         """
 
-        # Check.
-        if database.backend == 'sqlite':
-            text = 'not suitable for SQLite databases'
-            throw(AssertionError, text=text)
-
         # Build.
         self.database = database
 
@@ -333,7 +328,7 @@ class DatabaseFile(DatabaseBase):
         file_size = len(file_bytes)
 
         # Exist.
-        exist = conn.execute_exist(
+        exist = conn.execute.exist(
             (self.db_names['file'], self.db_names['file.data']),
             '`md5` = :file_md5',
             file_md5=file_md5
@@ -348,7 +343,7 @@ class DatabaseFile(DatabaseBase):
                 'size': file_size,
                 'bytes': file_bytes
             }
-            conn.execute_insert(
+            conn.execute.insert(
                 (self.db_names['file'], self.db_names['file.data']),
                 data,
                 'ignore'
@@ -360,13 +355,13 @@ class DatabaseFile(DatabaseBase):
             'name': file_name,
             'note': note
         }
-        conn.execute_insert(
+        conn.execute.insert(
             (self.db_names['file'], self.db_names['file.information']),
             data
         )
 
         # Get ID.
-        file_id = conn.variables['identity']
+        file_id = conn.insert_id
 
         # Commit.
         conn.commit()

reydb/rinfo.py

@@ -216,16 +216,11 @@ class DatabaseInformationSchema(DatabaseInformation):
         Information table.
         """
 
-        # SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            throw(AssertionError, self._rdatabase.drivername)
-
         # Select.
-        else:
-            result = self._rdatabase.execute_select(
-                'information_schema.SCHEMATA',
-                order='`schema_name`'
-            )
+        result = self._rdatabase.execute.select(
+            'information_schema.SCHEMATA',
+            order='`schema_name`'
+        )
 
         # Convert.
         info_table = result.to_table()
@@ -273,13 +268,6 @@ class DatabaseInformationDatabase(DatabaseInformation):
         database_name : Database name.
         """
 
-        # SQLite.
-        if (
-            rdatabase.backend == 'sqlite'
-            and database_name != 'main'
-        ):
-            throw(ValueError, database_name)
-
         # Set parameter.
         self._rdatabase = rdatabase
         self._database_name = database_name
@@ -294,13 +282,9 @@ class DatabaseInformationDatabase(DatabaseInformation):
         Information attribute dictionary.
         """
 
-        # SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            throw(AssertionError, self._rdatabase.drivername)
-
         # Select.
         where = '`SCHEMA_NAME` = :database_name'
-        result = self._rdatabase.execute_select(
+        result = self._rdatabase.execute.select(
             'information_schema.SCHEMATA',
             where=where,
             limit=1,
@@ -328,20 +312,13 @@ class DatabaseInformationDatabase(DatabaseInformation):
         """
 
         # Select.
-
-        ## SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            result = self._rdatabase.execute_select('main.sqlite_master')
-
-        ## Other.
-        else:
-            where = '`TABLE_SCHEMA` = :database_name'
-            result = self._rdatabase.execute_select(
-                'information_schema.TABLES',
-                where=where,
-                order='`TABLE_NAME`',
-                database_name=self._database_name
-            )
+        where = '`TABLE_SCHEMA` = :database_name'
+        result = self._rdatabase.execute.select(
+            'information_schema.TABLES',
+            where=where,
+            order='`TABLE_NAME`',
+            database_name=self._database_name
+        )
 
         # Convert.
         info_table = result.to_table()
@@ -404,27 +381,14 @@ class DatabaseInformationTable(DatabaseInformation):
         """
 
         # Select.
-
-        ## SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            where = '`name` = :name'
-            result = self._rdatabase.execute_select(
-                'main.sqlite_master',
-                where=where,
-                limit=1,
-                name=self._table_name
-            )
-
-        ## Other.
-        else:
-            where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name'
-            result = self._rdatabase.execute_select(
-                'information_schema.TABLES',
-                where=where,
-                limit=1,
-                database_name=self._database_name,
-                table_name=self._table_name
-            )
+        where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name'
+        result = self._rdatabase.execute.select(
+            'information_schema.TABLES',
+            where=where,
+            limit=1,
+            database_name=self._database_name,
+            table_name=self._table_name
+        )
 
         # Convert.
         info_table = result.to_table()
@@ -447,22 +411,14 @@ class DatabaseInformationTable(DatabaseInformation):
         """
 
         # Select.
-
-        ## SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            sql = f'PRAGMA table_info("%s")' % self._table_name
-            result = self._rdatabase.execute(sql)
-
-        ## Other.
-        else:
-            where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name'
-            result = self._rdatabase.execute_select(
-                'information_schema.COLUMNS',
-                where=where,
-                order='`ORDINAL_POSITION`',
-                database_name=self._database_name,
-                table_name=self._table_name
-            )
+        where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name'
+        result = self._rdatabase.execute.select(
+            'information_schema.COLUMNS',
+            where=where,
+            order='`ORDINAL_POSITION`',
+            database_name=self._database_name,
+            table_name=self._table_name
+        )
 
         # Convert.
         info_table = result.to_table()
@@ -522,29 +478,15 @@ class DatabaseInformationColumn(DatabaseInformation):
         """
 
         # Select.
-
-        ## SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            sql = f'PRAGMA table_info("%s")' % self._table_name
-            where = '`name` = :name'
-            result = self._rdatabase.execute(
-                sql,
-                where=where,
-                limit=1,
-                name=self._column_name
-            )
-
-        ## Other.
-        else:
-            where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name AND `COLUMN_NAME` = :column_name'
-            result = self._rdatabase.execute_select(
-                'information_schema.COLUMNS',
-                where=where,
-                limit=1,
-                database_name=self._database_name,
-                table_name=self._table_name,
-                column_name=self._column_name
-            )
+        where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name AND `COLUMN_NAME` = :column_name'
+        result = self._rdatabase.execute.select(
+            'information_schema.COLUMNS',
+            where=where,
+            limit=1,
+            database_name=self._database_name,
+            table_name=self._table_name,
+            column_name=self._column_name
+        )
 
         # Convert.
         info_table = result.to_table()

{reydb-1.1.47.dist-info → reydb-1.1.49.dist-info}/METADATA

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

reydb-1.1.49.dist-info/RECORD

@@ -0,0 +1,16 @@
+reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
+reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
+reydb/rbase.py,sha256=A7or663TcrQyq56P813WsV4BlApZIzXOPdZLsT7KwWw,7040
+reydb/rbuild.py,sha256=GafJ8ocDolj8OsvD9EvMZbR7hKb1WpyQv8LuQO4auKg,32083
+reydb/rconfig.py,sha256=h6L1QFtTcLgUcqzsn35lZfChcVBT0eVBzf5NOqzCUmQ,12721
+reydb/rconn.py,sha256=IGRiOkk0TzWj-NQ2o6A1FnMqYnDvg2G1Dd-7cA0dpP0,2765
+reydb/rdb.py,sha256=E6bFLCKI2f4XXatEsfKDRiZOnT42eYnvsJBV5-OyxQY,12600
+reydb/rerror.py,sha256=UcBU_EuiponHhraU2tqULcip-s5uNRnDmEQIA4IgrYc,10067
+reydb/rexec.py,sha256=xIUbTULfmMkLBYZTPX6lyN5yob-eg6M7Xir1j3jf6PM,29071
+reydb/rfile.py,sha256=OjQQRIZI-vZj0kv9Jljm4_kdp0aL005fAoTl0nAiYAg,15343
+reydb/rinfo.py,sha256=WXuN2sJtI7EK83HceLyoVXewILYtPxo9wDJFg7SQoJ8,13508
+reydb/rparam.py,sha256=6cnSjNlX54iPS1uxMQdpazPM5XL4J87vVgfL6CIYG3U,7031
+reydb-1.1.49.dist-info/METADATA,sha256=7Ae3lNDDvWlwHt4iyfsRzXkF-PlOgoEp7KL7k-U5LSg,1550
+reydb-1.1.49.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.49.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.49.dist-info/RECORD,,

reydb-1.1.47.dist-info/RECORD

@@ -1,16 +0,0 @@
-reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
-reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
-reydb/rbase.py,sha256=HYoFasGBAhXUUHNFP1doGnHBW3-xkgRc32O9KppGSak,4824
-reydb/rbuild.py,sha256=iXJ76BNlUflJfMAAEbPuQLyVePyye8aDq7MaXD16Ktw,32419
-reydb/rconfig.py,sha256=akY9zDQ7chmA5Hkf7Q7F_Oqqjn6gDk9B88dyLQEYMak,12886
-reydb/rconn.py,sha256=UyYx-134b8KwlhBl3D3y5PdXrGceL3n9Oc7bk8xWek0,3475
-reydb/rdb.py,sha256=iThWa2afN0NUkrcsp4_JXGJwPsyp6Xu-l3Qsl5xxaeY,54288
-reydb/rerror.py,sha256=UFz9RnuQX83Ki-fAv9ihrRorVMKlUbawaxAwhnS-dVw,10232
-reydb/rexec.py,sha256=dGdRkG1XR0Z66T0r4nPCSdQzSRWc_Q3t6TPSSrDTIxY,9042
-reydb/rfile.py,sha256=kFKcExyU8PjWRTr6j7ZPB4qJqFMdYNDB77Nkpw4vHcE,15519
-reydb/rinfo.py,sha256=KXTkcpTGAD3p9RVKKcnmc_FjJtiKRPk-K5ZepPOnphQ,15253
-reydb/rparam.py,sha256=6cnSjNlX54iPS1uxMQdpazPM5XL4J87vVgfL6CIYG3U,7031
-reydb-1.1.47.dist-info/METADATA,sha256=5jXtKibf68M6FUjL8NKHnQXLWpW5AkWIeLUbkAWcNeY,1550
-reydb-1.1.47.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.47.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.47.dist-info/RECORD,,