Merge pull request #1885 from go-pg/fix/aborted-tx

Mark more errors as fatal

Author: vmihailenco

error.go

@@ -43,7 +43,16 @@ func isBadConn(err error, allowTimeout bool) bool {
 		return false
 	}
 	if pgErr, ok := err.(Error); ok {
-		return pgErr.Field('S') == "FATAL"
+		switch pgErr.Field('V') {
+		case "FATAL", "PANIC":
+			return true
+		}
+		switch pgErr.Field('C') {
+		case "25P02", // current transaction is aborted
+			"57014": // canceling statement due to user request
+			return true
+		}
+		return false
 	}
 	if allowTimeout {
 		if netErr, ok := err.(net.Error); ok && netErr.Timeout() {

tx_test.go

@@ -135,7 +135,7 @@ var _ = Describe("Tx", func() {
 		Expect(count).To(Equal(1))
 
 		err = tx1.Commit()
-		Expect(err).NotTo(HaveOccurred()) // actually ROLLBACK happens here
+		Expect(err).To(HaveOccurred()) // actually ROLLBACK happens here
 
 		_, err = tx2.QueryOne(pg.Scan(&count), "SELECT COUNT(*) FROM test_copy_from")
 		Expect(err).NotTo(HaveOccurred())