diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-09-11 21:40:41 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-09-12 17:26:12 +0000 |
| commit | 42165189826367937737861116e969a22e9db787 (patch) | |
| tree | 69d8ec60869aee5981ecc4e5edbc1e3a89a625d7 /connectivity/source/drivers/ado | |
| parent | a042cdd7eff15ed5f6cbd613588b3fca9509a85e (diff) | |
Update implementations of ColumnLocate::findColumn to throw on invalid column.
Change-Id: I7a9354ecd35a70a005c6c50e38d27de9b33332bd
Reviewed-on: https://gerrit.libreoffice.org/5922
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'connectivity/source/drivers/ado')
| -rw-r--r-- | connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 10 | ||||
| -rw-r--r-- | connectivity/source/drivers/ado/AResultSet.cxx | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 63ffb198f08a..b1b6dfe47a7c 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -125,11 +125,15 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum sal_Int32 nLen = xMeta->getColumnCount(); sal_Int32 i = 1; for(;i<=nLen;++i) + { if(xMeta->isCaseSensitive(i) ? columnName == xMeta->getColumnName(i) : columnName.equalsIgnoreAsciiCase(xMeta->getColumnName(i))) - break; - /* FIXME: should throw in case of not found ? */ - return i; + return i; + } + + ::dbtools::throwInvalidColumnException( columnName, *this ); + assert(false); + return 0; // Never reached } #define BLOCK_SIZE 256 // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 46bcb2259883..3ae5f788a221 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -163,11 +163,15 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ sal_Int32 nLen = xMeta->getColumnCount(); sal_Int32 i = 1; for(;i<=nLen;++i) + { if(xMeta->isCaseSensitive(i) ? columnName == xMeta->getColumnName(i) : columnName.equalsIgnoreAsciiCase(xMeta->getColumnName(i))) - break; - /* FIXME: should throw in case of not found ? */ - return i; + return i; + } + + ::dbtools::throwInvalidColumnException( columnName, *this ); + assert(false); + return 0; // Never reached } #define BLOCK_SIZE 256 // ------------------------------------------------------------------------- |