summaryrefslogtreecommitdiff
path: root/src/backend/parser
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/parser')
-rw-r--r--src/backend/parser/gram.y22
-rw-r--r--src/backend/parser/parse_coerce.c3
2 files changed, 17 insertions, 8 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 4e421a5806a..ba2b8d3b898 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.180 2000/07/28 14:47:23 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.181 2000/07/30 22:13:50 tgl Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -2360,14 +2360,18 @@ index_elem: attr_name opt_class
opt_class: class
{
/*
- * Release 7.0 removed network_ops, timespan_ops, and datetime_ops,
- * so we suppress it from being passed to the backend so the default
- * *_ops is used. This can be removed in some later release.
- * bjm 2000/02/07
+ * Release 7.0 removed network_ops, timespan_ops, and
+ * datetime_ops, so we suppress it from being passed to
+ * the parser so the default *_ops is used. This can be
+ * removed in some later release. bjm 2000/02/07
+ *
+ * Release 7.1 removes lztext_ops, so suppress that too
+ * for a while. tgl 2000/07/30
*/
if (strcmp($1, "network_ops") != 0 &&
strcmp($1, "timespan_ops") != 0 &&
- strcmp($1, "datetime_ops") != 0)
+ strcmp($1, "datetime_ops") != 0 &&
+ strcmp($1, "lztext_ops") != 0)
$$ = $1;
else
$$ = NULL;
@@ -5884,6 +5888,10 @@ xlateSqlFunc(char *name)
*
* Convert "datetime" and "timespan" to allow a transition to SQL92 type names.
* Remove this translation for v7.1 - thomas 2000-03-25
+ *
+ * Convert "lztext" to "text" to allow forward compatibility for anyone using
+ * the undocumented "lztext" type in 7.0. This can go away in 7.2 or later
+ * - tgl 2000-07-30
*/
static char *
xlateSqlType(char *name)
@@ -5905,6 +5913,8 @@ xlateSqlType(char *name)
return "timestamp";
else if (strcmp(name, "timespan") == 0)
return "interval";
+ else if (strcmp(name, "lztext") == 0)
+ return "text";
else if (strcmp(name, "boolean") == 0)
return "bool";
else
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 104a0cb926c..bd098fb6c68 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.45 2000/07/05 23:11:32 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.46 2000/07/30 22:13:50 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -333,7 +333,6 @@ TypeCategory(Oid inType)
case (BPCHAROID):
case (VARCHAROID):
case (TEXTOID):
- case (LZTEXTOID):
result = STRING_TYPE;
break;