Skip to content

Commit 8eac124

Browse files
Merge pull request datastax#1049 from clohfink/PYTHON-1158
Use 4.0 schema parser in 4 alpha and snapshot builds
2 parents 7a4a863 + 371911b commit 8eac124

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

cassandra/metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2770,7 +2770,7 @@ def export_as_string(self):
27702770

27712771
def get_schema_parser(connection, server_version, timeout):
27722772
version = Version(server_version)
2773-
if version >= Version('4.0.0'):
2773+
if version >= Version('4-a'):
27742774
return SchemaParserV4(connection, timeout)
27752775
if version >= Version('3.0.0'):
27762776
return SchemaParserV3(connection, timeout)

tests/unit/test_util_types.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,9 @@ def test_version_compare(self):
267267
self.assertTrue(Version('2.3.0.build0') > Version('2.3.0.1')) # 4th part fallback to str cmp
268268
self.assertTrue(Version('2.3.0') < Version('2.3.0.build'))
269269

270+
self.assertTrue(Version('4-a') <= Version('4.0.0'))
271+
self.assertTrue(Version('4-a') <= Version('4.0-alpha1'))
272+
self.assertTrue(Version('4-a') <= Version('4.0-beta1'))
270273
self.assertTrue(Version('4.0.0') >= Version('4.0.0'))
271274
self.assertTrue(Version('4.0.0.421') >= Version('4.0.0'))
272275
self.assertTrue(Version('4.0.1') >= Version('4.0.0'))

0 commit comments

Comments
 (0)