From 52f9ad475d953e00dfebddf67efea4df07355ea6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 25 Nov 2014 08:53:16 +0200
Subject: Get rid of trailing newlines in error messages

---
 odb/oracle/error.cxx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/odb/oracle/error.cxx b/odb/oracle/error.cxx
index 68bdc44..006fef5 100644
--- a/odb/oracle/error.cxx
+++ b/odb/oracle/error.cxx
@@ -4,6 +4,7 @@
 
 #include <oci.h>
 
+#include <cstring> // std::strlen
 #include <cassert>
 
 #include <odb/details/buffer.hxx>
@@ -184,6 +185,12 @@ namespace odb
         if (r == OCI_NO_DATA)
           break;
 
+        // Get rid of a trailing newline if there is one.
+        //
+        size_t n (strlen (b));
+        if (n != 0 && b[n - 1] == '\n')
+          b[n - 1] = '\0';
+
         dbe.append (e, b);
       }
 
-- 
cgit v1.1