Merge pull request #768 from neo4j-contrib/bug/aura-version-check

Fix aura version check

neomodel/util.py

@@ -679,15 +679,19 @@ def version_tag_to_integer(version_tag):
     """
     Converts a version string to an integer representation to allow for quick comparisons between versions.
 
-    :param a_version_string: The version string to be converted (e.g. '3.4.0')
+    :param a_version_string: The version string to be converted (e.g. '5.4.0')
     :type a_version_string: str
-    :return: An integer representation of the version string (e.g. '3.4.0' --> 340)
+    :return: An integer representation of the version string (e.g. '5.4.0' --> 50400)
     :rtype: int
     """
     components = version_tag.split(".")
     while len(components) < 3:
         components.append("0")
     num = 0
     for index, component in enumerate(components):
-        num += (10 ** ((len(components) - 1) - index)) * int(component)
+        # Aura started adding a -aura suffix in version numbers, like "5.14-aura"
+        # This will strip the suffix to allow for proper comparison : 14 instead of 14-aura
+        if "-" in component:
+            component = component.split("-")[0]
+        num += (100 ** ((len(components) - 1) - index)) * int(component)
     return num

test/test_dbms_awareness.py

@@ -1,6 +1,7 @@
 from pytest import mark
 
 from neomodel import db
+from neomodel.util import version_tag_to_integer
 
 
 @mark.skipif(
@@ -9,6 +10,7 @@
 def test_version_awareness():
     assert db.database_version == "5.7.0"
     assert db.version_is_higher_than("5.7")
+    assert db.version_is_higher_than("5.6.0")
     assert db.version_is_higher_than("5")
     assert db.version_is_higher_than("4")
 
@@ -20,3 +22,11 @@ def test_edition_awareness():
         assert db.edition_is_enterprise()
     else:
         assert not db.edition_is_enterprise()
+
+
+def test_version_tag_to_integer():
+    assert version_tag_to_integer("5.7.1") == 50701
+    assert version_tag_to_integer("5.1") == 50100
+    assert version_tag_to_integer("5") == 50000
+    assert version_tag_to_integer("5.14.1") == 51401
+    assert version_tag_to_integer("5.14-aura") == 51400