diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 7da2f4f4561..1bec1059e82 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ @@ -1916,8 +1916,8 @@ lo_import 152801 A pattern that contains a dot (.) is interpreted as a schema name pattern followed by an object name pattern. For example, - \dt foo*.bar* displays all tables whose table name - starts with bar that are in schemas whose schema name + \dt foo*.*bar* displays all tables whose table name + includes bar that are in schemas whose schema name starts with foo. When no dot appears, then the pattern matches only objects that are visible in the current schema search path. Again, a dot within double quotes loses its special meaning and is matched @@ -1930,17 +1930,20 @@ lo_import 152801 expression special characters work as specified in , except for . which is taken as a separator as mentioned above, * which is - translated to the regular-expression notation .*, and - ? which is translated to .. You can emulate + translated to the regular-expression notation .*, + ? which is translated to ., and + $ which is matched literally. You can emulate these pattern characters at need by writing ? for ., (R+|) for R*, or (R|) for R?. - Remember that the pattern must match the whole name, unlike the usual - interpretation of regular expressions; write * at the beginning - and/or end if you don't wish the pattern to be anchored. + $ is not needed as a regular-expression character since + the pattern must match the whole name, unlike the usual + interpretation of regular expressions (in other words, $ + is automatically appended to your pattern). Write * at the + beginning and/or end if you don't wish the pattern to be anchored. Note that within double quotes, all regular expression special characters lose their special meanings and are matched literally. Also, the regular expression special characters are matched literally in operator name diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c index 0fc42ca7c26..02e3264658e 100644 --- a/src/bin/pg_dump/dumputils.c +++ b/src/bin/pg_dump/dumputils.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.36 2007/06/18 21:40:58 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.37 2007/07/10 00:21:31 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -872,6 +872,18 @@ processSQLNamePattern(PGconn *conn, PQExpBuffer buf, const char *pattern, appendPQExpBufferStr(&namebuf, "^("); cp++; } + else if (ch == '$') + { + /* + * Dollar is always quoted, whether inside quotes or not. + * The reason is that it's allowed in SQL identifiers, so + * there's a significant use-case for treating it literally, + * while because we anchor the pattern automatically there is + * no use-case for having it possess its regexp meaning. + */ + appendPQExpBufferStr(&namebuf, "\\$"); + cp++; + } else { /*