Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5b4c16e

Browse files
committed
Back out ALTER DOMAIN patch until missing file appears.
1 parent853153c commit5b4c16e

File tree

22 files changed

+262
-1526
lines changed

22 files changed

+262
-1526
lines changed

‎doc/src/sgml/ref/allfiles.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.50 2002/12/06 03:28:27 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.51 2002/12/06 03:42:52 momjian Exp $
33
PostgreSQL documentation
44
Complete list of usable sgml source files in this directory.
55
-->
@@ -38,7 +38,6 @@ Complete list of usable sgml source files in this directory.
3838
<!-- SQL commands -->
3939
<!entity abort system "abort.sgml">
4040
<!entity alterDatabase system "alter_database.sgml">
41-
<!entity alterDomain system "alter_domain.sgml">
4241
<!entity alterGroup system "alter_group.sgml">
4342
<!entity alterTable system "alter_table.sgml">
4443
<!entity alterTrigger system "alter_trigger.sgml">

‎doc/src/sgml/ref/alter_domain.sgml

Lines changed: 0 additions & 237 deletions
This file was deleted.

‎doc/src/sgml/reference.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- reference.sgml
2-
$Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.39 2002/12/06 03:28:27 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.40 2002/12/06 03:42:48 momjian Exp $
33

44
PostgreSQL Reference Manual
55
-->
@@ -47,7 +47,6 @@ PostgreSQL Reference Manual
4747

4848
&abort;
4949
&alterDatabase;
50-
&alterDomain;
5150
&alterGroup;
5251
&alterTable;
5352
&alterTrigger;

‎src/backend/catalog/dependency.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.15 2002/12/06 03:28:27 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.16 2002/12/06 03:42:54 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -36,7 +36,6 @@
3636
#include"commands/proclang.h"
3737
#include"commands/schemacmds.h"
3838
#include"commands/trigger.h"
39-
#include"commands/typecmds.h"
4039
#include"lib/stringinfo.h"
4140
#include"miscadmin.h"
4241
#include"optimizer/clauses.h"

‎src/backend/catalog/pg_constraint.c

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_constraint.c,v 1.9 2002/12/06 03:28:27 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_constraint.c,v 1.10 2002/12/06 03:42:57 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -199,7 +199,6 @@ CreateConstraintEntry(const char *constraintName,
199199

200200
domobject.classId=RelOid_pg_type;
201201
domobject.objectId=domainId;
202-
domobject.objectSubId=0;
203202

204203
recordDependencyOn(&conobject,&domobject,DEPENDENCY_AUTO);
205204
}
@@ -497,16 +496,15 @@ RemoveConstraintById(Oid conId)
497496
HeapTupletypTup;
498497
ScanKeyDatatypKey[1];
499498
SysScanDesctypScan;
500-
intnkeys=0;
501499

502500
typRel=heap_openr(TypeRelationName,RowExclusiveLock);
503501

504-
ScanKeyEntryInitialize(&typKey[nkeys++],0x0,
505-
ObjectIdAttributeNumber,F_OIDEQ,
502+
ScanKeyEntryInitialize(&typKey[0],0x0,
503+
Anum_pg_constraint_contypid,F_OIDEQ,
506504
ObjectIdGetDatum(con->contypid));
507505

508506
typScan=systable_beginscan(typRel,TypeOidIndex, true,
509-
SnapshotNow,nkeys,typKey);
507+
SnapshotNow,1,typKey);
510508

511509
typTup=systable_getnext(typScan);
512510

@@ -519,11 +517,6 @@ RemoveConstraintById(Oid conId)
519517
/* Keep lock on domain type until end of xact */
520518
heap_close(typRel,NoLock);
521519
}
522-
else
523-
{
524-
elog(ERROR,"RemoveConstraintById: Constraint %u is not a known type",
525-
conId);
526-
}
527520

528521
/* Fry the constraint itself */
529522
simple_heap_delete(conDesc,&tup->t_self);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp