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@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/dbaccess/source/filter/hsqldb/hsqlimport.cxx b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
index 260ec86..f2b1ff6 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)
