Resolve conflicts in src/bin/pg_dump/pg_dump.c#2596
Open
RekGRpth wants to merge 2 commits into
Open
Conversation
) Commit 110d817 in src/bin/pg_dump/pg_dump.c in the dumpFunc function replaced the call to the string function appendPQExpBuffer without formatting with the more efficient appendPQExpBufferStr, although earlier commits had already changed the code. ) Commit 1ed6b89 in src/bin/pg_dump/pg_dump.c in the dumpOpr function added a conditional warning, although earlier commit a0fda03 had already removed the first fout argument when calling the convertRegProcReference function below. ) Commit 110d817 in src/bin/pg_dump/pg_dump.c in the dumpAgg function replaced the call to the string function appendPQExpBuffer without formatting with the more efficient appendPQExpBufferStr, while earlier commits had already done the same.
silent-observer
approved these changes
May 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commit a0fda03 in src/bin/pg_dump/pg_dump.c removed the first
argument fout from the findNamespace function definition, while an
earlier commit by bdfea29 had already added a const specifier to the
second argument of the dumpTableData and refreshMatViewData functions
below.
Commit a0fda03 in src/bin/pg_dump/pg_dump.c removed the first
argument fout from the convertRegProcReference function definition,
while an earlier commit by bdfea29 had already added a const specifier
to the second argument of the format_function_signature function above.
Commit a45bc8a in src/bin/pg_dump/pg_dump.c replaced the arguments
in the main function call to ConnectDatabase, while earlier commit
19cd1cf had already added a new bool binary_upgrade argument.
Commit 4648243 in src/bin/pg_dump/pg_dump.c added substream to the
getSubscriptions function, while earlier commit 1b64fae had already
changed rolname to subowner in the same place.
Commit a0fda03 in src/bin/pg_dump/pg_dump.c removed the first fout
argument when calling findNamespace in the getTypes, getAggregates,
getFuncs, and getTables functions. Earlier commit 9e5f1f2 had already
refactored the code below.
Commit 403a3d9 in src/bin/pg_dump/pg_dump.c added a lock on all
relations in the getTables function, although earlier commits 8317413
and 0f66928 had already refactored this.
Commit 257836a in src/bin/pg_dump/pg_dump.c added handling for
inddependcollnames and inddependcollversions in the getIndexes
function, although earlier commit 30ab901 had already refactored the
code.
Commit 5423853 in src/bin/pg_dump/pg_dump.c added the additional
!dopt->dataOnly condition twice to the getTableAttrs function, while
earlier commit 30ab901 had already done this differently.
Commit a0fda03 in src/bin/pg_dump/pg_dump.c removed the first fout
argument when calling the findNamespace function in the getOperators,
getCollations, getConversions, getOpclasses, getOpfamilies,
getExtendedStatistics, getTSDictionaries, and getTSConfigurations
functions. Earlier commit 1b64fae had already changed rolname to
cfgowner in the same place.
Commit 110d817 in src/bin/pg_dump/pg_dump.c replaced the call to
the string function appendPQExpBuffer without formatting with the more
efficient appendPQExpBufferStr in the dumpFunc function, although
earlier commits had already changed the code.
Commit 1ed6b89 in src/bin/pg_dump/pg_dump.c added a conditional
warning in the dumpOpr function, although earlier commit a0fda03 had
already removed the first fout argument when calling the
convertRegProcReference function.
Commit 110d817 in src/bin/pg_dump/pg_dump.c replaced the call to
the string function appendPQExpBuffer without formatting with the more
efficient appendPQExpBufferStr in the dumpAgg function, although
earlier commits had already done the same.