Commit f8e8853b authored by peterfarrell's avatar peterfarrell Committed by Tim Graham
Browse files

Fixed #24637 -- Fixed database introspection with SQLite 3.8.9.

parent b333d106

django/db/backends/sqlite3/introspection.py

+4 −1
Original line number Diff line number Diff line
@@ -239,7 +239,10 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): 
        constraints = {}

        # Get the index info

        cursor.execute("PRAGMA index_list(%s)" % self.connection.ops.quote_name(table_name))

        for number, index, unique in cursor.fetchall():

        for row in cursor.fetchall():

            # Sqlite3 3.8.9+ has 5 columns, however older versions only give 3

            # columns. Discard last 2 columns if there.

            number, index, unique = row[:3]

            # Get the index info for that index

            cursor.execute('PRAGMA index_info(%s)' % self.connection.ops.quote_name(index))

            for index_rank, column_rank, column in cursor.fetchall():

docs/releases/1.7.8.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
==========================

Django 1.7.7 release notes

==========================



*Under development*



Django 1.7.8 fixes database introspection with SQLite 3.8.9 (released April 8,

2015) (:ticket:`24637`).

docs/releases/1.8.1.txt

+3 −0
Original line number Diff line number Diff line
@@ -41,3 +41,6 @@ Bugfixes 


* Fixed a crash with ``QuerySet.update()`` on foreign keys to instances with

  ``uuid`` primary keys (:ticket:`24611`).



* Fixed database introspection with SQLite 3.8.9 (released April 8, 2015)

  (:ticket:`24637`).

docs/releases/index.txt

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ versions of the documentation contain the release notes for any later releases. 
.. toctree::

   :maxdepth: 1



   1.7.8

   1.7.7

   1.7.6

   1.7.5