Merge pull request #2 from the-sam963/new-feature

New feature Added

Author: CodingSamrat

filexdb/collection.py

@@ -19,31 +19,26 @@ def __init__(self, col_name: str, file_handler: FileIO) -> None:
         self._file_handler = file_handler
 
         # Get the data of existing Database or empty database.
-        self._database = self._file_handler.read()
+        self._database = self._get_database()
 
-        self._cursor: int = 0
+        # Initiating Collecting
+        self._collection = self._get_collection()
 
-        # Initiate a default Collection.
-        # Check the Collection is already exists or no.
-        if self._col_name in self._database.keys():
+        # Cursor
+        self._cursor: int = 0
 
-            # Get the existing Collection
-            self._collection: list = self._database[self._col_name]
 
-        else:
-            # Create new Collection
-            self._database[self._col_name] = []
-            self._collection: list = self._database[self._col_name]
 
     def insert(self, document: Mapping) -> str:
         """
         Inserts a single Document into the Database.
 
         Document should be JSON Object.
 
-        :param document: Document to insert into database
-        :return: None
+        :param document: Document to insert into the database.
+        :return: Document ID.
         """
+
         # Make sure the document implements the ``Mapping`` interface
         if not isinstance(document, Mapping):
             raise ValueError('Document is not a Dictionary')
@@ -52,10 +47,14 @@ def insert(self, document: Mapping) -> str:
         if "_id_" in document.keys():
             raise KeyError(f"You are not allowed to modify key `_id_`")
 
+
+        # getting Database
+        _database = self._get_database()
+
         # Create a Document
         _document = Document(document)
 
-        # id of Document
+        # ID of Document
         _doc_id: str = _document.id
 
         # check Document is already exist or not
@@ -65,11 +64,11 @@ def insert(self, document: Mapping) -> str:
             self._collection.append(_document)
 
             # Add modified Collection to Database
-            self._database[self._col_name] = self._collection
+            _database[self._col_name] = self._collection
 
             # print(self._database)
             # Write current state of Database into the Database-file
-            self._file_handler.write(self._database)
+            self._file_handler.write(_database)
 
             return _doc_id
         else:
@@ -254,15 +253,96 @@ def update(self, document: Mapping, query=None) -> JsonArray[str]:
 
         return JsonArray(_doc_id)
 
-    def rename(self, new_name: str) -> str:
-        pass
+    def rename(self, new_name: str) -> int:
+        """
+        This method used to change the name of collection.
+        Takes current name & new name to change name of the collection.
+
+        :param new_name: New name for collection.
+        :return: Amount of affected collection.
+        """
+
+        # Initiating counter
+        count = 0
 
-    def drop(self) -> str:
-        pass
+        # Checking the collection is already exist or not
+        if new_name not in self._database.keys():
+
+            # Creating new collection and
+            # Putting old data into new collection
+            self._database[new_name] = self._collection
+
+            # Writing Current database status into the file
+            self._file_handler.write(self._database)
 
+            # Remove old collection
+            self.drop()
+
+            # Increasing counter
+            count += 1
+
+        return count
+
+    def drop(self) -> int:
+        """
+        Deletes the selected collection from the database
+
+        :return: Amount of affected collection
+        """
+
+        # Initiating counter
+        count = 0
+
+        # Getting database
+        _database = self._file_handler.read()
+
+        # Check database has the collection or not
+        if self._col_name in _database.keys():
+            # Removing collection from database
+            _database.pop(self._col_name)
+
+            # Writing current status of database into the file system.
+            self._file_handler.write(_database)
+
+            # Increasing counter
+            count += 1
+
+        return count
 
 
     # ----------------------------------------------------------------#
+    def _get_database(self) -> Document:
+        """
+        Getting Database
+
+        :return: Database
+        """
+        # Get the data of existing Database or empty database.
+        database = Document(self._file_handler.read(), False)
+
+        return database
+
+    def _get_collection(self) -> JsonArray:
+        """
+        Getting Collection
+
+        :return: Collection
+        """
+        # Initiate a default Collection.
+        # Check the Collection is already exists or no.
+        if self._col_name in self._database.keys():
+
+            # Get the existing Collection
+            _collection: JsonArray = self._database[self._col_name]
+
+        else:
+            # Create new Collection
+            self._database[self._col_name] = JsonArray([])
+            _collection: JsonArray = self._database[self._col_name]
+
+        return _collection
+
+
     def _reset_cursor(self) -> None:
         """
         Reset Cursor Pointer to 0th index

filexdb/database.py

@@ -19,7 +19,6 @@ def __init__(self, db_name: str, data_dir=None, mode="binary"):
         :param db_name: Name of Database without file extension.
         :param data_dir: Where the Database will be stored.
         """
-        self._database = {}
         self._db_name = db_name
         self._data_dir = data_dir
 
