--- a/persistentstorage/sql/SRC/Server/Compact/SqlCompactConn.cpp	Tue Aug 31 16:57:14 2010 +0300
+++ b/persistentstorage/sql/SRC/Server/Compact/SqlCompactConn.cpp	Wed Sep 01 12:39:58 2010 +0100
@@ -15,17 +15,12 @@
 
 #include <f32file.h>
 #include <sqldb.h>
-#include "SqlAssert.h"
+#include "SqlPanic.h"
 #include "sqlite3.h"
 #include "SqliteSymbian.h"		//TSqlFreePageCallback
 #include "SqlSrvUtil.h"
 #include "SqlSrvStatementUtil.h"
 #include "SqlCompactConn.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SqlCompactConnTraces.h"
-#endif
-#include "SqlTraceDef.h"
 
 /**
 Creates a new CSqlCompactConn instance.
@@ -50,14 +45,12 @@
 */
 CSqlCompactConn* CSqlCompactConn::NewL(const TDesC& aFullName, TSqlFreePageCallback& aFreePageCallback)
 	{
-	SQL_TRACE_COMPACT(OstTraceExt1(TRACE_INTERNALS, CSQLCOMPACTCONN_NEWLC_ENTRY, "Entry;0;CSqlCompactConn::NewL;aFullName=%S", __SQLPRNSTR(aFullName)));
-	__ASSERT_DEBUG(aFullName.Length() > 0 && aFullName.Length() <= KMaxFileName, __SQLPANIC2(ESqlPanicBadArgument));
-	__ASSERT_DEBUG(aFreePageCallback.IsValid(), __SQLPANIC2(ESqlPanicBadArgument));
+	__SQLASSERT(aFullName.Length() > 0 && aFullName.Length() <= KMaxFileName, ESqlPanicBadArgument);
+	__SQLASSERT(aFreePageCallback.IsValid(), ESqlPanicBadArgument);
 	CSqlCompactConn* self = new (ELeave) CSqlCompactConn;
 	CleanupStack::PushL(self);
 	self->ConstructL(aFullName, aFreePageCallback);
 	CleanupStack::Pop(self);
-	SQL_TRACE_COMPACT(OstTraceExt2(TRACE_INTERNALS, CSQLCOMPACTCONN_NEWLC_EXIT, "Exit;0x%X;CSqlCompactConn::NewL;aFullName=%S", (TUint)self, __SQLPRNSTR(aFullName)));
 	return self;
 	}
 
@@ -66,7 +59,6 @@
 */
 CSqlCompactConn::~CSqlCompactConn()
 	{
-	SQL_TRACE_COMPACT(OstTrace1(TRACE_INTERNALS, CSQLCOMPACTCONN_CSQLCOMPACTCONN2, "0x%X;CSqlCompactConn::~CSqlCompactConn", (TUint)this));
 	::CloseDbHandle(iHandle);
  	}
 
@@ -97,8 +89,8 @@
 */
 TInt CSqlCompactConn::Compact(TInt aPageCount, TInt& aProcessedPageCount, TInt aLength)
 	{
-	__ASSERT_DEBUG(aPageCount >= 0, __SQLPANIC(ESqlPanicBadArgument));
-	__ASSERT_DEBUG(aLength >= 0, __SQLPANIC(ESqlPanicBadArgument));
+	__SQLASSERT(aPageCount >= 0, ESqlPanicBadArgument);
+	__SQLASSERT(aLength >= 0, ESqlPanicBadArgument);
 	SQLCOMPACTCONN_INVARIANT();
 	TInt err = ::DbCompact(iHandle, KNullDesC, aPageCount, aProcessedPageCount, aLength);
 	SQLCOMPACTCONN_INVARIANT();
@@ -131,9 +123,9 @@
 */
 void CSqlCompactConn::ConstructL(const TDesC& aFullName, TSqlFreePageCallback& aFreePageCallback)
 	{
-	__ASSERT_DEBUG(aFullName.Length() > 0 && aFullName.Length() <= KMaxFileName, __SQLPANIC(ESqlPanicBadArgument));
-	__ASSERT_DEBUG(aFreePageCallback.IsValid(), __SQLPANIC(ESqlPanicBadArgument));
-	__ASSERT_DEBUG(!iHandle, __SQLPANIC(ESqlPanicInternalError));
+	__SQLASSERT(aFullName.Length() > 0 && aFullName.Length() <= KMaxFileName, ESqlPanicBadArgument);
+	__SQLASSERT(aFreePageCallback.IsValid(), ESqlPanicBadArgument);
+	__SQLASSERT(!iHandle, ESqlPanicInternalError);
 	
 	TBuf8<KMaxFileName + 1> fname;
 	(void)::UTF16ToUTF8Z(aFullName, fname);//The file is first open by the main connection. 
@@ -198,7 +190,7 @@
 */
 void CSqlCompactConn::Invariant() const
 	{
-	__ASSERT_ALWAYS(iHandle != NULL, __SQLPANIC(ESqlPanicInternalError));
+	__SQLASSERT_ALWAYS(iHandle != NULL, ESqlPanicInternalError);
 	}
 #endif//_DEBUG
 
@@ -230,7 +222,7 @@
 */
 MSqlCompactConn* SqlCreateCompactConnL(const TDesC& aFullName, TSqlFreePageCallback& aFreePageCallback)
 	{
-	__ASSERT_DEBUG(aFullName.Length() > 0 && aFullName.Length() <= KMaxFileName, __SQLPANIC2(ESqlPanicBadArgument));
-	__ASSERT_DEBUG(aFreePageCallback.IsValid(), __SQLPANIC2(ESqlPanicBadArgument));
+	__SQLASSERT(aFullName.Length() > 0 && aFullName.Length() <= KMaxFileName, ESqlPanicBadArgument);
+	__SQLASSERT(aFreePageCallback.IsValid(), ESqlPanicBadArgument);
 	return CSqlCompactConn::NewL(aFullName, aFreePageCallback);
 	}