diff options
| author | Wastack <btomi96@gmail.com> | 2016-11-17 14:00:06 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2016-11-21 17:10:52 +0000 |
| commit | 3ec084d61e9c8aa0199b52de43fe288001f47e6d (patch) | |
| tree | e33063c782b1f7c2192bdc4006783fb51bed9d47 /connectivity/source/drivers/firebird/ResultSetMetaData.cxx | |
| parent | [API CHANGE] Remove tdf#96398 leftover XRemoteServiceManagerProvider (diff) | |
| download | core-3ec084d61e9c8aa0199b52de43fe288001f47e6d.tar.gz core-3ec084d61e9c8aa0199b52de43fe288001f47e6d.zip | |
get table name from resultset simply
There is a much simpler way to access table name in ResultSetMetadata
in Firebird sdbc which I didn't notice before.
Change-Id: Ib306c04acf38ec86475d8d1a22a67012fe48539e
Reviewed-on: https://gerrit.libreoffice.org/30931
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'connectivity/source/drivers/firebird/ResultSetMetaData.cxx')
| -rw-r--r-- | connectivity/source/drivers/firebird/ResultSetMetaData.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx index c36148c6c2fa..6b6d9849e6af 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx @@ -150,13 +150,14 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { - if( !m_sTableName.isEmpty() ) + OUString sTable = getTableName(column); + if( !sTable.isEmpty() ) { OUString sColumnName = getColumnName( column ); OUString sSql = "SELECT RDB$IDENTITY_TYPE FROM RDB$RELATION_FIELDS " "WHERE RDB$RELATION_NAME = '" - + escapeWith(m_sTableName, '\'', '\'') + "' AND " + + escapeWith(sTable, '\'', '\'') + "' AND " "RDB$FIELD_NAME = '"+ escapeWith(sColumnName, '\'', '\'') +"'"; Reference<XStatement> xStmt =m_pConnection ->createStatement(); @@ -195,8 +196,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nType = getColumnType(column); - if( (nType == DataType::NUMERIC || nType == DataType::DECIMAL) - && !m_sTableName.isEmpty() ) + if( nType == DataType::NUMERIC || nType == DataType::DECIMAL ) { OUString sColumnName = getColumnName( column ); |