connectivity/source/commontools/TTableHelper.cxx | 11 +++++++++--
sal/inc/sal/log-areas.dox | 1 +
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 8a6df1a62ded3b6da47022a5b7eec2ba6e81112c
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Fri Jun 21 15:24:15 2013 +0200
fdo#49708 when there is no Primary Key, there is no Primay Key
As opposed to a primary key with empty name and no columns (!)
Change-Id: I78ca185947a0e8d37bac64bd50add155afaeed47
Reviewed-on: https://gerrit.libreoffice.org/4432
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/connectivity/source/commontools/TTableHelper.cxx
b/connectivity/source/commontools/TTableHelper.cxx
index 6a5ad87..863938e 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -339,12 +339,19 @@ void OTableHelper::refreshPrimaryKeys(TStringVector&
_rNames)
if ( !bAlreadyFetched )
{
aPkName = xRow->getString(6);
+ SAL_WARN_IF(xRow->wasNull(),"connectivity.commontools", "NULL
Primary Key name");
+ SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools",
"empty Primary Key name");
bAlreadyFetched = true;
}
}
- m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
- _rNames.push_back(aPkName);
+ if(bAlreadyFetched)
+ {
+ SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools", "empty
Primary Key name");
+ SAL_WARN_IF(pKeyProps->m_aKeyColumnNames.size() ==
0,"connectivity.commontools", "Primary Key has no columns");
+ m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
+ _rNames.push_back(aPkName);
+ }
} // if ( xResult.is() && xResult->next() )
::comphelper::disposeComponent(xResult);
}
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index d943703..12cc4c7 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -36,6 +36,7 @@ certain functionality.
@section connectivity
+@li @c connectivity.commontools
@li @c connectivity.mork
@li @c connectivity.parse
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