@@ -29,6 +28,10 @@ def __init__(self, db_name: str, data_dir=None, mode="binary"):
         elif mode == "json":
             self._file_handler = JsonFileIO(self._db_name, self._data_dir)
 
+        # Getting whole database.
+        self._database = self._show()
+
+
     def collection(self, col_name: str) -> Collection:
         """
         Creates a brand-new Collection if the Collection is not exists.
@@ -55,21 +58,24 @@ def show_collections(self) -> JsonArray:
 
         return _result
 
-    def show(self) -> Document:
+    def export(self, _file_name, _file_dir=None, _mode="json"):
         """
+        Export data in to readable file.
 
-        :return: Database
+        :param _file_name: File name in which data will be exported.
+        :param _file_dir: Parent directory of export file.
+        :param _mode: In which file mode you want to export data.
+        :return: None.
         """
-        self._database = self._file_handler.read()
-        return Document(self._database, False)
 
-    def export(self, _file_name, _file_dir=None, _mode="json"):
-        """
+        e = Export(self._database, _file_name, _file_dir, _mode)
+
 
-        :param _file_name:
-        :param _file_dir:
-        :param _mode:
-        :return:
+    def _show(self) -> Document:
         """
+        Shows the hole Database.
 
-        e = Export(self.show(), _file_name, _file_dir, _mode)
+        :return: Database
+        """
+        self._database = self._file_handler.read()
+        return Document(self._database, False)

test/test_collection.py

@@ -6,21 +6,27 @@
 
 # Create a Collection
 student_info = db.collection("student_info")
+student_2 = db.collection("student_2")
 
 
 def test_insert():
     assert student_info.insert({"name": "Sam", "roll": "CSE/17/19", "dept": "CSE"})
     assert student_info.insert({"name": "Bob", "roll": "EE/01/18", "dept": "EE", "skill": ["python", "c++"]})
     assert student_info.insert({"name": "Rana", "dept": "CSE"})
+    assert student_2.insert({"name": "Rana", "dept": "CSE"})
 
 
 def test_insert_all():
     assert student_info.insert_all([
         {"name": "Addy", "roll": "ME/57/19", "dept": "ME", "cgpa": 9.05},
         {"name": "Roman", "roll": "ECE/80/13", "dept": "ECE", "skill": ["game design"], "spc": ["Blinder"]},
         {"name": "Sam"}
-    ]
-    )
+    ])
+    assert student_2.insert_all([
+        {"name": "Addy", "roll": "CSE/57/19", "dept": "CSE", "cgpa": 9.05},
+        {"name": "Roman", "roll": "CSE/80/13", "dept": "CSE", "skill": ["game design"], "spc": ["Blinder"]},
+        {"name": "Sam", "dept": "CSE"}
+    ])
 
 
 def test_find():
@@ -36,7 +42,7 @@ def test_find():
 
     assert student_info.find()                                  # Returns all Documents.
     assert student_info.find(query=_query_2)                    # Returns all Documents matches the ``_query``.
-    assert student_info.find(query=_query_2, limit=(0, 30))      # Returns doc[1] to doc[2] matches the ``_query``.
+    assert student_info.find(query=_query_2, limit=(0, 30))     # Returns doc[1] to doc[2] matches the ``_query``.
     assert student_info.find(limit=(1, 10))                     # Returns doc[1] to doc[9] of all Documents.
 
 
@@ -64,7 +70,17 @@ def test_delete():
     assert student_info.delete({"name": "Roman", "roll": "ECE/80/13", "dept": "ECE"})
 
 
-def update_document():
+def test_update_document():
     assert student_info.update({"passed": True, "mobile": 123456789}, {"name": "Bob"})
     assert student_info.update({"name": "The Sam", "skill": ["C++", "Python"]}, {"name": "Sam"})
     assert student_info.update({"dept": "Computer Science & Engineering"}, {"dept": "CSE"})
+
+
+def test_rename():
+    student_2.rename("student_info_cse")
+
+
+def test_drop():
+    student_info.drop()
+
+

test/test_database.py

@@ -6,8 +6,8 @@
 db_2 = FileXdb("NewDb", "test_data/db")
 
 # Create a Collection
-student_info = db.collection("student_info")
-player_info = db.collection("student_info")
+student_info = db_2.collection("student_info")
+player_info = db_2.collection("student_info")
 
 student_info.insert_all([
         {"name": "Addy", "roll": "ME/57/19", "dept": "ME", "cgpa": 9.05},
@@ -23,12 +23,12 @@ def test_show_collections():
 
 
 def test_show():
-    assert db.show()
-    db_2.show()
+    db._show()
+    db_2._show()
 
     # prettify json object
-    assert db.show().prettify()
-    assert db_2.show().prettify()
+    assert db._show().prettify()
+    assert db_2._show().prettify()
 
 
 def test_export():