diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-07-31 08:30:45 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-07-31 08:34:06 -0400 |
| commit | a1160414b8dc798a1cf1b8c71a68c6cdc3526384 (patch) | |
| tree | 5f598807cb41fc811382cbbce7ce1c194a3dc253 | |
| parent | ace88cdd2ce154feffa9105e85bd6984cc76715b (diff) | |
| download | sqlalchemy-a1160414b8dc798a1cf1b8c71a68c6cdc3526384.tar.gz | |
- convert to spaces
- restore unreleased directories
Change-Id: Ia5c1142ffbdba6372f800c2e2521660ab62d9c4f
| -rw-r--r-- | doc/build/changelog/changelog_10.rst | 1 | ||||
| -rw-r--r-- | doc/build/changelog/changelog_11.rst | 1 | ||||
| -rw-r--r-- | doc/build/changelog/changelog_12.rst | 1 | ||||
| -rw-r--r-- | doc/build/changelog/unreleased_10/4035.rst | 26 |
4 files changed, 16 insertions, 13 deletions
diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst index 1fba5b9a3..7dd702325 100644 --- a/doc/build/changelog/changelog_10.rst +++ b/doc/build/changelog/changelog_10.rst @@ -18,6 +18,7 @@ .. changelog:: :version: 1.0.19 + :include_notes_from: unreleased_10 .. changelog:: :version: 1.0.18 diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst index e79670390..74b00fac0 100644 --- a/doc/build/changelog/changelog_11.rst +++ b/doc/build/changelog/changelog_11.rst @@ -20,6 +20,7 @@ .. changelog:: :version: 1.1.13 + :include_notes_from: unreleased_11 .. changelog:: :version: 1.1.12 diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst index f1bf05f6b..4de1ae9bb 100644 --- a/doc/build/changelog/changelog_12.rst +++ b/doc/build/changelog/changelog_12.rst @@ -12,6 +12,7 @@ .. changelog:: :version: 1.2.0b3 + :include_notes_from: unreleased_12 .. changelog:: :version: 1.2.0b2 diff --git a/doc/build/changelog/unreleased_10/4035.rst b/doc/build/changelog/unreleased_10/4035.rst index 74acdfe71..b1dcd7dcc 100644 --- a/doc/build/changelog/unreleased_10/4035.rst +++ b/doc/build/changelog/unreleased_10/4035.rst @@ -1,15 +1,15 @@ .. change:: - :tags: bug, oracle, performance, py2k - :tickets: 4035 - :versions: 1.0.19, 1.1.13, 1.2.0b3 + :tags: bug, oracle, performance, py2k + :tickets: 4035 + :versions: 1.0.19, 1.1.13, 1.2.0b3 - Fixed performance regression caused by the fix for :ticket:`3937` where - cx_Oracle as of version 5.3 dropped the ``.UNICODE`` symbol from its - namespace, which was interpreted as cx_Oracle's "WITH_UNICODE" mode being - turned on unconditionally, which invokes functions on the SQLAlchemy - side which convert all strings to unicode unconditionally and causing - a performance impact. In fact, per cx_Oracle's author the - "WITH_UNICODE" mode has been removed entirely as of 5.1, so the expensive unicode - conversion functions are no longer necessary and are disabled if - cx_Oracle 5.1 or greater is detected under Python 2. The warning against - "WITH_UNICODE" mode that was removed under :ticket:`3937` is also restored. + Fixed performance regression caused by the fix for :ticket:`3937` where + cx_Oracle as of version 5.3 dropped the ``.UNICODE`` symbol from its + namespace, which was interpreted as cx_Oracle's "WITH_UNICODE" mode being + turned on unconditionally, which invokes functions on the SQLAlchemy + side which convert all strings to unicode unconditionally and causing + a performance impact. In fact, per cx_Oracle's author the + "WITH_UNICODE" mode has been removed entirely as of 5.1, so the expensive unicode + conversion functions are no longer necessary and are disabled if + cx_Oracle 5.1 or greater is detected under Python 2. The warning against + "WITH_UNICODE" mode that was removed under :ticket:`3937` is also restored. |