updated schema version for the new fields and updated the checker acc…

…ordingly
cve-search · Oct 10, 2023 · 8f2853a · 8f2853a
1 parent 29818ed
commit 8f2853a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/CveXplore/.schema_version b/CveXplore/.schema_version
@@ -1,4 +1,4 @@
 {
-    "version": "1.3",
+    "version": "1.4",
     "rebuild_needed": true
 }
diff --git a/CveXplore/VERSION b/CveXplore/VERSION
@@ -1 +1 @@
-0.3.1
+0.3.4
diff --git a/CveXplore/database/maintenance/DatabaseSchemaChecker.py b/CveXplore/database/maintenance/DatabaseSchemaChecker.py
@@ -20,28 +20,23 @@ def __init__(self):
         self.logger = logging.getLogger("SchemaChecker")
 
     def validate_schema(self):
-        if hasattr(self.dbh.connection, "store_schema"):
-            try:
-                if (
-                    not self.schema_version["version"]
-                    == list(self.dbh.connection.store_schema.find({}))[0]["version"]
-                ):
-                    if not self.schema_version["rebuild_needed"]:
-                        raise DatabaseSchemaError(
-                            "Database is not on the latest schema version; please update the database!"
-                        )
-                    else:
-                        raise DatabaseSchemaError(
-                            "Database schema is not up to date; please re-populate the database!"
-                        )
+        try:
+            if (
+                not self.schema_version["version"]
+                == list(self.dbh.find({}))[0]["version"]
+            ):
+                if not self.schema_version["rebuild_needed"]:
+                    raise DatabaseSchemaError(
+                        "Database is not on the latest schema version; please update the database!"
+                    )
                 else:
-                    return True
-            except IndexError:
-                # something went wrong fetching the result from the database; assume re-populate is needed
-                raise DatabaseSchemaError(
-                    "Database schema is not up to date; please re-populate the database!"
-                )
-        else:
+                    raise DatabaseSchemaError(
+                        "Database schema is not up to date; please re-populate the database!"
+                    )
+            else:
+                return True
+        except IndexError:
+            # something went wrong fetching the result from the database; assume re-populate is needed
             raise DatabaseSchemaError(
                 "Database schema is not up to date; please re-populate the database!"
             )