database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-24 00:23:06 +03:00
Code Activity

Rationalize handling of array type names in bootstrap data.

Browse Source 
Formerly, Catalog.pm turned a C array type declaration in the catalog
header files into a SQL type, e.g., 'foo[]'.  Along the way, genbki.pl
turned this into '_foo' for the purpose of type lookups, but wrote 'foo[]'
to postgres.bki.  During bootstrap, bootscanner.l had to have a special
case rule to tokenize this, and then MapArrayTypeName() would turn 'foo[]'
into '_foo' one more time.

This seems unnecessarily complicated, especially since nobody cares that
much about the readability of postgres.bki.  Instead, make Catalog.pm
convert the C declaration into '_foo' to start with, and preserve that
representation of the type name throughout bootstrap data processing.
Then rip out the special-case code in bootscanner.l and bootstrap.c.

This changes postgres.bki to the extent that array fields are now
declared like
  proconfig = _text ,
rather than
  proconfig = text[] ,

No documentation update, since the SGML docs didn't mention any of this
in the first place, and it's all pretty transparent to writers of
catalog header files anyway.

John Naylor

Discussion: https://postgr.es/m/CAJVSVGUNao=-Q2-vAN3PYcdF5tnL5JAHwGwzZGuYHtq+Mk_9ng@mail.gmail.com
This commit is contained in:
Tom Lane
2018-04-17 18:29:11 -04:00
parent e90d4ddc63
commit 9ffcccdb95
5 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/bootstrap/bootscanner.l
View File

@@ -65,10 +65,8 @@ static int yyline = 1; /* line number for error reporting */
%option prefix="boot_yy"
D [0-9]
id [-A-Za-z0-9_]+
sid \"([^\"])*\"
arrayid [A-Za-z0-9_]+\[{D}*\]
%%
@@ -111,10 +109,6 @@ insert { return INSERT_TUPLE; }
"NOT" { return XNOT; }
"NULL" { return XNULL; }
{arrayid} {
yylval.str = MapArrayTypeName(yytext);
return ID;
}
{id} {
yylval.str = scanstr(yytext);
return ID;