Fixed jira issues

[apps/osp/MusicPlayer.git] / src / MpPlaylistDB.cpp

diff --git a/src/MpPlaylistDB.cpp b/src/MpPlaylistDB.cpp
index aff5b8d..a6d7cd1 100644 (file)
--- a/src/MpPlaylistDB.cpp
+++ b/src/MpPlaylistDB.cpp
@@ -46,7 +46,7 @@ PlaylistDB::CreatePlaylistDatabase(void)
 {
        AppLogDebug("ENTER");
        Tizen::Base::String dbName(App::GetInstance()->GetAppRootPath() + DATABASE_PATH);
-       Tizen::Base::String sql = null;
+       Tizen::Base::String sql;
 
        result r = E_SUCCESS;
 
@@ -59,7 +59,8 @@ PlaylistDB::CreatePlaylistDatabase(void)
        r = pDatabase->Construct(dbName, true);
        TryCatch(r == E_SUCCESS, r = E_FAILURE, "Database can not construct.[%s]", GetErrorMessage(r));
        sql.Append(L"CREATE TABLE IF NOT EXISTS playlisttable ( primaryKey INTEGER PRIMARY KEY AUTOINCREMENT, contentId TEXT, playCount INTEGER, playTime TEXT )");
-
+       r = pDatabase->BeginTransaction();
+       TryCatch(r == E_SUCCESS, r = E_FAILURE, "BeginTransaction failed.[%s]", GetErrorMessage(r));
        r = pDatabase->ExecuteSql(sql, true);
        TryCatch(r == E_SUCCESS, r = E_FAILURE, "ExecuteSql failed.[%s]", GetErrorMessage(r));
        r = pDatabase->CommitTransaction();
@@ -287,11 +288,14 @@ PlaylistDB::SearchN(int index)
 
        result r = E_SUCCESS;
 
-       Tizen::Base::String statement = null;
+       Tizen::Base::String statement;
        DbEnumerator* pEnum = null;
 
        Tizen::Io::Database* pDatabase = new (std::nothrow) Database();
        r = pDatabase->Construct(dbName, false);
+
+       TryReturn(r == E_SUCCESS,null,"pDatabase->Construct failed with error %s",GetErrorMessage(r));
+
        if (index == MOST_PLAYED_CONTENT)
        {
                statement.Append(L"SELECT contentId FROM playlisttable WHERE playCount > 0 ORDER BY playCount DESC");