From 0ed64fe3298d4f72e90c7f5fa00c805c8f24f58c Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 18 May 2006 03:36:58 +0000 Subject: [PATCH] Fixed #1904 -- Got postgresql_psycopg2 backend working. Thanks for the patch, germish@gmail.com git-svn-id: http://code.djangoproject.com/svn/django/trunk@2934 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../db/backends/postgresql_psycopg2/base.py | 16 ++-- .../postgresql_psycopg2/introspection.py | 86 ++++++++++++++++++- 2 files changed, 92 insertions(+), 10 deletions(-) diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py index 9c16efc3ed..9376c36772 100644 --- a/django/db/backends/postgresql_psycopg2/base.py +++ b/django/db/backends/postgresql_psycopg2/base.py @@ -5,7 +5,7 @@ Requires psycopg 2: http://initd.org/projects/psycopg2 """ from django.db.backends import util -import psycopg2.psycopg1 as Database +import psycopg2 as Database DatabaseError = Database.DatabaseError @@ -65,14 +65,20 @@ def quote_name(name): def dictfetchone(cursor): "Returns a row from the cursor as a dict" + # TODO: cursor.dictfetchone() doesn't exist in psycopg2, + # but no Django code uses this. Safe to remove? return cursor.dictfetchone() def dictfetchmany(cursor, number): "Returns a certain number of rows from a cursor as a dict" + # TODO: cursor.dictfetchmany() doesn't exist in psycopg2, + # but no Django code uses this. Safe to remove? return cursor.dictfetchmany(number) def dictfetchall(cursor): "Returns all rows from a cursor as a dict" + # TODO: cursor.dictfetchall() doesn't exist in psycopg2, + # but no Django code uses this. Safe to remove? return cursor.dictfetchall() def get_last_insert_id(cursor, table_name, pk_name): @@ -101,14 +107,6 @@ def get_random_function_sql(): def get_drop_foreignkey_sql(): return "DROP CONSTRAINT" -# Register these custom typecasts, because Django expects dates/times to be -# in Python's native (standard-library) datetime/time format, whereas psycopg -# use mx.DateTime by default. -Database.register_type(Database.new_type((1082,), "DATE", util.typecast_date)) -Database.register_type(Database.new_type((1083,1266), "TIME", util.typecast_time)) -Database.register_type(Database.new_type((1114,1184), "TIMESTAMP", util.typecast_timestamp)) -Database.register_type(Database.new_type((16,), "BOOLEAN", util.typecast_boolean)) - OPERATOR_MAPPING = { 'exact': '= %s', 'iexact': 'ILIKE %s', diff --git a/django/db/backends/postgresql_psycopg2/introspection.py b/django/db/backends/postgresql_psycopg2/introspection.py index 38181b87e2..88c44f98d7 100644 --- a/django/db/backends/postgresql_psycopg2/introspection.py +++ b/django/db/backends/postgresql_psycopg2/introspection.py @@ -1 +1,85 @@ -from django.db.backends.postgresql.introspection import * +from django.db import transaction +from django.db.backends.postgresql_psycopg2.base import quote_name + +def get_table_list(cursor): + "Returns a list of table names in the current database." + cursor.execute(""" + SELECT c.relname + FROM pg_catalog.pg_class c + LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace + WHERE c.relkind IN ('r', 'v', '') + AND n.nspname NOT IN ('pg_catalog', 'pg_toast') + AND pg_catalog.pg_table_is_visible(c.oid)""") + return [row[0] for row in cursor.fetchall()] + +def get_table_description(cursor, table_name): + "Returns a description of the table, with the DB-API cursor.description interface." + cursor.execute("SELECT * FROM %s LIMIT 1" % quote_name(table_name)) + return cursor.description + +def get_relations(cursor, table_name): + """ + Returns a dictionary of {field_index: (field_index_other_table, other_table)} + representing all relationships to the given table. Indexes are 0-based. + """ + cursor.execute(""" + SELECT con.conkey, con.confkey, c2.relname + FROM pg_constraint con, pg_class c1, pg_class c2 + WHERE c1.oid = con.conrelid + AND c2.oid = con.confrelid + AND c1.relname = %s + AND con.contype = 'f'""", [table_name]) + relations = {} + for row in cursor.fetchall(): + try: + # row[0] and row[1] are like "{2}", so strip the curly braces. + relations[int(row[0][1:-1]) - 1] = (int(row[1][1:-1]) - 1, row[2]) + except ValueError: + continue + return relations + +def get_indexes(cursor, table_name): + """ + Returns a dictionary of fieldname -> infodict for the given table, + where each infodict is in the format: + {'primary_key': boolean representing whether it's the primary key, + 'unique': boolean representing whether it's a unique index} + """ + # Get the table description because we only have the column indexes, and we + # need the column names. + desc = get_table_description(cursor, table_name) + # This query retrieves each index on the given table. + cursor.execute(""" + SELECT idx.indkey, idx.indisunique, idx.indisprimary + FROM pg_catalog.pg_class c, pg_catalog.pg_class c2, + pg_catalog.pg_index idx + WHERE c.oid = idx.indrelid + AND idx.indexrelid = c2.oid + AND c.relname = %s""", [table_name]) + indexes = {} + for row in cursor.fetchall(): + # row[0] (idx.indkey) is stored in the DB as an array. It comes out as + # a string of space-separated integers. This designates the field + # indexes (1-based) of the fields that have indexes on the table. + # Here, we skip any indexes across multiple fields. + if ' ' in row[0]: + continue + col_name = desc[int(row[0])-1][0] + indexes[col_name] = {'primary_key': row[2], 'unique': row[1]} + return indexes + +# Maps type codes to Django Field types. +DATA_TYPES_REVERSE = { + 16: 'BooleanField', + 21: 'SmallIntegerField', + 23: 'IntegerField', + 25: 'TextField', + 869: 'IPAddressField', + 1043: 'CharField', + 1082: 'DateField', + 1083: 'TimeField', + 1114: 'DateTimeField', + 1184: 'DateTimeField', + 1266: 'TimeField', + 1700: 'FloatField', +}