Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitedef20f

Browse files
committed
Fix pg_dump's handling of DROP DATABASE commands in --clean mode.
In commit4317e02, I accidentally brokethis behavior while rearranging code to ensure that --create wouldn'taffect whether a DATABASE entry gets put into archive-format output.Thus, 9.2 would issue a DROP DATABASE command in --clean mode, which iseither useless or dangerous depending on the usage scenario.It should not do that, and no longer does.A bright spot is that this refactoring makes it easy to allow thecombination of --clean and --create to work sensibly, ie, emit DROPDATABASE then CREATE DATABASE before reconnecting. Ordinarily we'dconsider that a feature addition and not back-patch it, but it seemssilly to not include the extra couple of lines required in the 9.2version of the code.Per report from Guillaume Lelarge, though this is slightly more extensivethan his proposed patch.
1 parentca0b960 commitedef20f

File tree

3 files changed

+37
-21
lines changed

3 files changed

+37
-21
lines changed

‎doc/src/sgml/ref/pg_dump.sgml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ PostgreSQL documentation
143143
<para>
144144
Output commands to clean (drop)
145145
database objects prior to outputting the commands for creating them.
146-
(Restore might generate some harmless errors.)
146+
(Restore might generate some harmless error messages, if any objects
147+
were not present in the destination database.)
147148
</para>
148149

149150
<para>
@@ -161,8 +162,10 @@ PostgreSQL documentation
161162
<para>
162163
Begin the output with a command to create the
163164
database itself and reconnect to the created database. (With a
164-
script of this form, it doesn't matter which database you connect
165-
to before running the script.)
165+
script of this form, it doesn't matter which database in the
166+
destination installation you connect to before running the script.)
167+
If <option>--clean</option> is also specified, the script drops and
168+
recreates the target database before reconnecting to it.
166169
</para>
167170

168171
<para>

‎doc/src/sgml/ref/pg_restore.sgml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@
109109
<listitem>
110110
<para>
111111
Clean (drop) database objects before recreating them.
112+
(This might generate some harmless error messages, if any objects
113+
were not present in the destination database.)
112114
</para>
113115
</listitem>
114116
</varlistentry>
@@ -118,11 +120,16 @@
118120
<term><option>--create</option></term>
119121
<listitem>
120122
<para>
121-
Create the database before restoring into it. (When this
122-
option is used, the database named with <option>-d</option> is
123-
used only to issue the initial <command>CREATE DATABASE</>
124-
command. All data is restored into the database name that
125-
appears in the archive.)
123+
Create the database before restoring into it.
124+
If <option>--clean</option> is also specified, drop and
125+
recreate the target database before connecting to it.
126+
</para>
127+
128+
<para>
129+
When this option is used, the database named with <option>-d</option>
130+
is used only to issue the initial <command>DROP DATABASE</> and
131+
<command>CREATE DATABASE</> commands. All data is restored into the
132+
database name that appears in the archive.
126133
</para>
127134
</listitem>
128135
</varlistentry>

‎src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -303,15 +303,6 @@ RestoreArchive(Archive *AHX)
303303
/*
304304
* Check for nonsensical option combinations.
305305
*
306-
* NB: createDB+dropSchema is useless because if you're creating the DB,
307-
* there's no need to drop individual items in it. Moreover, if we tried
308-
* to do that then we'd issue the drops in the database initially
309-
* connected to, not the one we will create, which is very bad...
310-
*/
311-
if (ropt->createDB&&ropt->dropSchema)
312-
exit_horribly(modulename,"-C and -c are incompatible options\n");
313-
314-
/*
315306
* -C is not compatible with -1, because we can't create a database inside
316307
* a transaction block.
317308
*/
@@ -456,7 +447,25 @@ RestoreArchive(Archive *AHX)
456447
{
457448
AH->currentTE=te;
458449

459-
/* We want anything that's selected and has a dropStmt */
450+
/*
451+
* In createDB mode, issue a DROP *only* for the database as a
452+
* whole. Issuing drops against anything else would be wrong,
453+
* because at this point we're connected to the wrong database.
454+
* Conversely, if we're not in createDB mode, we'd better not
455+
* issue a DROP against the database at all.
456+
*/
457+
if (ropt->createDB)
458+
{
459+
if (strcmp(te->desc,"DATABASE")!=0)
460+
continue;
461+
}
462+
else
463+
{
464+
if (strcmp(te->desc,"DATABASE")==0)
465+
continue;
466+
}
467+
468+
/* Otherwise, drop anything that's selected and has a dropStmt */
460469
if (((te->reqs& (REQ_SCHEMA |REQ_DATA))!=0)&&te->dropStmt)
461470
{
462471
ahlog(AH,1,"dropping %s %s\n",te->desc,te->tag);
@@ -938,9 +947,6 @@ PrintTOCSummary(Archive *AHX, RestoreOptions *ropt)
938947

939948
ahprintf(AH,";\n;\n; Selected TOC Entries:\n;\n");
940949

941-
/* We should print DATABASE entries whether or not -C was specified */
942-
ropt->createDB=1;
943-
944950
curSection=SECTION_PRE_DATA;
945951
for (te=AH->toc->next;te!=AH->toc;te=te->next)
946952
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp