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

Commitaf691cd

Browse files
committed
Merge branch 'PGPRO_covering_index' into PGPRO9_5
2 parents35fbc00 +4c6ba12 commitaf691cd

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

‎src/include/catalog/pg_constraint.h

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@ CATALOG(pg_constraint,2606)
100100
*/
101101
int16conkey[1];
102102

103-
/*
104-
* Columns of conrelid that the constraint does not apply to,
105-
* but included into the same index with key columns.
106-
*/
107-
int16conincluding[1];
108-
109103
/*
110104
* If a foreign key, the referenced columns of confrelid
111105
*/
@@ -144,6 +138,12 @@ CATALOG(pg_constraint,2606)
144138
* If a check constraint, source-text representation of expression
145139
*/
146140
textconsrc;
141+
142+
/*
143+
* Columns of conrelid that the constraint does not apply to,
144+
* but included into the same index with key columns.
145+
*/
146+
int16conincluding[1];
147147
#endif
148148
}FormData_pg_constraint;
149149

@@ -176,14 +176,15 @@ typedef FormData_pg_constraint *Form_pg_constraint;
176176
#defineAnum_pg_constraint_coninhcount15
177177
#defineAnum_pg_constraint_connoinherit16
178178
#defineAnum_pg_constraint_conkey17
179-
#defineAnum_pg_constraint_conincluding18
180-
#defineAnum_pg_constraint_confkey19
181-
#defineAnum_pg_constraint_conpfeqop20
182-
#defineAnum_pg_constraint_conppeqop21
183-
#defineAnum_pg_constraint_conffeqop22
184-
#defineAnum_pg_constraint_conexclop23
185-
#defineAnum_pg_constraint_conbin24
186-
#defineAnum_pg_constraint_consrc25
179+
#defineAnum_pg_constraint_confkey18
180+
#defineAnum_pg_constraint_conpfeqop19
181+
#defineAnum_pg_constraint_conppeqop20
182+
#defineAnum_pg_constraint_conffeqop21
183+
#defineAnum_pg_constraint_conexclop22
184+
#defineAnum_pg_constraint_conbin23
185+
#defineAnum_pg_constraint_consrc24
186+
#defineAnum_pg_constraint_conincluding25
187+
187188

188189

189190
/* Valid values for contype */

‎src/pgpro-upgrade/covering_index.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
insert into pg_attributeselect attrelid,'conincluding', atttypid, attstattarget, attlen,25, attndims, attcacheoff, atttypmod, attbyval, attstorage, attalign, attnotnull, atthasdef, attisdropped, attislocal, attinhcount, attcollation, attacl, attoptions, attfdwoptionsfrom pg_attributewhere attrelid='pg_constraint'::regclass::oidand attname='conkey';

‎src/pgpro-upgrade/covering_index.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
select count(*)>0 from pg_attribute where attname='conincluding';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
update pg_classset relnatts=25where relname='pg_constraint';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
select relnatts=25 from pg_class where relname='pg_constraint';

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp