Make regex more robust for PySQL recognition

Our regex was a little bit off; it would have not fully been able to parse version numbers with `rc`, `a` appendages etc. As it happens, our version number was not in canonical form in anycase. We were also missing the parsing for PySQL client in the log redactor (which is used for a new pipeline that is being developed by the data team). This PR fixes those things.

* Unit test in py client(s) to make sure version number is canonical

Author: NiallEgan

cmdexec/clients/python/src/databricks/sql/__init__.py

@@ -20,7 +20,7 @@ def __repr__(self):
 DATE = _DBAPITypeObject('date')
 ROWID = _DBAPITypeObject()
 
-__version__ = "2.0.0-rc1"
+__version__ = "2.0.0rc1"
 USER_AGENT_NAME = "PyDatabricksSqlConnector"
 
 

cmdexec/clients/python/src/databricks/sql/thrift_backend.py

@@ -110,8 +110,9 @@ def make_request(self, method, request, attempt_number=1):
             # We do not want threads to be simultaneously sharing the Thrift Transport
             # because we use its state to determine retries
             self._request_lock.acquire()
+            logger.warning("Sending request: {}".format(request))
             response = method(request)
-            logger.debug("Received response: {}".format(response))
+            logger.warning("Received response: {}".format(response))
             ThriftBackend._check_response_for_error(response)
             return response
         except Exception as error:

cmdexec/clients/python/tests/tests.py

@@ -1,3 +1,4 @@
+import re
 import sys
 import unittest
 from unittest.mock import patch, MagicMock, Mock
@@ -331,6 +332,12 @@ def test_max_number_of_retries_passthrough(self, mock_client_class):
 
         self.assertEqual(mock_client_class.call_args[1]["_retry_stop_after_attempts_count"], 54)
 
+    def test_version_is_canonical(self):
+        version = databricks.sql.__version__
+        canonical_version_re = r'^([1-9][0-9]*!)?(0|[1-9][0-9]*)(\.(0|[1-9][0-9]*))*((a|b|rc)' \
+                               r'(0|[1-9][0-9]*))?(\.post(0|[1-9][0-9]*))?(\.dev(0|[1-9][0-9]*))?$'
+        self.assertIsNotNone(re.match(canonical_version_re, version))
+
 
 if __name__ == '__main__':
     suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])