diff options
Diffstat (limited to 'connectivity/source/drivers/postgresql')
4 files changed, 4 insertions, 17 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index 27fe0bd1a392..a5f3cad4f791 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -310,18 +310,11 @@ void PreparedStatement::close( ) throw (SQLException, RuntimeException, std::ex } } -void PreparedStatement::raiseSQLException( - const char * errorMsg, const char *errorType ) +void PreparedStatement::raiseSQLException( const char * errorMsg ) throw( SQLException ) { OUStringBuffer buf(128); buf.append( "pq_driver: "); - if( errorType ) - { - buf.append( "[" ); - buf.appendAscii( errorType ); - buf.append( "]" ); - } buf.append( OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) ); buf.append( " (caused by statement '" ); diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx index 2b412926a442..67a4a9ec9847 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.hxx @@ -250,7 +250,7 @@ public: // OComponentHelper private: void checkColumnIndex( sal_Int32 parameterIndex ); void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException); - void raiseSQLException( const char * errorMsg, const char *errorType = nullptr ) + void raiseSQLException( const char * errorMsg ) throw ( com::sun::star::sdbc::SQLException ); // PGresult *pgExecute( OString *pQuery ); }; diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index bff2a1967340..8a0056a7ecdc 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -242,17 +242,11 @@ void Statement::close( ) throw (SQLException, RuntimeException, std::exception) } void Statement::raiseSQLException( - const OUString & sql, const char * errorMsg, const char *errorType ) + const OUString & sql, const char * errorMsg ) throw( SQLException ) { OUStringBuffer buf(128); buf.append( "pq_driver: "); - if( errorType ) - { - buf.append( "[" ); - buf.appendAscii( errorType ); - buf.append( "]" ); - } buf.append( OUString( errorMsg, strlen(errorMsg) , m_pSettings->encoding ) ); buf.append( " (caused by statement '" ); diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx index 920ff5df8b5a..a7fbceb03a45 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.hxx +++ b/connectivity/source/drivers/postgresql/pq_statement.hxx @@ -176,7 +176,7 @@ public: // XResultSetMetaDataSupplier (is required by framework (see private: void checkClosed() throw (com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException); - void raiseSQLException( const OUString & sql, const char * errorMsg, const char *errorType = nullptr ) + void raiseSQLException( const OUString & sql, const char * errorMsg ) throw ( com::sun::star::sdbc::SQLException ); }; |