Commit81a530a

committed

Fix ill-advised placement of PGRES_COPY_BOTH enum value.

It must be added at the end of the ExecStatusType enum to avoid ABIbreakage compared to previous libpq versions. Noted by Magnus.

1 parentb4d3792 commit81a530aCopy full SHA for 81a530a

File tree

+14

-14

lines changed

+14

-14

lines changed

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -2196,16 +2196,6 @@ ExecStatusType PQresultStatus(const PGresult *res);`
`2196`	`2196`	`</listitem>`
`2197`	`2197`	`</varlistentry>`
`2198`	`2198`
`2199`		`- <varlistentry id="libpq-pgres-copy-both">`
`2200`		`- <term><literal>PGRES_COPY_BOTH</literal></term>`
`2201`		`- <listitem>`
`2202`		`- <para>`
`2203`		`- Copy In/Out (to and from server) data transfer started. This is`
`2204`		`- currently used only for streaming replication.`
`2205`		`- </para>`
`2206`		`- </listitem>`
`2207`		`- </varlistentry>`
`2208`		`-`
`2209`	`2199`	`<varlistentry id="libpq-pgres-bad-response">`
`2210`	`2200`	`<term><literal>PGRES_BAD_RESPONSE</literal></term>`
`2211`	`2201`	`<listitem>`
`@@ -2232,6 +2222,16 @@ ExecStatusType PQresultStatus(const PGresult *res);`
`2232`	`2222`	`</para>`
`2233`	`2223`	`</listitem>`
`2234`	`2224`	`</varlistentry>`
	`2225`	`+`
	`2226`	`+ <varlistentry id="libpq-pgres-copy-both">`
	`2227`	`+ <term><literal>PGRES_COPY_BOTH</literal></term>`
	`2228`	`+ <listitem>`
	`2229`	`+ <para>`
	`2230`	`+ Copy In/Out (to and from server) data transfer started. This is`
	`2231`	`+ currently used only for streaming replication.`
	`2232`	`+ </para>`
	`2233`	`+ </listitem>`
	`2234`	`+ </varlistentry>`
`2235`	`2235`	`</variablelist>`
`2236`	`2236`
`2237`	`2237`	`If the result status is <literal>PGRES_TUPLES_OK</literal>, then`

Lines changed: 2 additions & 2 deletions

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,11 @@ typedef enum`
`85`	`85`	`* contains the result tuples */`
`86`	`86`	`PGRES_COPY_OUT,/* Copy Out data transfer in progress */`
`87`	`87`	`PGRES_COPY_IN,/* Copy In data transfer in progress */`
`88`		`-PGRES_COPY_BOTH,/* Copy In/Out data transfer in progress */`
`89`	`88`	`PGRES_BAD_RESPONSE,/* an unexpected response was recv'd from the`
`90`	`89`	`* backend */`
`91`	`90`	`PGRES_NONFATAL_ERROR,/* notice or warning message */`
`92`		`-PGRES_FATAL_ERROR/* query failed */`
	`91`	`+PGRES_FATAL_ERROR,/* query failed */`
	`92`	`+PGRES_COPY_BOTH/* Copy In/Out data transfer in progress */`
`93`	`93`	`}ExecStatusType;`
`94`	`94`
`95`	`95`	`typedefenum`

Comments

(0)