diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index ade4caf4c1..4a22adbe83 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -1,4 +1,4 @@ - + <application>ECPG</application> - Embedded <acronym>SQL</acronym> in C @@ -3062,7 +3062,7 @@ void dtcurrent(timestamp *ts); dtcvasc - Parses a timestamp from its textual representation in ANSI standard + Parses a timestamp from its textual representation into a timestamp variable. int dtcvasc(char *str, timestamp *ts); @@ -3087,7 +3087,7 @@ int dtcvasc(char *str, timestamp *ts); dtcvfmtasc - 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. dtcvfmtasc(char *inbuf, char *fmtstr, timestamp *dtvalue) @@ -3140,7 +3140,7 @@ int dttoasc(timestamp *ts, char *output); The function receives a pointer to the timestamp variable to convert (ts) and the string that should hold the result of the operation output). It converts ts to its - textual representation in the ANSI SQL standard which is defined to + textual representation according to the SQL standard, which is be YYYY-MM-DD HH:MM:SS. @@ -3187,7 +3187,7 @@ int intoasc(interval *i, char *str); The function receives a pointer to the interval variable to convert (i) and the string that should hold the result of the operation str). It converts i to its - textual representation in the ANSI SQL standard which is defined to + textual representation according to the SQL standard, which is be YYYY-MM-DD HH:MM:SS. diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index c25385dee7..b29f9cfc15 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -8,7 +8,7 @@ * * * 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 $ * *------------------------------------------------------------------------- */ @@ -78,7 +78,7 @@ anychar_typmodout(int32 typmod) /* - * 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 d687d74b7b..5b0d6fba65 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * 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 @@ -473,10 +473,10 @@ DESCR("varchar(length), non-blank-padded string, variable storage length"); #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 */ @@ -498,7 +498,7 @@ DATA(insert OID = 1187 ( _interval PGNSP PGUID -1 f b A f t \054 0 1186 0 array /* 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 90369ead08..03f55acadd 100644 --- a/src/pl/plpgsql/src/gram.y +++ b/src/pl/plpgsql/src/gram.y @@ -9,7 +9,7 @@ * * * 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 $ * *------------------------------------------------------------------------- */ @@ -510,7 +510,7 @@ decl_cursor_arg : decl_varname decl_datatype ; 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 3b5200b17a..38107a0413 100644 --- a/src/test/regress/expected/select_distinct.out +++ b/src/test/regress/expected/select_distinct.out @@ -195,7 +195,7 @@ SELECT null IS DISTINCT FROM null as "no"; 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 d97c397d06..328ba51c7a 100644 --- a/src/test/regress/sql/select_distinct.sql +++ b/src/test/regress/sql/select_distinct.sql @@ -57,7 +57,7 @@ SELECT 2 IS DISTINCT FROM 2 as "no"; 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";