07fa663 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

Quick fix for #119, copy_ goes into infinite loop

This needs a little more review, and a regression test.

commit07fa6635646241b8c725d35fde2776825fff4fc7 authorLeon P Smith <leon@melding-monads.com> dateTue 2 Sep 2014, 21:04 (12 years ago) parente5975eb

1 file changed+11−2

unifiedsplit

src/Database/PostgreSQL/Simple/Internal.hs+11−2

@@ -310,8 +310,17 @@ exec conn sql =

310310 case mres' of

311311 Nothing -> case mres of

312312 Nothing -> throwLibPQError h "PQgetResult returned no results"

313− Just res -> return res

314− Just _ -> getResult h mres'

313+ Just res -> do

314+ status <- PQ.resultStatus res

315+ case status of

316+ PQ.EmptyQuery -> getResult h mres'

317+ PQ.CommandOk -> getResult h mres'

318+ PQ.TuplesOk -> getResult h mres'

319+ PQ.CopyOut -> return res

320+ PQ.CopyIn -> return res

321+ PQ.BadResponse -> getResult h mres'

322+ PQ.NonfatalError -> getResult h mres'

323+ PQ.FatalError -> getResult h mres'

315324#endif

316325

317326-- | A version of 'execute' that does not perform query substitution.