mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-12 18:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

In RowDescription messages, report columns of domain datatypes as having

Browse Source 
the type OID and typmod of the underlying base type.  Per discussions
a few weeks ago with Andreas Pflug and others.  Note that this behavioral
change affects both old- and new-protocol clients.
This commit is contained in:
Tom Lane 2003-05-13 18:39:50 +00:00
parent 0249c24235
commit d9b679c13a
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/access/common/printtup.c
View File

@ -9,7 +9,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.72 2003/05/09 18:08:48 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.73 2003/05/13 18:39:50 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -181,6 +181,10 @@ SendRowDescriptionMessage(TupleDesc typeinfo, List *targetlist, int16 *formats)
for (i = 0; i < natts; ++i) for (i = 0; i < natts; ++i)
{ {
Oid atttypid = attrs[i]->atttypid;
int32 atttypmod = attrs[i]->atttypmod;
Oid basetype;
pq_sendstring(&buf, NameStr(attrs[i]->attname)); pq_sendstring(&buf, NameStr(attrs[i]->attname));
/* column ID info appears in protocol 3.0 and up */ /* column ID info appears in protocol 3.0 and up */
if (proto >= 3) if (proto >= 3)
@ -204,14 +208,18 @@ SendRowDescriptionMessage(TupleDesc typeinfo, List *targetlist, int16 *formats)
pq_sendint(&buf, 0, 2); pq_sendint(&buf, 0, 2);
} }
} }
pq_sendint(&buf, (int) attrs[i]->atttypid, /* If column is a domain, send the base type and typmod instead */
sizeof(attrs[i]->atttypid)); basetype = getBaseType(atttypid);
pq_sendint(&buf, attrs[i]->attlen, if (basetype != atttypid)
sizeof(attrs[i]->attlen)); {
atttypmod = get_typtypmod(atttypid);
atttypid = basetype;
}
pq_sendint(&buf, (int) atttypid, sizeof(atttypid));
pq_sendint(&buf, attrs[i]->attlen, sizeof(attrs[i]->attlen));
/* typmod appears in protocol 2.0 and up */ /* typmod appears in protocol 2.0 and up */
if (proto >= 2) if (proto >= 2)
pq_sendint(&buf, attrs[i]->atttypmod, pq_sendint(&buf, atttypmod, sizeof(atttypmod));
sizeof(attrs[i]->atttypmod));
/* format info appears in protocol 3.0 and up */ /* format info appears in protocol 3.0 and up */
if (proto >= 3) if (proto >= 3)
{ {