Skip to content

Commit 63a8508

Browse files
bmomjianbmomjian
committed
Reverse out last scan.l patch for minus handling.\
1 parent bc0595f commit 63a8508

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

‎doc/src/sgml/ref/pg_upgrade.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pg_upgrade.sgml,v 1.6 1999/07/31 22:05:48 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pg_upgrade.sgml,v 1.7 1999/09/28 03:41:35 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -40,7 +40,7 @@ pg_upgrade [ -f <replaceable class="parameter">filename</replaceable> ] <replace
4040
is a utility for upgrading from a previous
4141
PostgreSQL release without reloading all the data.
4242
Not all <productname>Postgres</productname> release transitions can be
43-
handled this way; check the release notes for details on your installation.
43+
handled this way. Check the release notes for details on your installation.
4444
</para>
4545

4646
<procedure>
@@ -55,7 +55,7 @@ pg_upgrade [ -f <replaceable class="parameter">filename</replaceable> ] <replace
5555

5656
<step performance="required">
5757
<para>
58-
Do
58+
Then do:
5959
<programlisting>
6060
% pg_dumpall -s >db.out
6161
</programlisting>

‎src/backend/parser/parse_func.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.56 1999/09/27 17:46:14 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.57 1999/09/28 03:41:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -275,7 +275,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
275275
if (rte == NULL)
276276
{
277277
rte = addRangeTableEntry(pstate, refname, refname,FALSE, FALSE);
278-
elog(NOTICE,"Auto-creating query reference to table %s", refname);
278+
elog(NOTICE,"Adding missing FROM-clause entry for table %s", refname);
279279
}
280280

281281
relname = rte->relname;
@@ -434,7 +434,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
434434
if (rte == NULL)
435435
{
436436
rte = addRangeTableEntry(pstate, refname, refname,FALSE, FALSE);
437-
elog(NOTICE,"Auto-creating query reference to table %s", refname);
437+
elog(NOTICE,"Adding missing FROM-clause entry for table %s", refname);
438438
}
439439

440440
relname = rte->relname;

‎src/backend/parser/parse_relation.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.28 1999/09/27 17:46:14 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.29 1999/09/28 03:41:36 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -241,7 +241,7 @@ expandAll(ParseState *pstate, char *relname, char *refname, int *this_resno)
241241
if (rte == NULL)
242242
{
243243
rte = addRangeTableEntry(pstate, relname, refname, FALSE, FALSE);
244-
elog(NOTICE,"Auto-creating query reference to table %s", refname);
244+
elog(NOTICE,"Adding missing FROM-clause entry for table %s", refname);
245245
}
246246

247247
rel = heap_open(rte->relid, AccessShareLock);

‎src/backend/parser/scan.l

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.56 1999/09/27 21:02:54 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.57 1999/09/28 03:41:36 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -151,7 +151,7 @@ typecast "::"
151151

152152
self [,()\[\].;$\:\+\-\*\/\%\^\<\>\=\|]
153153
op_and_self [\~\!\@\#\^\&\|\`\?\$\:\+\-\*\/\%\<\>\=]
154-
operator {op_and_self}|({op_and_self}+[\~\!\@\#\^\&\|\`\?\$\:\+\*\/\%\<\>\=])
154+
operator {op_and_self}+
155155

156156
/* we do not allow unary minus in numbers.
157157
* instead we pass it verbatim to parser. there it gets

‎src/tools/backend/flow.fig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#FIG 3.2
2-
Landscape
2+
Portrait
33
Center
44
Inches
55
Letter
6-
100.00
6+
88.90
77
Single
88
-2
99
1200 2

‎src/tools/backend/flow.gif

28.7 KB
Loading

‎src/tools/backend/flow.jpg

-61.4 KB
Binary file not shown.

‎src/tools/backend/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ <H2 ALIGN=CENTER>
1313
<CENTER>
1414
<BR>
1515
<BR>
16-
<IMG src="flow.jpg" usemap="#flowmap" alt="flowchart" border=0>
16+
<IMG src="flow.gif" usemap="#flowmap" alt="flowchart" border=0>
1717
</CENTER>
1818
<MAP name="flowmap">
1919
<AREA COORDS="70,0,230,40" HREF="backend_dirs.html#main">

0 commit comments

Comments
 (0)