dba321b: #i110942# use default if key columsn are unknownooo/DEV300_m78

1 files changed, 9 insertions, 7 deletions

diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 24d519038..2ab840502 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -367,15 +367,17 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
     }
 
     Sequence< ::rtl::OUString> aBestColumnNames;
-    if ( aBestRowColumnNames.empty() )
+    if ( !aBestRowColumnNames.empty() )
     {
-        if ( xKeyColumns.is() )
-            aBestColumnNames = xKeyColumns->getElementNames();
-    }
-    else
         aBestColumnNames = Sequence< ::rtl::OUString>(&aBestRowColumnNames[0],aBestRowColumnNames.size());
-
-    ::dbaccess::getColumnPositions(xSup->getColumns(),aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames));
+        ::dbaccess::getColumnPositions(xSup->getColumns(),aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames));
+    }
+    
+    if (m_pKeyColumnNames->empty() && xKeyColumns.is())
+    {
+        aBestColumnNames = xKeyColumns->getElementNames();
+        ::dbaccess::getColumnPositions(xSup->getColumns(),aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames));
+    }
     ::dbaccess::getColumnPositions(xSup->getColumns(),xSourceColumns->getElementNames(),m_sUpdateTableName,(*m_pColumnNames));
     ::dbaccess::getColumnPositions(xSup->getColumns(),aParameterColumns,m_sUpdateTableName,(*m_pParameterNames));