Because we ended up forcing an initdb for 7.0 final, we aren't going

to need this updatepgproc.sql script after all...

diff --git a/contrib/likeplanning/README b/contrib/likeplanning/README
index 0668a3060b16456fdf4a0ee2653550aabcbf684e..0896966376ec12d538214bb89bff76a2800de36d 100644 (file)
--- a/contrib/likeplanning/README
+++ b/contrib/likeplanning/README
@@ -1,4 +1,4 @@
-This directory contains three SQL scripts that control use of some new
+This directory contains two SQL scripts that control use of some new
 code for planning/optimizing queries containing LIKE and
 regular-expression operators.  This code was added to Postgres 7.0 late in
 beta test, and it hasn't gotten enough testing to warrant turning it on by
@@ -11,7 +11,7 @@ queries involving LIKE or regexps in WHERE clauses.
 HOW TO USE THE SCRIPTS
 ----------------------
 
-All three scripts must be run as the Postgres superuser.  The easiest
+Both scripts must be run as the Postgres superuser.  The easiest
 way to run an SQL script is
        psql -f scriptfile databasename
 or you can start psql interactively and enter
@@ -25,13 +25,6 @@ disablelike.sql reverts to the old planning code for LIKE, in the database
 in which it is run.  If you run it in template1, all subsequently-created
 databases will use the old code by default.
 
-If your database was initdb'd with release 7.0beta5, you need to run
-updatepgproc.sql before you can run enablelike.sql.  Databases initdb'd
-with 7.0RC1 or later already have pg_proc entries for the new code, so
-updatepgproc.sql is unnecessary for them.  If enablelike.sql produces
-errors like "No procedure with name regexeqsel", then you need to run
-updatepgproc.sql.
-
 
 WHAT IT DOES
 ------------

diff --git a/contrib/likeplanning/enablelike.sql b/contrib/likeplanning/enablelike.sql
index 499aa289d120198d75a0d71cdb6255a1f5619a58..efccacdf83cd7933e5fb54111078095c46bfd01b 100644 (file)
--- a/contrib/likeplanning/enablelike.sql
+++ b/contrib/likeplanning/enablelike.sql
@@ -2,10 +2,6 @@
 -- functions, which are a little too new to be enabled by default in 7.0.
 -- You can disable them again by running disablelike.sql.
 
--- If your database was initdb'd with 7.0beta5, you need to run
--- updatepgproc.sql first.  You can tell that is necessary if this
--- script produces errors like "No procedure with name regexeqsel".
-
 -- Use of the functions will be enabled only in those databases you
 -- run this script in.  If you run it in template1,
 -- all subsequently-created databases will use the functions.

diff --git a/contrib/likeplanning/updatepgproc.sql b/contrib/likeplanning/updatepgproc.sql
deleted file mode 100644 (file)
index 95ab94e..0000000
--- a/contrib/likeplanning/updatepgproc.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- This script loads pg_proc entries for the 7.0 selectivity estimation
--- functions into a 7.0beta5 database.  You should not run it if you
--- initdb'd with 7.0RC1 or later.  If you do need it, run it in each
--- database you have, including template1.  Once you have run it in
--- template1, all subsequently-created databases will contain the entries,
--- so you won't need to run it again.
--- Be sure to run the script as the Postgres superuser!
-
-COPY pg_proc WITH OIDS FROM stdin;
-1818   regexeqsel      0       11      f       t       f       5       f       701     26 26 21 0 23   100     0       0       100     regexeqsel      -
-1819   likesel 0       11      f       t       f       5       f       701     26 26 21 0 23   100     0       0       100     likesel -
-1820   icregexeqsel    0       11      f       t       f       5       f       701     26 26 21 0 23   100     0       0       100     icregexeqsel    -
-1821   regexnesel      0       11      f       t       f       5       f       701     26 26 21 0 23   100     0       0       100     regexnesel      -
-1822   nlikesel        0       11      f       t       f       5       f       701     26 26 21 0 23   100     0       0       100     nlikesel        -
-1823   icregexnesel    0       11      f       t       f       5       f       701     26 26 21 0 23   100     0       0       100     icregexnesel    -
-1824   regexeqjoinsel  0       11      f       t       f       5       f       701     26 26 21 26 21  100     0       0       100     regexeqjoinsel  -
-1825   likejoinsel     0       11      f       t       f       5       f       701     26 26 21 26 21  100     0       0       100     likejoinsel     -
-1826   icregexeqjoinsel        0       11      f       t       f       5       f       701     26 26 21 26 21  100     0       0       100     icregexeqjoinsel        -
-1827   regexnejoinsel  0       11      f       t       f       5       f       701     26 26 21 26 21  100     0       0       100     regexnejoinsel  -
-1828   nlikejoinsel    0       11      f       t       f       5       f       701     26 26 21 26 21  100     0       0       100     nlikejoinsel    -
-1829   icregexnejoinsel        0       11      f       t       f       5       f       701     26 26 21 26 21  100     0       0       100     icregexnejoinsel        -
-\.
-
-UPDATE pg_proc SET proowner = pg_shadow.usesysid
-WHERE oid >= 1818 AND oid <= 1829 AND pg_shadow.usename = CURRENT_USER;