Skip to content

Commit d394d06

Browse files
bmomjianbmomjian
committed
Fix atttypmod alignment again, and re-enable ecpg.
1 parent e2b0911 commit d394d06

File tree

6 files changed

+43
-26
lines changed

6 files changed

+43
-26
lines changed

‎src/backend/commands/defind.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.23 1998/08/26 05:22:36 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.24 1998/08/26 16:43:41 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -468,7 +468,7 @@ NormIndexAttrs(List *attList, /* list of IndexElem's */
468468
Oid relId)
469469
{
470470
List *rest;
471-
HeapTuple tuple;
471+
HeapTuple atttuple, tuple;
472472

473473
/*
474474
* process attributeList
@@ -484,20 +484,34 @@ NormIndexAttrs(List *attList, /* list of IndexElem's */
484484
if (attribute->name == NULL)
485485
elog(ERROR, "missing attribute for define index");
486486

487-
tuple = SearchSysCacheTuple(ATTNAME,
487+
atttuple = SearchSysCacheTupleCopy(ATTNAME,
488488
ObjectIdGetDatum(relId),
489489
PointerGetDatum(attribute->name),
490490
0, 0);
491-
if (!HeapTupleIsValid(tuple))
491+
if (!HeapTupleIsValid(atttuple))
492492
{
493493
elog(ERROR,
494494
"DefineIndex: attribute \"%s\" not found",
495495
attribute->name);
496496
}
497497

498-
attform = (AttributeTupleForm) GETSTRUCT(tuple);
498+
attform = (AttributeTupleForm) GETSTRUCT(atttuple);
499499
*attNumP++ = attform->attnum;
500500

501+
/* we want the type so we can set the proper alignment, etc. */
502+
if (attribute->typename == NULL)
503+
{
504+
tuple = SearchSysCacheTuple(TYPOID,
505+
ObjectIdGetDatum(attform->atttypid),
506+
0, 0, 0);
507+
if (!HeapTupleIsValid(tuple))
508+
elog(ERROR, "create index: type for attribute '%s' undefined",
509+
attribute->name);
510+
/* we just set the type name because that is all we need */
511+
attribute->typename = makeNode(TypeName);
512+
attribute->typename->name = nameout(&((TypeTupleForm) GETSTRUCT(tuple))->typname);
513+
}
514+
501515
if (attribute->class == NULL)
502516
{
503517
/* no operator class specified, so find the default */
@@ -520,21 +534,7 @@ NormIndexAttrs(List *attList, /* list of IndexElem's */
520534
attribute->class);
521535
}
522536
*classOidP++ = tuple->t_oid;
523-
/* we want the type so we can set the proper alignment, etc. */
524-
if (attribute->typename == NULL)
525-
{
526-
Oid typoid = ((Form_pg_opclass) GETSTRUCT(tuple))->opcdeftype;
527-
528-
tuple = SearchSysCacheTuple(TYPOID,
529-
ObjectIdGetDatum(typoid),
530-
0, 0, 0);
531-
if (!HeapTupleIsValid(tuple))
532-
elog(ERROR, "create index: type for class '%s' undefined",
533-
attribute->class);
534-
/* we just set the name because that is all we need */
535-
attribute->typename = makeNode(TypeName);
536-
attribute->typename->name = nameout(&((TypeTupleForm) GETSTRUCT(tuple))->typname);
537-
}
537+
pfree(atttuple);
538538
}
539539
}
540540

‎src/backend/parser/gram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
*
222222
*
223223
* IDENTIFICATION
224-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.30 1998/08/26 05:22:43 momjian Exp $
224+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.31 1998/08/26 16:43:43 momjian Exp $
225225
*
226226
* HISTORY
227227
* AUTHOR DATE MAJOR EVENT

‎src/include/catalog/pg_attribute.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_attribute.h,v 1.37 1998/08/26 05:51:24 momjian Exp $
10+
* $Id: pg_attribute.h,v 1.38 1998/08/26 16:43:48 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -339,7 +339,7 @@ DATA(insert OID = 0 ( 1249 attlen 21 0 2 5 0 -1 -1 t f s f f));
339339
DATA(insert OID = 0 ( 1249 attnum 21 0 2 6 0 -1 -1 t f s f f));
340340
DATA(insert OID = 0 ( 1249 attnelems 23 0 4 7 0 -1 -1 t f i f f));
341341
DATA(insert OID = 0 ( 1249 attcacheoff 23 0 4 8 0 -1 -1 t f i f f));
342-
DATA(insert OID = 0 ( 1249 atttypmod 21 0 4 9 0 -1 -1 t f s f f));
342+
DATA(insert OID = 0 ( 1249 atttypmod 23 0 4 9 0 -1 -1 t f i f f));
343343
DATA(insert OID = 0 ( 1249 attbyval 16 0 1 10 0 -1 -1 t f c f f));
344344
DATA(insert OID = 0 ( 1249 attisset 16 0 1 11 0 -1 -1 t f c f f));
345345
DATA(insert OID = 0 ( 1249 attalign 18 0 1 12 0 -1 -1 t f c f f));

‎src/include/catalog/pg_attribute_check.sql

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
-- This makes sure the pg_attribute columns match the type's columns
2+
-- bjm 1998/08/26
3+
4+
-- check lengths
5+
SELECT pg_attribute.oid, relname, attname
6+
FROM pg_class, pg_attribute, pg_type
7+
WHERE pg_class.oid = attrelid AND
8+
atttypid = pg_type.oid AND
9+
attlen != typlen;
10+
11+
-- check alignment
12+
SELECT pg_attribute.oid, relname, attname
13+
FROM pg_class, pg_attribute, pg_type
14+
WHERE pg_class.oid = attrelid AND
15+
atttypid = pg_type.oid AND
16+
attalign != typalign;
17+

‎src/interfaces/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.14 1998/08/26 05:22:58 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.15 1998/08/26 16:43:51 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -23,7 +23,7 @@ endif
2323

2424
.DEFAULT all install clean dep depend distclean: $(perl-makefile-dep)
2525
$(MAKE) -C libpq $@
26-
# $(MAKE) -C ecpg $@
26+
$(MAKE) -C ecpg $@
2727
ifeq ($(HAVE_Cplusplus), true)
2828
$(MAKE) -C libpq++ $@
2929
else

‎src/interfaces/ecpg/preproc/preproc.y

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ output_statement(char * stmt, int mode)
641641
%type <str> join_using where_clause relation_expr row_op sub_type
642642
%type <str> opt_column_list insert_rest InsertStmt OptimizableStmt
643643
%type <str> columnList DeleteStmt LockStmt UpdateStmt CursorStmt
644-
%type <str> NotifyStmt columnElem copy_dirn SubUnion c_expr
644+
%type <str> NotifyStmt columnElem copy_dirn SubUnion c_expr UnlistenStmt
645645
%type <str> copy_delimiter ListenStmt CopyStmt copy_file_name opt_binary
646646
%type <str> opt_with_copy FetchStmt opt_direction fetch_how_many opt_portal_name
647647
%type <str> ClosePortalStmt DestroyStmt VacuumStmt opt_verbose

0 commit comments

Comments
 (0)