INTEGRATION: CWS dba25 (1.27.204); FILE MERGED

2005/03/04 11:37:35 oj 1.27.204.2: simple correct for ownDeletesAreVisible
2005/03/04 10:12:19 oj 1.27.204.1: correct operator order
This commit is contained in:
Oliver Bolte 2005-03-18 08:57:23 +00:00
parent d3a6b7f2a2
commit bb075c9e3f

View file

@ -2,9 +2,9 @@
*
* $RCSfile: ODatabaseMetaData.cxx,v $
*
* $Revision: 1.27 $
* $Revision: 1.28 $
*
* last change: $Author: vg $ $Date: 2003-04-11 14:41:23 $
* last change: $Author: obo $ $Date: 2005-03-18 09:57:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -795,7 +795,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException,
{
SQLUINTEGER nValue;
OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_OJ_CAPABILITIES,nValue,*this);
return ((nValue & SQL_OJ_FULL|SQL_OJ_LEFT|SQL_OJ_RIGHT|SQL_OJ_NESTED|SQL_OJ_NOT_ORDERED|SQL_OJ_ALL_COMPARISON_OPS|SQL_OJ_INNER) != 0);
return ((nValue & (SQL_OJ_FULL|SQL_OJ_LEFT|SQL_OJ_RIGHT|SQL_OJ_NESTED|SQL_OJ_NOT_ORDERED|SQL_OJ_ALL_COMPARISON_OPS|SQL_OJ_INNER)) != 0);
}
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException)
@ -1736,7 +1736,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) t
}
OTools::GetInfo(m_pConnection,m_aConnectionHandle,nAskFor,nValue,*this);
return (nValue & SQL_CA2_SENSITIVITY_DELETIONS) == SQL_CA2_SENSITIVITY_DELETIONS;
return (nValue & SQL_CA2_SENSITIVITY_DELETIONS) != SQL_CA2_SENSITIVITY_DELETIONS;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)