git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml

index ade4caf4c1a9f82b68daf061955568ca6ae587c3..4a22adbe838fd9860fa9e1dbdc55ac619e52ec44 100644 (file)

--- a/doc/src/sgml/ecpg.sgml

+++ b/doc/src/sgml/ecpg.sgml

-<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.89 2009年05月18日 11:08:24 petere Exp $ -->

+<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.90 2009年07月11日 21:15:32 petere Exp $ -->

<chapter id="ecpg">

<title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>

<term><function>dtcvasc</></term>

<listitem>

<para>

- Parses a timestamp from its textual representation in ANSI standard

+ Parses a timestamp from its textual representation

into a timestamp variable.

<synopsis>

int dtcvasc(char *str, timestamp *ts);

<term><function>dtcvfmtasc</></term>

<listitem>

<para>

- Parses a timestamp from its textual representation in ANSI standard

+ Parses a timestamp from its textual representation

using a format mask into a timestamp variable.

<synopsis>

dtcvfmtasc(char *inbuf, char *fmtstr, timestamp *dtvalue)

The function receives a pointer to the timestamp variable to convert

(<literal>ts</>) and the string that should hold the result of the

operation <literal>output</>). It converts <literal>ts</> to its

- textual representation in the ANSI SQL standard which is defined to

+ textual representation according to the SQL standard, which is

be <literal>YYYY-MM-DD HH:MM:SS</literal>.

</para>

<para>

The function receives a pointer to the interval variable to convert

(<literal>i</>) and the string that should hold the result of the

operation <literal>str</>). It converts <literal>i</> to its

- textual representation in the ANSI SQL standard which is defined to

+ textual representation according to the SQL standard, which is

be <literal>YYYY-MM-DD HH:MM:SS</literal>.

</para>

<para>

diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c

index c25385dee77997a22b087b78d96bda382ad0468c..b29f9cfc15e04e2f67b24ea4abb8d4605ff157b4 100644 (file)

--- a/src/backend/utils/adt/varchar.c

+++ b/src/backend/utils/adt/varchar.c

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/backend/utils/adt/varchar.c,v 1.131 2009年06月11日 14:49:04 momjian Exp $

+ * $PostgreSQL: pgsql/src/backend/utils/adt/varchar.c,v 1.132 2009年07月11日 21:15:32 petere Exp $

*

*-------------------------------------------------------------------------

*/

/*

- * CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR()

+ * CHAR() and VARCHAR() types are part of the SQL standard. CHAR()

* is for blank-padded string whose length is specified in CREATE TABLE.

* VARCHAR is for storing string whose length is at most the length specified

* at CREATE TABLE time.

diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h

index d687d74b7bfacbe75341726bc799f4f7784fd049..5b0d6fba6529a4387358cb2b0a28f104427aafa4 100644 (file)

--- a/src/include/catalog/pg_type.h

+++ b/src/include/catalog/pg_type.h

* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group

* Portions Copyright (c) 1994, Regents of the University of California

*

- * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.206 2009年06月18日 10:22:09 petere Exp $

+ * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.207 2009年07月11日 21:15:32 petere Exp $

*

* NOTES

* the genbki.sh script reads this file and generates .bki

#define VARCHAROID 1043

DATA(insert OID = 1082 ( date PGNSP PGUID 4 t b D f t 054円 0 0 1182 date_in date_out date_recv date_send - - - i p f 0 -1 0 _null_ _null_ ));

-DESCR("ANSI SQL date");

+DESCR("date");

#define DATEOID 1082

DATA(insert OID = 1083 ( time PGNSP PGUID 8 FLOAT8PASSBYVAL b D f t 054円 0 0 1183 time_in time_out time_recv time_send timetypmodin timetypmodout - d p f 0 -1 0 _null_ _null_ ));

-DESCR("hh:mm:ss, ANSI SQL time");

+DESCR("time of day");

#define TIMEOID 1083

/* OIDS 1100 - 1199 */

/* OIDS 1200 - 1299 */

DATA(insert OID = 1231 ( _numeric PGNSP PGUID -1 f b A f t 054円 0 1700 0 array_in array_out array_recv array_send numerictypmodin numerictypmodout - i x f 0 -1 0 _null_ _null_ ));

DATA(insert OID = 1266 ( timetz PGNSP PGUID 12 f b D f t 054円 0 0 1270 timetz_in timetz_out timetz_recv timetz_send timetztypmodin timetztypmodout - d p f 0 -1 0 _null_ _null_ ));

-DESCR("hh:mm:ss, ANSI SQL time");

+DESCR("time of day with time zone");

#define TIMETZOID 1266

DATA(insert OID = 1270 ( _timetz PGNSP PGUID -1 f b A f t 054円 0 1266 0 array_in array_out array_recv array_send timetztypmodin timetztypmodout - d x f 0 -1 0 _null_ _null_ ));

diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y

index 90369ead08f856cd216bcd38c49bae384133da7b..03f55acadd5e27755cc12254f6c55cd8f3d032be 100644 (file)

--- a/src/pl/plpgsql/src/gram.y

+++ b/src/pl/plpgsql/src/gram.y

*

*

* IDENTIFICATION

- * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.125 2009年06月18日 10:22:09 petere Exp $

+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.126 2009年07月11日 21:15:32 petere Exp $

*

*-------------------------------------------------------------------------

*/

;

decl_is_for : K_IS | /* Oracle */

- K_FOR; /* ANSI */

+ K_FOR; /* SQL standard */

decl_aliasitem : any_identifier

{

diff --git a/src/test/regress/expected/select_distinct.out b/src/test/regress/expected/select_distinct.out

index 3b5200b17a94fec03157b8a71e178513bdef663a..38107a041332e5583235658ce941c7545b376627 100644 (file)

--- a/src/test/regress/expected/select_distinct.out

+++ b/src/test/regress/expected/select_distinct.out

f

(1 row)

--- ANSI SQL 2003 form

+-- negated form

SELECT 1 IS NOT DISTINCT FROM 2 as "no";

no

----

diff --git a/src/test/regress/sql/select_distinct.sql b/src/test/regress/sql/select_distinct.sql

index d97c397d06b0a41cc22f45925fb98b47d133e898..328ba51c7a8ce1228b76cfa52d6a5fa1ababb1f3 100644 (file)

--- a/src/test/regress/sql/select_distinct.sql

+++ b/src/test/regress/sql/select_distinct.sql

SELECT 2 IS DISTINCT FROM null as "yes";

SELECT null IS DISTINCT FROM null as "no";

--- ANSI SQL 2003 form

+-- negated form

SELECT 1 IS NOT DISTINCT FROM 2 as "no";

SELECT 2 IS NOT DISTINCT FROM 2 as "yes";

SELECT 2 IS NOT DISTINCT FROM null as "no";