|
12 | 12 | *by PostgreSQL
|
13 | 13 | *
|
14 | 14 | * IDENTIFICATION
|
15 |
| - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.534 2009/04/06 08:42:53 heikki Exp $ |
| 15 | + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.535 2009/04/08 19:02:37 heikki Exp $ |
16 | 16 | *
|
17 | 17 | *-------------------------------------------------------------------------
|
18 | 18 | */
|
@@ -1734,8 +1734,10 @@ dumpDatabase(Archive *AH)
|
1734 | 1734 | appendPQExpBuffer(creaQry,"\n-- For binary upgrade, set datfrozenxid.\n");
|
1735 | 1735 | appendPQExpBuffer(creaQry,"UPDATE pg_database\n"
|
1736 | 1736 | "SET datfrozenxid = '%u'\n"
|
1737 |
| -"WHEREdatname = '%s';\n", |
1738 |
| -frozenxid,datname); |
| 1737 | +"WHEREdatname = ", |
| 1738 | +frozenxid); |
| 1739 | +appendStringLiteralAH(creaQry,datname,AH); |
| 1740 | +appendPQExpBuffer(creaQry,";\n"); |
1739 | 1741 | }
|
1740 | 1742 |
|
1741 | 1743 | appendPQExpBuffer(delQry,"DROP DATABASE %s;\n",
|
@@ -9396,9 +9398,15 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
|
9396 | 9398 |
|
9397 | 9399 | appendPQExpBuffer(q,"CREATE SERVER %s",fmtId(srvinfo->dobj.name));
|
9398 | 9400 | if (srvinfo->srvtype&&strlen(srvinfo->srvtype)>0)
|
9399 |
| -appendPQExpBuffer(q," TYPE '%s'",srvinfo->srvtype); |
| 9401 | +{ |
| 9402 | +appendPQExpBuffer(q," TYPE "); |
| 9403 | +appendStringLiteralAH(q,srvinfo->srvtype,fout); |
| 9404 | +} |
9400 | 9405 | if (srvinfo->srvversion&&strlen(srvinfo->srvversion)>0)
|
9401 |
| -appendPQExpBuffer(q," VERSION '%s'",srvinfo->srvversion); |
| 9406 | +{ |
| 9407 | +appendPQExpBuffer(q," VERSION "); |
| 9408 | +appendStringLiteralAH(q,srvinfo->srvversion,fout); |
| 9409 | +} |
9402 | 9410 |
|
9403 | 9411 | appendPQExpBuffer(q," FOREIGN DATA WRAPPER ");
|
9404 | 9412 | appendPQExpBuffer(q,"%s",fmtId(fdwname));
|
@@ -9891,23 +9899,23 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
|
9891 | 9899 | "WHERErelnamespace = "
|
9892 | 9900 | "(SELECT oid FROM pg_namespace "
|
9893 | 9901 | "WHERE nspname = CURRENT_SCHEMA)\n"
|
9894 |
| -"AND relname = '%s'\n" |
9895 |
| -");\n", |
| 9902 | +"AND relname = ", |
9896 | 9903 | tbinfo->attlen[j],
|
9897 | 9904 | tbinfo->attalign[j],
|
9898 |
| -tbinfo->attnames[j], |
9899 |
| -tbinfo->dobj.name); |
| 9905 | +tbinfo->attnames[j]); |
| 9906 | +appendStringLiteralAH(q,tbinfo->dobj.name,fout); |
| 9907 | +appendPQExpBuffer(q,"\n);\n"); |
9900 | 9908 | }
|
9901 | 9909 | }
|
9902 | 9910 | appendPQExpBuffer(q,"\n-- For binary upgrade, set relfrozenxid.\n");
|
9903 | 9911 | appendPQExpBuffer(q,"UPDATE pg_class\n"
|
9904 | 9912 | "SET relfrozenxid = '%u'\n"
|
9905 |
| -"WHERErelname = '%s'\n" |
9906 |
| -"AND relnamespace = " |
| 9913 | +"WHERErelname = ", |
| 9914 | +tbinfo->frozenxid); |
| 9915 | +appendStringLiteralAH(q,tbinfo->dobj.name,fout); |
| 9916 | +appendPQExpBuffer(q,"\nAND relnamespace = " |
9907 | 9917 | "(SELECT oid FROM pg_namespace "
|
9908 |
| -"WHERE nspname = CURRENT_SCHEMA);\n", |
9909 |
| -tbinfo->frozenxid, |
9910 |
| -tbinfo->dobj.name); |
| 9918 | +"WHERE nspname = CURRENT_SCHEMA);\n"); |
9911 | 9919 | }
|
9912 | 9920 |
|
9913 | 9921 | /* Loop dumping statistics and storage statements */
|
|