mirror of
https://github.com/postgres/postgres.git
synced 2025-06-08 22:02:03 +03:00
Fix brain fade in previous pg_dump patch.
In pre-7.3 databases, pg_attribute.attislocal doesn't exist. The easiest way to make sure the new inheritance logic behaves sanely is to assume it's TRUE, not FALSE. This will result in printing child columns even when they're not really needed. We could work harder at trying to reconstruct a value for attislocal, but there is little evidence that anyone still cares about dumping from such old versions, so just do the minimum necessary to have a valid dump. I had this correct in the original draft of the patch, but for some unaccountable reason decided it wasn't necessary to change the value. Testing against an old server shows otherwise...
This commit is contained in:
parent
182228bd74
commit
e565eff45a
@ -5674,13 +5674,13 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
|
||||
* explicitly set or was just a default.
|
||||
*
|
||||
* attislocal doesn't exist before 7.3, either; in older databases
|
||||
* we just assume that inherited columns had no local definition.
|
||||
* we assume it's TRUE, else we'd fail to dump non-inherited atts.
|
||||
*/
|
||||
appendPQExpBuffer(q, "SELECT a.attnum, a.attname, a.atttypmod, "
|
||||
"-1 AS attstattarget, a.attstorage, "
|
||||
"t.typstorage, a.attnotnull, a.atthasdef, "
|
||||
"false AS attisdropped, a.attlen, "
|
||||
"a.attalign, false AS attislocal, "
|
||||
"a.attalign, true AS attislocal, "
|
||||
"format_type(t.oid,a.atttypmod) AS atttypname, "
|
||||
"'' AS attoptions, 0 AS attcollation "
|
||||
"FROM pg_attribute a LEFT JOIN pg_type t "
|
||||
@ -5698,7 +5698,7 @@ getTableAttrs(TableInfo *tblinfo, int numTables)
|
||||
"attstorage, attstorage AS typstorage, "
|
||||
"attnotnull, atthasdef, false AS attisdropped, "
|
||||
"attlen, attalign, "
|
||||
"false AS attislocal, "
|
||||
"true AS attislocal, "
|
||||
"(SELECT typname FROM pg_type WHERE oid = atttypid) AS atttypname, "
|
||||
"'' AS attoptions, 0 AS attcollation "
|
||||
"FROM pg_attribute a "
|
||||
|
Loading…
x
Reference in New Issue
Block a user