[Libreoffice-commits] core.git: 7 commits - connectivity/source
Andrzej J.R. Hunt
andrzej at ahunt.org
Fri Sep 6 00:41:38 PDT 2013
connectivity/source/drivers/firebird/Connection.cxx | 11 ++++++++---
connectivity/source/drivers/firebird/Connection.hxx | 6 ++++--
connectivity/source/drivers/firebird/PreparedStatement.cxx | 6 +++---
connectivity/source/drivers/firebird/PreparedStatement.hxx | 9 ++++++---
connectivity/source/drivers/firebird/ResultSet.cxx | 4 ++--
connectivity/source/drivers/firebird/ResultSet.hxx | 9 ++++++---
6 files changed, 29 insertions(+), 16 deletions(-)
New commits:
commit b991d27d3d47d29a376cafe08f8665327170dd0a
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Fri Sep 6 08:35:19 2013 +0100
CID#1079053 Uncaught Exception.
In this case we can just propagate the DeploymentException (is a
RuntimeException).
Change-Id: Ic807ec039af3856f90d4e798e1304a72421b4db6
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index f5fcb26..0d53123 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -112,7 +112,7 @@ void SAL_CALL OConnection::release() throw()
}
void OConnection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info)
- throw(SQLException)
+ throw(SQLException, RuntimeException)
{
SAL_INFO("connectivity.firebird", "construct().");
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index c7fe44c..7a21aca 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -127,7 +127,8 @@ namespace connectivity
public:
virtual void construct( const ::rtl::OUString& url,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info)
- throw(::com::sun::star::sdbc::SQLException);
+ throw(::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
OConnection(FirebirdDriver* _pDriver);
virtual ~OConnection();
commit 525bb53ab85ca2606db80edaf4ae33710921bad1
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Fri Sep 6 08:30:56 2013 +0100
CID#1079054 Uncaught exception.
In this case we should just propagate the DisposedException to the caller.
Change-Id: I3c2699ad6c2144007d98447b133cdbb13f5d50d9
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 1d2e8f1..f5fcb26 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -320,7 +320,7 @@ IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.firebird.OConnect
"com.sun.star.sdbc.Connection")
Reference< XBlob> OConnection::createBlob(ISC_QUAD* pBlobId)
- throw(SQLException)
+ throw(SQLException, RuntimeException)
{
SAL_INFO("connectivity.firebird", "createBlob()");
MutexGuard aGuard(m_aMutex);
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index cdf6c44..c7fe44c 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -185,7 +185,8 @@ namespace connectivity
*/
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob>
createBlob(ISC_QUAD* pBlobID)
- throw(::com::sun::star::sdbc::SQLException);
+ throw(::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
/**
* Create and/or connect to the sdbcx Catalog. This is completely
commit f9a7f0340e9e6dbaa9d381dd2b3ea8c1a2831857
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Fri Sep 6 08:23:20 2013 +0100
CID#1079051 Uncaught exception. (firebird-sdbc)
In this case we can just pass the DisposedException (is a RuntimeException)
onto the calling methods.
Change-Id: I89d2421c03a5f8e81f209b94109ffde117cfb0cd
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 1317b6f..9e05311 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -64,7 +64,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,
}
void OPreparedStatement::ensurePrepared()
- throw (SQLException)
+ throw (SQLException, RuntimeException)
{
MutexGuard aGuard(m_pConnection->getMutex());
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -584,7 +584,7 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
}
void OPreparedStatement::checkParameterIndex(sal_Int32 nParameterIndex)
- throw(SQLException)
+ throw(SQLException, RuntimeException)
{
ensurePrepared();
if ((nParameterIndex == 0) || (nParameterIndex > m_pInSqlda->sqld))
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index c071fa2..1a8b0f4 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -72,7 +72,8 @@ namespace connectivity
XSQLDA* m_pOutSqlda;
XSQLDA* m_pInSqlda;
void checkParameterIndex(sal_Int32 nParameterIndex)
- throw(::com::sun::star::sdbc::SQLException);
+ throw(::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
/**
* Set a numeric value in the input SQLDA. If the destination
@@ -84,7 +85,8 @@ namespace connectivity
void setParameterNull(sal_Int32 nParameterIndex, bool bSetNull = true);
void ensurePrepared()
- throw(::com::sun::star::sdbc::SQLException);
+ throw(::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
protected:
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
commit ce1006f5294df8ce45afcdf39f9f1b199583d00f
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Fri Sep 6 08:20:24 2013 +0100
CID#1079048 CID#1079049 CID#1079050 Uncaught exception. (firebird-sdbc)
In this case we can just pass the DisposedException (is a RuntimeException)
onto the calling methods.
Change-Id: Ia85a2d147ed3822847fe64b8cac671c88c6444fe
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 0069d71..1317b6f 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -333,7 +333,7 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 nIndex, sal_Bool x)
template <typename T>
void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType)
- throw(SQLException)
+ throw(SQLException, RuntimeException)
{
MutexGuard aGuard( m_pConnection->getMutex() );
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index c32be80..c071fa2 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -79,7 +79,8 @@ namespace connectivity
* parameter is not of nType then an Exception will be thrown.
*/
template <typename T> void setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType)
- throw(::com::sun::star::sdbc::SQLException);
+ throw(::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
void setParameterNull(sal_Int32 nParameterIndex, bool bSetNull = true);
void ensurePrepared()
commit 08081fffa0733fd6fcabf75ef2e809c64b1f4bfd
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Fri Sep 6 08:16:48 2013 +0100
CID#1079047 Uncaught exception. (firebird-sdbc)
In this case we can just pass the DisposedException (is a RuntimeException)
onto the calling methods.
Change-Id: I379974fd7998151d503020742ae7ae18cbdfaf7c
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index eabf65f..a342fb1 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -289,7 +289,7 @@ void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 index)
}
void SAL_CALL OResultSet::checkRowIndex()
- throw (SQLException)
+ throw (SQLException, RuntimeException)
{
MutexGuard aGuard(m_pConnection->getMutex());
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index 6b994da..129edda 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -102,9 +102,11 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
virtual void SAL_CALL checkColumnIndex( sal_Int32 index )
- throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException );
+ throw (::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL checkRowIndex()
- throw ( com::sun::star::sdbc::SQLException);
+ throw (::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
// you can't delete objects of this type
virtual ~OResultSet();
commit 98862b0fde8f15b93f02ed86267d3fdd659c8a1e
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Fri Sep 6 08:07:16 2013 +0100
CID#1079045 CID#107946 Uncaught exception. (firebird-sdbc)
In this case we can just pass the DisposedException (is a RuntimeException)
onto the get* methods.
Change-Id: I97a3575709e2f50fa651a5d26c3029ed014630da
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index 6946100..eabf65f 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -419,7 +419,7 @@ ISC_QUAD* OResultSet::retrieveValue(sal_Int32 columnIndex)
template <typename T>
T OResultSet::safelyRetrieveValue(sal_Int32 columnIndex)
- throw (SQLException)
+ throw (SQLException, RuntimeException)
{
MutexGuard aGuard(m_pConnection->getMutex());
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index fb8e4b1..6b994da 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -94,7 +94,8 @@ namespace connectivity
template <typename T> T retrieveValue(sal_Int32 columnIndex);
template <typename T> T safelyRetrieveValue(sal_Int32 columnIndex)
- throw(::com::sun::star::sdbc::SQLException);
+ throw(::com::sun::star::sdbc::SQLException,
+ ::com::sun::star::uno::RuntimeException);
// OIdPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const;
commit d153993e873850700feba1fd4d3e1d151f9ad4a8
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date: Fri Sep 6 08:02:05 2013 +0100
Add error checking in rebuildIndexes. (firebird-sdbc)
Change-Id: If59c9fe7d7253347717aeb5b1aadf212b7d536a6
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 9b689ed..1d2e8f1 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -836,14 +836,19 @@ void OConnection::rebuildIndexes() throw(SQLException)
+ " ACTIVE";
ISC_STATUS_ARRAY aStatusVector;
+ ISC_STATUS aErr;
- isc_dsql_execute_immediate(aStatusVector,
+ aErr = isc_dsql_execute_immediate(aStatusVector,
&getDBHandle(),
&getTransaction(),
0, // Length: 0 for null terminated
sAlterIndex.getStr(),
FIREBIRD_SQL_DIALECT,
NULL);
+ if (aErr)
+ evaluateStatusVector(aStatusVector,
+ "rebuildIndexes:isc_dsql_execute_immediate",
+ *this);
}
commit();
}
More information about the Libreoffice-commits
mailing list