From ab61df9e527dcedbd3bbefbcb8b634b0b72f2ad5 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 21 Oct 2009 20:38:58 +0000
Subject: Remove regex_flavor GUC, so that regular expressions are always
 "advanced" style by default.  Per discussion, there seems to be hardly
 anything that really relies on being able to change the regex flavor, so the
 ability to select it via embedded options ought to be enough for any
 stragglers. Also, if we didn't remove the GUC, we'd really be morally
 obligated to mark the regex functions non-immutable, which'd possibly create
 performance issues.

---
 src/backend/utils/misc/guc.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'src/backend/utils/misc/guc.c')

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 4cc88225583..33f38a20c48 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.522 2009/10/21 20:22:38 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.523 2009/10/21 20:38:58 tgl Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -54,7 +54,6 @@
 #include "postmaster/postmaster.h"
 #include "postmaster/syslogger.h"
 #include "postmaster/walwriter.h"
-#include "regex/regex.h"
 #include "storage/bufmgr.h"
 #include "storage/fd.h"
 #include "tcop/tcopprot.h"
@@ -248,13 +247,6 @@ static const struct config_enum_entry log_statement_options[] = {
 	{NULL, 0, false}
 };
 
-static const struct config_enum_entry regex_flavor_options[] = {
-	{"advanced", REG_ADVANCED, false},
-	{"extended", REG_EXTENDED, false},
-	{"basic", REG_BASIC, false},
-	{NULL, 0, false}
-};
-
 static const struct config_enum_entry isolation_level_options[] = {
 	{"serializable", XACT_SERIALIZABLE, false},
 	{"repeatable read", XACT_REPEATABLE_READ, false},
@@ -2658,15 +2650,6 @@ static struct config_enum ConfigureNamesEnum[] =
 	},
 #endif
 
-	{
-		{"regex_flavor", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
-			gettext_noop("Sets the regular expression \"flavor\"."),
-			NULL
-		},
-		&regex_flavor,
-		REG_ADVANCED, regex_flavor_options, NULL, NULL
-	},
-
 	{
 		{"session_replication_role", PGC_SUSET, CLIENT_CONN_STATEMENT,
 			gettext_noop("Sets the session's behavior for triggers and rewrite rules."),
-- 
cgit v1.2.3