Commita0cd991

committed

Add int2-to-int8 and int8-to-int2 conversion routines. Needed to avoid

breaking existing pg_dump scripts, which try to assign the result ofcount(*) to an int2 variable. catversion bumped.

1 parent92e8282 commita0cd991Copy full SHA for a0cd991

File tree

+36

-5

lines changed

+36

-5

lines changed

Lines changed: 24 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.34 2001/10/2505:49:44 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.35 2001/10/2514:10:06 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -697,6 +697,29 @@ int84(PG_FUNCTION_ARGS)`
`697`	`697`	`PG_RETURN_INT32(result);`
`698`	`698`	`}`
`699`	`699`
	`700`	`+Datum`
	`701`	`+int28(PG_FUNCTION_ARGS)`
	`702`	`+{`
	`703`	`+int16val=PG_GETARG_INT16(0);`
	`704`	`+`
	`705`	`+PG_RETURN_INT64((int64)val);`
	`706`	`+}`
	`707`	`+`
	`708`	`+Datum`
	`709`	`+int82(PG_FUNCTION_ARGS)`
	`710`	`+{`
	`711`	`+int64val=PG_GETARG_INT64(0);`
	`712`	`+int16result;`
	`713`	`+`
	`714`	`+result= (int16)val;`
	`715`	`+`
	`716`	`+/* Test for overflow by reverse-conversion. */`
	`717`	`+if ((int64)result!=val)`
	`718`	`+elog(ERROR,"int8 conversion to int2 is out of range");`
	`719`	`+`
	`720`	`+PG_RETURN_INT16(result);`
	`721`	`+}`
	`722`	`+`
`700`	`723`	`Datum`
`701`	`724`	`i8tod(PG_FUNCTION_ARGS)`
`702`	`725`	`{`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`38`	`38`	`* Portions Copyright (c) 1994, Regents of the University of California`
`39`	`39`	`*`
`40`		`- * $Id: catversion.h,v 1.100 2001/10/2505:49:56 momjian Exp $`
	`40`	`+ * $Id: catversion.h,v 1.101 2001/10/2514:10:06 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -53,5 +53,5 @@`
`53`	`53`	`*/`
`54`	`54`
`55`	`55`	`/yyyymmddN /`
`56`		`-#defineCATALOG_VERSION_NO200110181`
	`56`	`+#defineCATALOG_VERSION_NO200110251`
`57`	`57`	`#endif`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: pg_proc.h,v 1.218 2001/10/2505:49:57 momjian Exp $`
	`10`	`+ * $Id: pg_proc.h,v 1.219 2001/10/2514:10:06 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* The script catalog/genbki.sh reads this file and generates .bki`
`@@ -885,6 +885,11 @@ DESCR("convert int8 to float8");`
`885`	`885`	`DATA(insertOID=483 (int8PGUID12fttt1f20"701"10000100dtoi8- ));`
`886`	`886`	`DESCR("convert float8 to int8");`
`887`	`887`
	`888`	`+DATA(insertOID=714 (int2PGUID12fttt1f21"20"10000100int82- ));`
	`889`	`+DESCR("convert int8 to int2");`
	`890`	`+DATA(insertOID=754 (int8PGUID12fttt1f20"21"10000100int28- ));`
	`891`	`+DESCR("convert int2 to int8");`
	`892`	`+`
`888`	`893`	`/* OIDS 500 - 599 */`
`889`	`894`
`890`	`895`	`/* OIDS 600 - 699 */`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: int8.h,v 1.28 2001/10/2505:50:10 momjian Exp $`
	`10`	`+ * $Id: int8.h,v 1.29 2001/10/2514:10:07 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* These data types are supported on all 64-bit architectures, and may`
`@@ -98,6 +98,9 @@ extern Datum int48div(PG_FUNCTION_ARGS);`
`98`	`98`	`externDatumint48(PG_FUNCTION_ARGS);`
`99`	`99`	`externDatumint84(PG_FUNCTION_ARGS);`
`100`	`100`
	`101`	`+externDatumint28(PG_FUNCTION_ARGS);`
	`102`	`+externDatumint82(PG_FUNCTION_ARGS);`
	`103`	`+`
`101`	`104`	`externDatumi8tod(PG_FUNCTION_ARGS);`
`102`	`105`	`externDatumdtoi8(PG_FUNCTION_ARGS);`
`103`	`106`

Comments

(0)