[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/filter/hsqldb/hsqlimport.cxx |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 80dd8d8c2f7f6a14f20795757a5b3556caae1608
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Dec 21 13:42:24 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 10 09:54:04 2019 +0100

    Resolves: tdf#121838 catch exception for missing column
    
    in database migration
    
    Change-Id: Ied42d1436f14012fb918e8e6775fcbe0f7d5fac5
    Reviewed-on: https://gerrit.libreoffice.org/65547
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/filter/hsqldb/hsqlimport.cxx b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
index 260ec8665d0a..f2b1ff67f182 100644
--- a/dbaccess/source/filter/hsqldb/hsqlimport.cxx
+++ b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
@@ -338,11 +338,21 @@ void HsqlImporter::importHsqlDatabase()
     // data
     for (const auto& tableIndex : parser.getTableIndexes())
     {
-        std::vector<ColumnDefinition> aColTypes = parser.getTableColumnTypes(tableIndex.first);
         try
         {
+            std::vector<ColumnDefinition> aColTypes = parser.getTableColumnTypes(tableIndex.first);
             parseTableRows(tableIndex.second, aColTypes, tableIndex.first);
         }
+        catch (const std::out_of_range& e)
+        {
+            std::unique_ptr<SQLException> ex(new SQLException);
+            const char* msg = e.what();
+            ex->SQLState = OUString(msg, strlen(msg), RTL_TEXTENCODING_ASCII_US);
+            // chain errors and keep going
+            if (pException)
+                ex->NextException <<= *pException;
+            pException = std::move(ex);
+        }
         catch (SQLException& ex)
         {
             if (pException)