--- a/persistentstorage/sql/SRC/Client/SqlStatementImpl.cpp Tue Jul 06 16:18:30 2010 +0300
+++ b/persistentstorage/sql/SRC/Client/SqlStatementImpl.cpp Wed Aug 18 11:30:17 2010 +0300
@@ -45,8 +45,8 @@
*/
TBool RSqlLongColumnColl::TData::Compare(const TInt* aIndex, const RSqlLongColumnColl::TData& aData)
{
- __SQLASSERT(aIndex != NULL, ESqlPanicBadArgument);
- __SQLASSERT(*aIndex >= 0, ESqlPanicBadArgument);
+ __ASSERT_DEBUG(aIndex != NULL, __SQLPANIC2(ESqlPanicBadArgument));
+ __ASSERT_DEBUG(*aIndex >= 0, __SQLPANIC2(ESqlPanicBadArgument));
return *aIndex == aData.iIndex;
}
@@ -63,8 +63,8 @@
*/
TInt RSqlLongColumnColl::Append(RSqlLongColumnColl::TColumnReader& aReader, TInt aColumnIndex, TInt aColumnSize)
{
- __SQLASSERT(aColumnIndex >= 0, ESqlPanicBadArgument);
- __SQLASSERT(aColumnSize >= KSqlMaxDesLen, ESqlPanicBadArgument);
+ __ASSERT_DEBUG(aColumnIndex >= 0, __SQLPANIC(ESqlPanicBadArgument));
+ __ASSERT_DEBUG(aColumnSize >= KSqlMaxDesLen, __SQLPANIC(ESqlPanicBadArgument));
LONGCOL_INVARIANT();
HBufC8* colBuf = HBufC8::New(aColumnSize);
if(!colBuf)
@@ -96,11 +96,11 @@
for(TInt i=iValues.Count()-1;i>=0;--i)
{
const RSqlLongColumnColl::TData& data = iValues[i];
- __SQLASSERT(data.iIndex >= 0, ESqlPanicInternalError);
- __SQLASSERT(data.iData != NULL, ESqlPanicInternalError);
+ __ASSERT_DEBUG(data.iIndex >= 0, __SQLPANIC(ESqlPanicInternalError));
+ __ASSERT_DEBUG(data.iData != NULL, __SQLPANIC(ESqlPanicInternalError));
for(TInt j=i-1;j>=0;--j)
{
- __SQLASSERT(data.iIndex != iValues[j].iIndex, ESqlPanicInternalError);
+ __ASSERT_DEBUG(data.iIndex != iValues[j].iIndex, __SQLPANIC(ESqlPanicInternalError));
}
}
}
@@ -318,7 +318,7 @@
*/
TInt CSqlStatementImpl::BindNull(TInt aParamIndex)
{
- __SQLASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, ESqlPanicBadColumnIndex);
+ __ASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
iBound = EFalse;
iParamValBufIt.MoveTo(aParamIndex);
iParamValBufIt.SetNull();
@@ -334,7 +334,7 @@
*/
TInt CSqlStatementImpl::BindInt(TInt aParamIndex, TInt aParamValue)
{
- __SQLASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, ESqlPanicBadColumnIndex);
+ __ASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
iBound = EFalse;
iParamValBufIt.MoveTo(aParamIndex);
return iParamValBufIt.SetInt(aParamValue);
@@ -349,7 +349,7 @@
*/
TInt CSqlStatementImpl::BindInt64(TInt aParamIndex, TInt64 aParamValue)
{
- __SQLASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, ESqlPanicBadColumnIndex);
+ __ASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
iBound = EFalse;
iParamValBufIt.MoveTo(aParamIndex);
return iParamValBufIt.SetInt64(aParamValue);
@@ -364,7 +364,7 @@
*/
TInt CSqlStatementImpl::BindReal(TInt aParamIndex, TReal aParamValue)
{
- __SQLASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, ESqlPanicBadColumnIndex);
+ __ASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
iBound = EFalse;
iParamValBufIt.MoveTo(aParamIndex);
return iParamValBufIt.SetReal(aParamValue);
@@ -379,7 +379,7 @@
*/
TInt CSqlStatementImpl::BindText(TInt aParamIndex, const TDesC& aParamText)
{
- __SQLASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, ESqlPanicBadColumnIndex);
+ __ASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
iBound = EFalse;
iParamValBufIt.MoveTo(aParamIndex);
return iParamValBufIt.SetText(aParamText);
@@ -394,7 +394,7 @@
*/
TInt CSqlStatementImpl::BindBinary(TInt aParamIndex, const TDesC8& aParamData)
{
- __SQLASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, ESqlPanicBadColumnIndex);
+ __ASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
iBound = EFalse;
iParamValBufIt.MoveTo(aParamIndex);
return iParamValBufIt.SetBinary(aParamData);
@@ -409,7 +409,7 @@
*/
TInt CSqlStatementImpl::BindZeroBlob(TInt aParamIndex, TInt aBlobSize)
{
- __SQLASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, ESqlPanicBadColumnIndex);
+ __ASSERT_ALWAYS((TUint)aParamIndex < (TUint)iParamCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
iBound = EFalse;
iParamValBufIt.MoveTo(aParamIndex);
return iParamValBufIt.SetZeroBlob(aBlobSize);
@@ -425,8 +425,8 @@
*/
TSqlColumnType CSqlStatementImpl::ColumnType(TInt aColumnIndex)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
- __SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+ __ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
iColumnValBufIt.MoveTo(aColumnIndex);
return static_cast <TSqlColumnType> (iColumnValBufIt.Type());
}
@@ -447,7 +447,7 @@
*/
TInt CSqlStatementImpl::DeclaredColumnType(TInt aColumnIndex, TSqlColumnType& aColumnType)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
if(iDeclaredColumnTypes.Count() == 0) //initialise iDeclaredColumnTypes array if necessary
{
RSqlBufFlat declaredColumnTypeBuf;
@@ -506,10 +506,10 @@
colType = ESqlReal;
}
err = iDeclaredColumnTypes.Append(colType);
- __SQLASSERT(err == KErrNone, ESqlPanicInternalError);//memory for the array elements has been reserved already
+ __ASSERT_DEBUG(err == KErrNone, __SQLPANIC(ESqlPanicInternalError));//memory for the array elements has been reserved already
++colIdx;
} //end of - while(declColumnTypeBufIt.Next())
- __SQLASSERT(colIdx == iColumnCnt, ESqlPanicInternalError);
+ __ASSERT_DEBUG(colIdx == iColumnCnt, __SQLPANIC(ESqlPanicInternalError));
declaredColumnTypeBuf.Close();
} //end of - if(iDeclaredColumnTypes.Count() == 0 && iColumnCnt > 0)
aColumnType = iDeclaredColumnTypes[aColumnIndex];
@@ -526,8 +526,8 @@
*/
TInt CSqlStatementImpl::ColumnSize(TInt aColumnIndex)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
- __SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+ __ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
iColumnValBufIt.MoveTo(aColumnIndex);
return iColumnValBufIt.Size();
}
@@ -542,10 +542,10 @@
*/
TInt CSqlStatementImpl::ColumnInt(TInt aColumnIndex)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
- __SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+ __ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
iColumnValBufIt.MoveTo(aColumnIndex);
- __SQLASSERT(iColumnValBufIt.IsPresent(), ESqlPanicValueNotPresent);
+ __ASSERT_DEBUG(iColumnValBufIt.IsPresent(), __SQLPANIC(ESqlPanicValueNotPresent));
return iColumnValBufIt.Int();
}
@@ -559,10 +559,10 @@
*/
TInt64 CSqlStatementImpl::ColumnInt64(TInt aColumnIndex)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
- __SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+ __ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
iColumnValBufIt.MoveTo(aColumnIndex);
- __SQLASSERT(iColumnValBufIt.IsPresent(), ESqlPanicValueNotPresent);
+ __ASSERT_DEBUG(iColumnValBufIt.IsPresent(), __SQLPANIC(ESqlPanicValueNotPresent));
return iColumnValBufIt.Int64();
}
@@ -576,10 +576,10 @@
*/
TReal CSqlStatementImpl::ColumnReal(TInt aColumnIndex)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
- __SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+ __ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
iColumnValBufIt.MoveTo(aColumnIndex);
- __SQLASSERT(iColumnValBufIt.IsPresent(), ESqlPanicValueNotPresent);
+ __ASSERT_DEBUG(iColumnValBufIt.IsPresent(), __SQLPANIC(ESqlPanicValueNotPresent));
return iColumnValBufIt.Real();
}
@@ -597,8 +597,8 @@
*/
TInt CSqlStatementImpl::ColumnText(TInt aColumnIndex, TPtrC& aPtr)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
- __SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+ __ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
iColumnValBufIt.MoveTo(aColumnIndex);
if(iColumnValBufIt.IsPresent())
{
@@ -644,8 +644,8 @@
*/
TInt CSqlStatementImpl::ColumnText(TInt aColumnIndex, TDes& aDest)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
- __SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+ __ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
iColumnValBufIt.MoveTo(aColumnIndex);
TInt err = KErrNone;
//The text column value has not been transferred to the client side if its length is >= KSqlMaxDesLen characters.
@@ -697,8 +697,8 @@
*/
TInt CSqlStatementImpl::ColumnBinary(TInt aColumnIndex, TPtrC8& aPtr)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
- __SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+ __ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
iColumnValBufIt.MoveTo(aColumnIndex);
if(iColumnValBufIt.IsPresent())
{
@@ -744,8 +744,8 @@
*/
TInt CSqlStatementImpl::ColumnBinary(TInt aColumnIndex, TDes8& aDest)
{
- __SQLASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, ESqlPanicBadColumnIndex);
- __SQLASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, ESqlPanicInvalidRow);
+ __ASSERT_ALWAYS((TUint)aColumnIndex < (TUint)iColumnCnt, __SQLPANIC(ESqlPanicBadColumnIndex));
+ __ASSERT_ALWAYS(iState == CSqlStatementImpl::EAtRow, __SQLPANIC(ESqlPanicInvalidRow));
iColumnValBufIt.MoveTo(aColumnIndex);
TInt err = KErrNone;
//The binary column value has not been transferred to the client side if its length is >= KSqlMaxDesLen bytes.