From 087d2ba8480734472992a34e5d449be4ba16a835 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sat, 13 Feb 2016 20:54:50 -0300 Subject: [PATCH 1/2] Report TDS version 7.1 as 7.1 instead of 8.0. This is a backward-incompatible change. --- ChangeLog | 14 ++++++++++++++ ChangeLog_highlights.rst | 14 ++++++++++++++ docs/ref/_mssql.rst | 6 +++++- src/_mssql.pyx | 2 +- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ef8f245..cdf2f543 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,20 @@ Change Log ========== +Version 2.2.0 - To be released +============================== + +Features +-------- + +TBA + +Bug fixes +--------- + +- Fix ``tds_version`` ``_mssql`` connection property value for TDS version. + 7.1 is actually 7.1 and not 8.0. + Version 2.1.2 - 2016-02-10 - Ramiro Morales =============================================== diff --git a/ChangeLog_highlights.rst b/ChangeLog_highlights.rst index 89729ecc..3a349d6a 100644 --- a/ChangeLog_highlights.rst +++ b/ChangeLog_highlights.rst @@ -1,6 +1,20 @@ Recent Changes ============== +Version 2.2.0 - To be released +============================== + +Features +-------- + +TBA + +Bug fixes +--------- + +- Fix ``tds_version`` ``_mssql`` connection property value for TDS version. + 7.1 is actually 7.1 and not 8.0. + Version 2.1.2 - 2016-02-10 - Ramiro Morales =============================================== diff --git a/docs/ref/_mssql.rst b/docs/ref/_mssql.rst index 88c3395d..2cf949ff 100644 --- a/docs/ref/_mssql.rst +++ b/docs/ref/_mssql.rst @@ -169,7 +169,11 @@ Functions .. attribute:: MSSQLConnection.tds_version The TDS version used by this connection. Can be one of ``4.2``, ``5.0`` - ``7.0``, ``8.0`` and ``7.2``. + ``7.0``, ``7.1`` and ``7.2``. + + .. versionchanged:: 2.2.0 + For correctness and consistency the value used to indicate TDS 7.1 + changed from ``8.0`` to ``7.1`` on pymssql 2.2.0. .. warning:: For historical and backward compatibility reasons, the value used to diff --git a/src/_mssql.pyx b/src/_mssql.pyx index a3463e5a..9cf0c23a 100644 --- a/src/_mssql.pyx +++ b/src/_mssql.pyx @@ -515,7 +515,7 @@ cdef class MSSQLConnection: if version == 10: return 7.2 elif version == 9: - return 8.0 # Actually 7.1, return 8.0 to keep backward compatibility + return 7.1 elif version == 8: return 7.0 elif version == 6: From 47d9f45a3c1441df5b62262df3feb575e63d53f8 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sat, 13 Feb 2016 22:54:00 -0300 Subject: [PATCH 2/2] docs: Remove now redundant warning note. [ci skip] --- docs/ref/_mssql.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/ref/_mssql.rst b/docs/ref/_mssql.rst index 2cf949ff..417b8a9e 100644 --- a/docs/ref/_mssql.rst +++ b/docs/ref/_mssql.rst @@ -175,11 +175,6 @@ Functions For correctness and consistency the value used to indicate TDS 7.1 changed from ``8.0`` to ``7.1`` on pymssql 2.2.0. - .. warning:: - For historical and backward compatibility reasons, the value used to - represent TDS 7.1 is ``8.0``. This will change with pymssql 2.2.0 when it - will be fixed to be ``7.1`` for correctness and consistency. - ``MSSQLConnection`` object methods ----------------------------------