NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitcb917e1

committed

Remove useless PGRES_COPY_BOTH "support" in psql.

There is no existing or foreseeable case in which psql should see aPGRES_COPY_BOTH PQresultStatus; and if such a case ever emerges, it's apretty good bet that these code fragments wouldn't do the right thinganyway. Remove them, and let the existing default cases do the appropriatething, namely emit an "unexpected PQresultStatus" bleat.Noted while working on libpq row processor patch, for which I wasconsidering adding a PGRES_SUSPENDED status code --- the same default-casetreatment would be appropriate for that.

1 parentc17e863 commitcb917e1Copy full SHA for cb917e1

File tree

1 file changed

-19

lines changed

src/bin/psql
- common.c

1 file changed

-19

lines changed

`‎src/bin/psql/common.c`

Lines changed: 5 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,6 @@ AcceptResult(const PGresult *result)`
`450`	`450`	`casePGRES_EMPTY_QUERY:`
`451`	`451`	`casePGRES_COPY_IN:`
`452`	`452`	`casePGRES_COPY_OUT:`
`453`		`-casePGRES_COPY_BOTH:`
`454`	`453`	`/* Fine, do nothing */`
`455`	`454`	`OK= true;`
`456`	`455`	`break;`
`@@ -673,29 +672,17 @@ ProcessResult(PGresult **results)`
`673`	`672`	`result_status=PQresultStatus(*results);`
`674`	`673`	`switch (result_status)`
`675`	`674`	`{`
`676`		`-casePGRES_COPY_BOTH:`
`677`		`-/*`
`678`		`- * No now-existing SQL command can yield PGRES_COPY_BOTH, but`
`679`		`- * defend against the future. PQexec() can't short-circuit`
`680`		`- * it's way out of a PGRES_COPY_BOTH, so the connection will`
`681`		`- * be useless at this point. XXX is there a method for`
`682`		`- * clearing this status that's likely to work with every`
`683`		`- * future command that can initiate it?`
`684`		`- */`
`685`		`-psql_error("unexpected PQresultStatus (%d)",result_status);`
`686`		`-return false;`
`687`		`-`
`688`		`-casePGRES_COPY_OUT:`
`689`		`-casePGRES_COPY_IN:`
`690`		`-is_copy= true;`
`691`		`-break;`
`692`		`-`
`693`	`675`	`casePGRES_EMPTY_QUERY:`
`694`	`676`	`casePGRES_COMMAND_OK:`
`695`	`677`	`casePGRES_TUPLES_OK:`
`696`	`678`	`is_copy= false;`
`697`	`679`	`break;`
`698`	`680`
	`681`	`+casePGRES_COPY_OUT:`
	`682`	`+casePGRES_COPY_IN:`
	`683`	`+is_copy= true;`
	`684`	`+break;`
	`685`	`+`
`699`	`686`	`default:`
`700`	`687`	`/* AcceptResult() should have caught anything else. */`
`701`	`688`	`is_copy= false;`
`@@ -817,7 +804,6 @@ PrintQueryResults(PGresult *results)`
`817`	`804`
`818`	`805`	`casePGRES_COPY_OUT:`
`819`	`806`	`casePGRES_COPY_IN:`
`820`		`-casePGRES_COPY_BOTH:`
`821`	`807`	`/* nothing to do here */`
`822`	`808`	`success= true;`
`823`	`809`	`break;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcb917e1

File tree

1 file changed

1 file changed

`‎src/bin/psql/common.c`

0 commit comments