NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita040281

committed

Move fixes for >8 indexed fields.

1 parentb99f300 commita040281Copy full SHA for a040281

File tree

5 files changed

+268

-268

lines changed

src
- backend
  - parser
    - analyze.c
  - utils/adt
    - int.c
- bin/psql
  - describe.c
- include
  - config.h.in
  - postgres.h

5 files changed

+268

-268

lines changed

`‎src/backend/parser/analyze.c`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`		`- *$Id: analyze.c,v 1.127 2000/01/0620:46:49 wieck Exp $`
	`8`	`+ *$Id: analyze.c,v 1.128 2000/01/10 05:20:21 momjian Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -674,7 +674,7 @@ transformCreateStmt(ParseState pstate, CreateStmt stmt)`
`674`	`674`
`675`	`675`	`fkconstraint= (FkConstraint*)constraint;`
`676`	`676`	`fkconstraint->fk_attrs=lappend(NIL,id);`
`677`		`-`
	`677`	`+`
`678`	`678`	`fkconstraints=lappend(fkconstraints,constraint);`
`679`	`679`	`continue;`
`680`	`680`	`}`
`@@ -960,7 +960,7 @@ transformCreateStmt(ParseState pstate, CreateStmt stmt)`
`960`	`960`	`*/`
`961`	`961`	`if (fkconstraint->fk_attrs!=NIL&&fkconstraint->pk_attrs==NIL)`
`962`	`962`	`transformFkeyGetPrimaryKey(fkconstraint);`
`963`		`-`
	`963`	`+`
`964`	`964`	`/*`
`965`	`965`	`* Build a CREATE CONSTRAINT TRIGGER statement for the CHECK`
`966`	`966`	`* action.`
`@@ -1016,7 +1016,7 @@ transformCreateStmt(ParseState pstate, CreateStmt stmt)`
`1016`	`1016`	`extras_after=lappend(extras_after, (Node*)fk_trigger);`
`1017`	`1017`
`1018`	`1018`	`/*`
`1019`		`- * Build a CREATE CONSTRAINT TRIGGER statement for the`
	`1019`	`+ * Build a CREATE CONSTRAINT TRIGGER statement for the`
`1020`	`1020`	`* ON DELETE action fired on the PK table !!!`
`1021`	`1021`	`*`
`1022`	`1022`	`*/`
`@@ -1084,7 +1084,7 @@ transformCreateStmt(ParseState pstate, CreateStmt stmt)`
`1084`	`1084`	`extras_after=lappend(extras_after, (Node*)fk_trigger);`
`1085`	`1085`
`1086`	`1086`	`/*`
`1087`		`- * Build a CREATE CONSTRAINT TRIGGER statement for the`
	`1087`	`+ * Build a CREATE CONSTRAINT TRIGGER statement for the`
`1088`	`1088`	`* ON UPDATE action fired on the PK table !!!`
`1089`	`1089`	`*`
`1090`	`1090`	`*/`
`@@ -1679,7 +1679,7 @@ transformFkeyGetPrimaryKey(FkConstraint *fkconstraint)`
`1679`	`1679`	`* using the attribute names of the PK relation descriptor`
`1680`	`1680`	`* ----------`
`1681`	`1681`	`*/`
`1682`		`-for (i=0;i<8&&indexStruct->indkey[i]!=0;i++)`
	`1682`	`+for (i=0;i<INDEX_MAX_KEYS&&indexStruct->indkey[i]!=0;i++)`
`1683`	`1683`	`{`
`1684`	`1684`	`pkattno=indexStruct->indkey[i];`
`1685`	`1685`	`pkattr= (Ident*)makeNode(Ident);`

`‎src/backend/utils/adt/int.c`

Lines changed: 17 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.27 1999/07/1720:17:56 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.28 2000/01/10 05:20:23 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -76,29 +76,26 @@ int2out(int16 sh)`
`76`	`76`	`*Fills any nonexistent digits with NULLs.`
`77`	`77`	`*/`
`78`	`78`	`int16*`
`79`		`-int28in(char*shs)`
	`79`	`+int28in(char*intString)`
`80`	`80`	`{`
`81`	`81`	`int16*result;`
`82`		`-intnums;`
	`82`	`+intslot;`
`83`	`83`
`84`		`-if (shs==NULL)`
	`84`	`+if (intString==NULL)`
`85`	`85`	`returnNULL;`
`86`	`86`
`87`		`-result= (int16*)palloc(sizeof(int16[8]));`
`88`		`-if ((nums=sscanf(shs,"%hd%hd%hd%hd%hd%hd%hd%hd",`
`89`		`-&result[0],`
`90`		`-&result[1],`
`91`		`-&result[2],`
`92`		`-&result[3],`
`93`		`-&result[4],`
`94`		`-&result[5],`
`95`		`-&result[6],`
`96`		`-&result[7]))!=8)`
	`87`	`+result= (int16*)palloc(sizeof(int16[INDEX_MAX_KEYS]));`
	`88`	`+`
	`89`	`+for (slot=0;*intString&&slot<INDEX_MAX_KEYS;slot++)`
`97`	`90`	`{`
`98`		`-do`
`99`		`-result[nums++]=0;`
`100`		`-while (nums<8);`
	`91`	`+if (sscanf(intString,"%hd",&result[slot])!=1)`
	`92`	`+break;`
	`93`	`+while (intString&&intString!=' ')`
	`94`	`+intString++;`
`101`	`95`	`}`
	`96`	`+while (slot<INDEX_MAX_KEYS)`
	`97`	`+result[slot++]=0;`
	`98`	`+`
`102`	`99`	`returnresult;`
`103`	`100`	`}`
`104`	`101`
`@@ -120,10 +117,10 @@ int28out(int16 *shs)`
`120`	`117`	`result[1]='\0';`
`121`	`118`	`returnresult;`
`122`	`119`	`}`
`123`		`-rp=result= (char)palloc(87);/* assumes sign, 5 digits,`
`124`		`- * ' ' */`
	`120`	`+rp=result= (char)palloc(INDEX_MAX_KEYS7);`
	`121`	`+/* assumes sign, 5 digits, ' ' */`
`125`	`122`	`sp=shs;`
`126`		`-for (num=8;num!=0;num--)`
	`123`	`+for (num=INDEX_MAX_KEYS;num!=0;num--)`
`127`	`124`	`{`
`128`	`125`	`itoa(*sp++,rp);`
`129`	`126`	`while (*++rp!='\0')`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita040281

File tree

5 files changed

5 files changed

`‎src/backend/parser/analyze.c`

`‎src/backend/utils/adt/int.c`

0 commit comments