diff options
Diffstat (limited to 'connectivity/source/drivers/postgresql/pq_resultset.cxx')
| -rw-r--r-- | connectivity/source/drivers/postgresql/pq_resultset.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx index 556bae92d5be..62b33fa10ba9 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/SQLException.hpp> +#include <utility> using osl::MutexGuard; @@ -63,13 +64,13 @@ void ResultSet::checkClosed() { if( ! m_result ) { - throw SQLException( "pq_resultset: already closed", + throw SQLException( u"pq_resultset: already closed"_ustr, *this, OUString(), 1, Any() ); } if( ! m_ppSettings || ! *m_ppSettings || ! (*m_ppSettings)->pConnection ) { - throw SQLException( "pq_resultset: statement has been closed already", + throw SQLException( u"pq_resultset: statement has been closed already"_ustr, *this, OUString(), 1, Any() ); } @@ -79,14 +80,14 @@ ResultSet::ResultSet( const ::rtl::Reference< comphelper::RefCountedMutex > & re const Reference< XInterface > & owner, ConnectionSettings **ppSettings, PGresult * result, - const OUString &schema, - const OUString &table) + OUString schema, + OUString table) : BaseResultSet( refMutex, owner, PQntuples( result ), PQnfields( result ),(*ppSettings)->tc ), m_result( result ), - m_schema( schema ), - m_table( table ), + m_schema(std::move( schema )), + m_table(std::move( table )), m_ppSettings( ppSettings ) { // LEM TODO: shouldn't these things be inherited from the statement or something like that? @@ -164,7 +165,6 @@ sal_Int32 ResultSet::findColumn( const OUString& columnName ) else { ::dbtools::throwInvalidColumnException( columnName, *this ); - assert(false); } return res; } |