Skip to content

Commit 2eb3ba9

Browse files
committed
Merge pull request pymssql#394 from pymssql/dont-report-tds-7_1-as-8_0
Report TDS version 7.1 as 7.1 instead of 8.0.
2 parents 6f8038a + 47d9f45 commit 2eb3ba9

4 files changed

Lines changed: 33 additions & 6 deletions

File tree

ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
Change Log
22
==========
33

4+
Version 2.2.0 - To be released
5+
==============================
6+
7+
Features
8+
--------
9+
10+
TBA
11+
12+
Bug fixes
13+
---------
14+
15+
- Fix ``tds_version`` ``_mssql`` connection property value for TDS version.
16+
7.1 is actually 7.1 and not 8.0.
17+
418
Version 2.1.2 - 2016-02-10 - Ramiro Morales
519
===============================================
620

ChangeLog_highlights.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
Recent Changes
22
==============
33

4+
Version 2.2.0 - To be released
5+
==============================
6+
7+
Features
8+
--------
9+
10+
TBA
11+
12+
Bug fixes
13+
---------
14+
15+
- Fix ``tds_version`` ``_mssql`` connection property value for TDS version.
16+
7.1 is actually 7.1 and not 8.0.
17+
418
Version 2.1.2 - 2016-02-10 - Ramiro Morales
519
===============================================
620

docs/ref/_mssql.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,11 @@ Functions
169169
.. attribute:: MSSQLConnection.tds_version
170170

171171
The TDS version used by this connection. Can be one of ``4.2``, ``5.0``
172-
``7.0``, ``8.0`` and ``7.2``.
172+
``7.0``, ``7.1`` and ``7.2``.
173173

174-
.. warning::
175-
For historical and backward compatibility reasons, the value used to
176-
represent TDS 7.1 is ``8.0``. This will change with pymssql 2.2.0 when it
177-
will be fixed to be ``7.1`` for correctness and consistency.
174+
.. versionchanged:: 2.2.0
175+
For correctness and consistency the value used to indicate TDS 7.1
176+
changed from ``8.0`` to ``7.1`` on pymssql 2.2.0.
178177

179178
``MSSQLConnection`` object methods
180179
----------------------------------

src/_mssql.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ cdef class MSSQLConnection:
515515
if version == 10:
516516
return 7.2
517517
elif version == 9:
518-
return 8.0 # Actually 7.1, return 8.0 to keep backward compatibility
518+
return 7.1
519519
elif version == 8:
520520
return 7.0
521521
elif version == 6:

0 commit comments

Comments
 (0)