--- a/contentstorage/castorage/src/casqlquerycreator.cpp	Fri Jun 11 16:25:06 2010 +0100
+++ b/contentstorage/castorage/src/casqlquerycreator.cpp	Thu Jul 22 16:37:03 2010 +0100
@@ -574,31 +574,14 @@
 //
 // ---------------------------------------------------------------------------
 //
-void CaSqlQueryCreator::CreateLocalizeEntryQueryL( CCaSqlQuery* aSqlQuery )
+void CaSqlQueryCreator::CreateLocalizationTableQueryL( CCaSqlQuery* aSqlQuery,
+        const TDesC& aStatement)
     {
-    DEBUG(("_CA_:CASqlQueryCreator::CreateLocalizeEntryQueryL"));
-    RBuf query;
-    
-    query.CleanupClosePushL();
-    query.CreateL( KSQLLocalizeEntry().Length() );
-    query.Append( KSQLLocalizeEntry );
-    
-    aSqlQuery->SetQueryL( query );
-    CleanupStack::PopAndDestroy( &query );
-    }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CaSqlQueryCreator::CreateGetLocalizationsQueryL( CCaSqlQuery* aSqlQuery )
-    {
-    DEBUG(("_CA_:CASqlQueryCreator::CreateGetLocalizationsQueryL"));
+    DEBUG(("_CA_:CASqlQueryCreator::CreateLocalizationTableQueryL"));
     RBuf query;
     query.CleanupClosePushL();
-    query.CreateL( KSQLGetLocalizations().Length() );
-    query.Append( KSQLGetLocalizations );
-    
+    query.CreateL( aStatement.Length() );
+    query.Append( aStatement );
     aSqlQuery->SetQueryL( query );
     CleanupStack::PopAndDestroy( &query );
     }
@@ -835,6 +818,20 @@
         query.Append( getListByParentId2withWhere );
         CleanupStack::PopAndDestroy( &getListByParentId2withWhere );
         }
+    else if ( aQuery->GetChildId() > 0 )
+        {
+        RBuf getListByCildIdwithWhere;
+        getListByCildIdwithWhere.CleanupClosePushL();
+        getListByCildIdwithWhere.CreateL( KSQLGetListByChildId().Length() + whereStatement.Length() );
+        getListByCildIdwithWhere.AppendFormat( KSQLGetListByChildId, &whereStatement );
+        
+        query.ReAllocL( KSQLGetListByParentId1().Length() +  leftJoins.Length() +
+                getListByCildIdwithWhere.Length() );
+        query.Append( KSQLGetListByParentId1 );
+        query.Append( leftJoins );
+        query.Append( getListByCildIdwithWhere );
+        CleanupStack::PopAndDestroy( &getListByCildIdwithWhere );
+        }
     else
         {
         query.CreateL( KSQLGetList1().Length() );