From 5f9a27323207c4bfd7f0c1675a54be8aa1a2bcbb Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 27 May 2009 20:42:29 +0000 Subject: [PATCH] Ignore RECHECK in CREATE OPERATOR CLASS, just throwing a NOTICE, instead of throwing an error as 8.4 had been doing. The error interfered with porting old database definitions (particularly for pg_migrator) without really buying any safety. Per bug #4817 and subsequent discussion. --- src/backend/parser/gram.y | 9 +++++++-- src/bin/pg_dump/pg_dump.c | 12 ++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index b5ec7cbd07..9a4535501a 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -3639,9 +3639,14 @@ opt_opfamily: FAMILY any_name { $$ = $2; } opt_recheck: RECHECK { - ereport(ERROR, + /* + * RECHECK no longer does anything in opclass definitions, + * but we still accept it to ease porting of old database + * dumps. + */ + ereport(NOTICE, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("RECHECK is no longer supported"), + errmsg("RECHECK is no longer required"), errhint("Update your data type."), scanner_errposition(@1))); $$ = TRUE; diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 826215068c..a971b1c899 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -8159,8 +8159,10 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo) * pg_depend entries. * * XXX RECHECK is gone as of 8.4, but we'll still print it if dumping - * an older server's table in which it is used. Would it be better - * to silently ignore it? + * an older server's opclass in which it is used. This is to avoid + * hard-to-detect breakage if a newer pg_dump is used to dump from + * an older server and then reload into that old version. This can + * go away once 8.3 is so old as to not be of interest to anyone. */ appendPQExpBuffer(query, "SELECT amopstrategy, false AS amopreqcheck, " "amopopr::pg_catalog.regoperator " @@ -8370,8 +8372,10 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo) { /* * XXX RECHECK is gone as of 8.4, but we'll still print it if dumping - * an older server's table in which it is used. Would it be better - * to silently ignore it? + * an older server's opclass in which it is used. This is to avoid + * hard-to-detect breakage if a newer pg_dump is used to dump from + * an older server and then reload into that old version. This can + * go away once 8.3 is so old as to not be of interest to anyone. */ appendPQExpBuffer(query, "SELECT amopstrategy, false AS amopreqcheck, " "amopopr::pg_catalog.regoperator " -- 2.39.5