mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

[2.2.x] Fixed #30331 -- Added support for psycopg2 2.8.

Browse Source 
Backport of 5efaf078f7609a8c95045bcfdab0ba256b5449bf from master
This commit is contained in:
Mariusz Felisiak 2019-04-05 11:05:53 +02:00
parent 1279fb4a00
commit 54b65b83a2
No known key found for this signature in database
GPG Key ID: 2EF56372BA48CD1B
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
django/db/backends/postgresql/introspection.py
View File

@ -77,7 +77,18 @@ class DatabaseIntrospection(BaseDatabaseIntrospection):
""", [table_name]) """, [table_name])
field_map = {line[0]: line[1:] for line in cursor.fetchall()} field_map = {line[0]: line[1:] for line in cursor.fetchall()}
cursor.execute("SELECT * FROM %s LIMIT 1" % self.connection.ops.quote_name(table_name)) cursor.execute("SELECT * FROM %s LIMIT 1" % self.connection.ops.quote_name(table_name))
return [FieldInfo(*line[0:6], *field_map[line.name]) for line in cursor.description] return [
FieldInfo(
line.name,
line.type_code,
line.display_size,
line.internal_size,
line.precision,
line.scale,
*field_map[line.name],
)
for line in cursor.description
]
def get_sequences(self, cursor, table_name, table_fields=()): def get_sequences(self, cursor, table_name, table_fields=()):
cursor.execute(""" cursor.execute("""

2
docs/releases/2.2.1.txt
View File

@ -12,3 +12,5 @@ Bugfixes
* Fixed a regression in Django 2.1 that caused the incorrect quoting of * Fixed a regression in Django 2.1 that caused the incorrect quoting of
database user password when using :djadmin:`dbshell` on Oracle database user password when using :djadmin:`dbshell` on Oracle
(:ticket:`30307`). (:ticket:`30307`).
* Added compatibility for ``psycopg2`` 2.8 (:ticket:`30331`).