rhodes 2.2.6 → 2.3.0.beta.1

data/platform/shared/db/DBAdapter.cpp

@@ -10,6 +10,7 @@
 #ifndef RHO_NO_RUBY 
 #include "ruby/ext/rho/rhoruby.h"
 #endif //RHO_NO_RUBY
+#include "common/app_build_configs.h"
 
 namespace rho{
 namespace db{
@@ -40,7 +41,7 @@ void SyncBlob_DeleteCallback(sqlite3_context* dbContext, int nArgs, sqlite3_valu
         CRhoFile::deleteFile(strFilePath.c_str());
     }
 
-    attrMgr.remove( nSrcID, szAttrName );
+    //attrMgr.remove( nSrcID, szAttrName );
 }
 
 void SyncBlob_UpdateCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs)
@@ -68,10 +69,10 @@ void SyncBlob_DeleteSchemaCallback(sqlite3_context* dbContext, int nArgs, sqlite
 
 void SyncBlob_InsertCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs)
 {
-    if ( nArgs < 2 )
-        return;
+    //if ( nArgs < 2 )
+    //    return;
 
-    CDBAdapter::getDBByHandle(sqlite3_context_db_handle(dbContext)).getAttrMgr().add( sqlite3_value_int(*(ppArgs)), (char*)sqlite3_value_text(*(ppArgs+1)) );
+    //CDBAdapter::getDBByHandle(sqlite3_context_db_handle(dbContext)).getAttrMgr().add( sqlite3_value_int(*(ppArgs)), (char*)sqlite3_value_text(*(ppArgs+1)) );
 }
 
 boolean CDBAdapter::checkDbError(int rc)
@@ -125,6 +126,22 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
     if ( !checkDbError(nRes) )
         return;
     //TODO: raise exception if error
+
+    //if (RHOCONF().getBool("encrypt_database"))
+    const char* szEncrypt = get_app_build_config_item("encrypt_database");
+    if ( szEncrypt && strcmp(szEncrypt, "1") == 0 )
+    {
+        common::CAutoPtr<common::IRhoClassFactory> factory = rho_impl_createClassFactory();
+        m_ptrCrypt = factory->createRhoCrypt();
+        if ( m_strCryptKey.length() > 0 )
+            m_ptrCrypt->set_db_CryptKey( m_strDbPartition.c_str(), m_strCryptKey.c_str(), !bTemp );
+
+        CDBError dbError;
+        String strKey = "PRAGMA key = \"";
+        strKey += m_strDbPartition + "\";";
+	    executeBatch(strKey.c_str(), dbError);
+    }
+
     if ( !bExist )
         createSchema();
 
@@ -141,7 +158,7 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
 
     sqlite3_busy_handler(m_dbHandle, onDBBusy, 0 );
 
-    getAttrMgr().load(*this);
+    //getAttrMgr().load(*this);
 
     //copy client_info table
     if ( !bTemp && !bExist && CRhoFile::isFileExist((strDbPath+"_oldver").c_str()) )
@@ -259,6 +276,9 @@ void CDBAdapter::checkDBVersion(String& strRhoDBVer)
         CRhoFile::deleteFilesInFolder(RHODESAPPBASE().getBlobsDirPath().c_str());
 
         writeDBVersion( CDBVersion(strRhoDBVer, strAppDBVer) );
+
+        if ( RHOCONF().isExist("bulksync_state") && RHOCONF().getInt("bulksync_state") != 0)
+            RHOCONF().setInt("bulksync_state", 0, true);
 	}
 }
 
@@ -385,7 +405,7 @@ boolean CDBAdapter::isTableExist(String strTableName)
 
 void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables)
 {
-    getAttrMgr().reset(*this);
+    //getAttrMgr().reset(*this);
     CFilePath oFilePath(m_strDbPath);
 	String dbNewName  = oFilePath.changeBaseName("resetdbtemp.sqlite");
 
@@ -445,8 +465,76 @@ void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbT
     }
 }
 
+void CDBAdapter::updateAllAttribChanges()
+{
+    //Check for attrib = object
+    DBResult( res , executeSQL("SELECT object, source_id, update_type "
+        "FROM changed_values where attrib = 'object' and sent=0") );
+
+    if ( res.isEnd() )
+        return;
+
+    startTransaction();
+
+    Vector<String> arObj, arUpdateType;
+    Vector<int> arSrcID;
+    for( ; !res.isEnd(); res.next() )
+    {
+        arObj.addElement(res.getStringByIdx(0));
+        arSrcID.addElement(res.getIntByIdx(1));
+        arUpdateType.addElement(res.getStringByIdx(2));
+    }
+
+    for( int i = 0; i < (int)arObj.size(); i++ )
+    {
+        DBResult( resSrc , executeSQL("SELECT name, schema FROM sources where source_id=?", arSrcID.elementAt(i) ) );
+        boolean bSchemaSource = false;
+        String strTableName = "object_values";
+        if ( !resSrc.isEnd() )
+        {
+            bSchemaSource = resSrc.getStringByIdx(1).length() > 0;
+            if ( bSchemaSource )
+                strTableName = resSrc.getStringByIdx(0);
+        }
+
+        if (bSchemaSource)
+        {
+            DBResult( res2 , executeSQL((String("SELECT * FROM ") + strTableName + " where object=?").c_str(), arObj.elementAt(i) ) );
+            for( int j = 0; j < res2.getColCount(); j ++)
+            {
+                String strAttrib = res2.getColName(j);
+                String value = res2.getStringByIdx(j);
+                String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), strAttrib.c_str()) ? "blob.file" : "";
+
+                executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)", 
+                    arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, 0);
+            }
+        }else
+        {
+            DBResult( res2 , executeSQL((String("SELECT attrib, value FROM ") + strTableName + " where object=? and source_id=?").c_str(), 
+                arObj.elementAt(i), arSrcID.elementAt(i) ) );
+
+            for( ; !res2.isEnd(); res2.next() )
+            {
+                String strAttrib = res2.getStringByIdx(0);
+                String value = res2.getStringByIdx(1);
+                String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), strAttrib.c_str()) ? "blob.file" : "";
+
+                executeSQLReportNonUnique("INSERT INTO changed_values (source_id,object,attrib,value,update_type,attrib_type,sent) VALUES(?,?,?,?,?,?,?)", 
+                    arSrcID.elementAt(i), arObj.elementAt(i), strAttrib, value, arUpdateType.elementAt(i), attribType, 0);
+            }
+        }
+    }
+
+    executeSQL("DELETE FROM changed_values WHERE attrib='object'"); 
+
+    endTransaction();
+}
+
 void CDBAdapter::copyChangedValues(CDBAdapter& db)
 {
+    updateAllAttribChanges();
+
     copyTable("changed_values", *this, db );
     {
         Vector<int> arOldSrcs;
@@ -455,7 +543,7 @@ void CDBAdapter::copyChangedValues(CDBAdapter& db)
             for ( ; !resSrc.isEnd(); resSrc.next() )
                 arOldSrcs.addElement( resSrc.getIntByIdx(0) );
         }
-        for( int i = 0; i < arOldSrcs.size(); i++)
+        for( int i = 0; i < (int)arOldSrcs.size(); i++)
         {
             int nOldSrcID = arOldSrcs.elementAt(i);
 
@@ -480,9 +568,10 @@ void CDBAdapter::copyChangedValues(CDBAdapter& db)
     }
 }
 
-void CDBAdapter::setBulkSyncDB(String fDataName)
+void CDBAdapter::setBulkSyncDB(String fDataName, String strCryptKey)
 {
     CDBAdapter db(m_strDbPartition.c_str(), true);
+    db.setCryptKey(strCryptKey);
     db.open( fDataName, m_strDbVer, true );
     db.createTriggers();
 
@@ -491,6 +580,7 @@ void CDBAdapter::setBulkSyncDB(String fDataName)
     copyTable("client_info", *this, db );
     copyChangedValues(db);
 
+    /*
     //update User partition
     if ( m_strDbPartition.compare(USER_PARTITION_NAME())==0 )
     {
@@ -510,7 +600,7 @@ void CDBAdapter::setBulkSyncDB(String fDataName)
         copyTable("sources", db, dbUser );
 
         dbUser.endTransaction();
-    }
+    }*/
 
     getDBPartitions().put(m_strDbPartition.c_str(), &db);
     sync::CSyncThread::getSyncEngine().applyChangedValues(db);
@@ -526,6 +616,7 @@ void CDBAdapter::setBulkSyncDB(String fDataName)
 
     CRhoFile::deleteFile(dbOldName.c_str());
     CRhoFile::renameFile(fDataName.c_str(),dbOldName.c_str());
+    setCryptKey(strCryptKey);
     open( dbOldName, m_strDbVer, false );
 }
 
@@ -614,6 +705,9 @@ void CDBAdapter::close()
 
     m_dbHandle = 0;
     m_strDbPath = String();
+
+    m_ptrCrypt = 0;
+    m_strCryptKey = "";
 }
 
 int CDBAdapter::prepareSqlStatement(const char* szSql, int nByte, sqlite3_stmt **ppStmt)
@@ -668,7 +762,7 @@ DBResultPtr CDBAdapter::executeSQLReportNonUniqueEx( const char* szSt, Vector<St
         bind(res->getStatement(), i+1, arValues.elementAt(i));
 
     res->setReportNonUnique(true);
-    return executeStatement(res);
+    return executeStatement(res, szSt);
 }
 
 DBResultPtr CDBAdapter::executeSQLEx( const char* szSt, Vector<String>& arValues)
@@ -680,7 +774,7 @@ DBResultPtr CDBAdapter::executeSQLEx( const char* szSt, Vector<String>& arValues
     for (int i = 0; i < (int)arValues.size(); i++ )
         bind(res->getStatement(), i+1, arValues.elementAt(i));
 
-    return executeStatement(res);
+    return executeStatement(res, szSt);
 }
 
 DBResultPtr CDBAdapter::executeSQL( const char* szSt)
@@ -689,11 +783,13 @@ DBResultPtr CDBAdapter::executeSQL( const char* szSt)
     if ( res->getStatement() == null )
         return res;
 
-    return executeStatement(res);
+    return executeStatement(res, szSt);
 }
 
-DBResultPtr CDBAdapter::executeStatement(DBResultPtr& res)
+DBResultPtr CDBAdapter::executeStatement(DBResultPtr& res, const char* szSt)
 {
+    //LOG(INFO) + "executeStatement:" + szSt;
+
     int rc = sqlite3_step(res->getStatement());
     if ( rc != SQLITE_ROW )
     {
@@ -749,7 +845,7 @@ void CDBAdapter::endTransaction()
 	m_nTransactionCounter--;
 	if (m_dbHandle && m_nTransactionCounter == 0)
     {
-        getAttrMgr().save(*this);
+        //getAttrMgr().save(*this);
 		rc = sqlite3_exec(m_dbHandle, "END;",0,0,&zErr);
         checkDbError(rc);
     }
@@ -794,6 +890,15 @@ void CDBAdapter::rollback()
     return *getDBPartitions().get(szPartition);
 }
 
+/*static*/ Vector<String> CDBAdapter::getDBAllPartitionNames()
+{
+    Vector<String> vecNames;
+    for (Hashtable<String,CDBAdapter*>::iterator it = m_mapDBPartitions.begin();  it != m_mapDBPartitions.end(); ++it )
+        vecNames.addElement(it->first);
+
+    return vecNames;
+}
+
 /*static*/ boolean CDBAdapter::isAnyInsideTransaction()
 {
     for (Hashtable<String,CDBAdapter*>::iterator it = m_mapDBPartitions.begin();  it != m_mapDBPartitions.end(); ++it )
@@ -805,13 +910,13 @@ void CDBAdapter::rollback()
     return false;
 }
 
-/*static*/ void CDBAdapter::destroy_tables_allpartitions(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables)
+/*static void CDBAdapter::destroy_tables_allpartitions(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables)
 {
     for (Hashtable<String,CDBAdapter*>::iterator it = m_mapDBPartitions.begin();  it != m_mapDBPartitions.end(); ++it )
     {
         it->second->destroy_tables(arIncludeTables, arExcludeTables);
     }
-}
+}*/
 
 /*static*/ db::CDBAdapter& CDBAdapter::getDBByHandle(sqlite3* db)
 {
@@ -907,7 +1012,7 @@ void* rho_db_get_handle(void* pDB)
     rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
     return db.getDbHandle();
 }
-
+/*
 void* rho_db_user_get_handle()
 {
     rho::db::CDBAdapter& db = rho::db::CDBAdapter::getUserDB();
@@ -918,7 +1023,7 @@ void* rho_db_user_get_adapter()
 {
     rho::db::CDBAdapter& db = rho::db::CDBAdapter::getUserDB();
     return &db;
-}
+} */
 
 int rho_db_prepare_statement(void* pDB, const char* szSql, int nByte, sqlite3_stmt **ppStmt)
 {
@@ -949,6 +1054,30 @@ void rho_db_init_attr_manager()
     rho::db::CDBAdapter::initAttrManager();
 }
 
+void rho_sync_update_blob_attribs(const char* szPartition, int source_id)
+{
+    rho::db::CDBAdapter& db = rho::db::CDBAdapter::getDB(szPartition);
+    db.getAttrMgr().loadBlobAttrs(db);
+}
+
+void rho_db_encrypt( const char* szPartition, int nPartLen, int size, unsigned char* data, unsigned char* dataOut )
+{
+    String strPartition(szPartition, nPartLen);
+    rho::db::CDBAdapter& db = rho::db::CDBAdapter::getDB(strPartition.c_str());
+    if ( db.getCrypt() )
+        db.getCrypt()->db_encrypt(strPartition.c_str(), size, data, dataOut);
+    else
+        memcpy(dataOut, data, size);
+}
+
+void rho_db_decrypt( const char* szPartition, int nPartLen, int size, unsigned char* data )
+{
+    String strPartition(szPartition, nPartLen);
+    rho::db::CDBAdapter& db = rho::db::CDBAdapter::getDB( strPartition.c_str() );
+    if ( db.getCrypt() )
+        db.getCrypt()->db_decrypt(strPartition.c_str(), size, data);
+}
+
 }
 
 namespace rho{

data/platform/shared/db/DBAdapter.h

@@ -3,6 +3,7 @@
 #include "DBResult.h"
 #include "DBAttrManager.h"
 #include "logging/RhoLog.h"
+#include "common/IRhoCrypt.h"
 
 namespace rho{
 namespace common{
@@ -36,6 +37,8 @@ class CDBAdapter
     int     m_nTransactionCounter;
     CDBAttrManager m_attrMgr;
     static HashtablePtr<String,CDBAdapter*> m_mapDBPartitions;
+    common::CAutoPtr<common::IRhoCrypt> m_ptrCrypt;
+    String m_strCryptKey;
 
     struct CDBVersion
     {
@@ -68,6 +71,8 @@ public:
     void Unlock();
     boolean isInsideTransaction(){ return m_nTransactionCounter > 0; }
     const String& getDBPath(){ return m_strDbPath; }
+    common::IRhoCrypt* getCrypt(){ return m_ptrCrypt; }
+    void setCryptKey(String& strKey){ m_strCryptKey = strKey; }
 
     static HashtablePtr<String,CDBAdapter*>& getDBPartitions(){ return  m_mapDBPartitions; }
     static void closeAll();
@@ -76,7 +81,8 @@ public:
     static CDBAdapter& getUserDB();
     static CDBAdapter& getDBByHandle(sqlite3* db);
     static CDBAdapter& getDB(const char* szPartition);
-    static void destroy_tables_allpartitions(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables);
+    static Vector<String> getDBAllPartitionNames();
+    //static void destroy_tables_allpartitions(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables);
 
     boolean isTableExist(String strTableName);
     int prepareSqlStatement(const char* szSql, int nByte, sqlite3_stmt **ppStmt);
@@ -112,7 +118,7 @@ public:
         bind(res->getStatement(), 1, p1);
         bind(res->getStatement(), 2, p2);
 
-        return executeStatement(res);
+        return executeStatement(res, szSt);
     }
 
     template<typename T1, typename T2, typename T3>
@@ -126,7 +132,7 @@ public:
         bind(res->getStatement(), 2, p2);
         bind(res->getStatement(), 3, p3);
 
-        return executeStatement(res);
+        return executeStatement(res, szSt);
     }
 
     template<typename T1, typename T2, typename T3, typename T4>
@@ -141,7 +147,7 @@ public:
         bind(res->getStatement(), 3, p3);
         bind(res->getStatement(), 4, p4);
 
-        return executeStatement(res);
+        return executeStatement(res, szSt);
     }
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5>
@@ -157,7 +163,7 @@ public:
         bind(res->getStatement(), 4, p4);
         bind(res->getStatement(), 5, p5);
 
-        return executeStatement(res);
+        return executeStatement(res, szSt);
     }
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
@@ -174,7 +180,7 @@ public:
         bind(res->getStatement(), 5, p5);
         bind(res->getStatement(), 6, p6);
 
-        return executeStatement(res);
+        return executeStatement(res, szSt);
     }
 
     DBResultPtr executeSQLReportNonUniqueEx( const char* szSt, Vector<String>& arValues );
@@ -192,7 +198,26 @@ public:
         bind(res->getStatement(), 4, p4);
 
         res->setReportNonUnique(true);
-        return executeStatement(res);
+        return executeStatement(res, szSt);
+    }
+
+    template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
+    DBResultPtr executeSQLReportNonUnique( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7 )
+    {
+        DBResultPtr res = prepareStatement(szSt);
+        if ( res->getStatement() == null )
+            return res;
+
+        bind(res->getStatement(), 1, p1);
+        bind(res->getStatement(), 2, p2);
+        bind(res->getStatement(), 3, p3);
+        bind(res->getStatement(), 4, p4);
+        bind(res->getStatement(), 5, p5);
+        bind(res->getStatement(), 6, p6);
+        bind(res->getStatement(), 7, p7);
+
+        res->setReportNonUnique(true);
+        return executeStatement(res, szSt);
     }
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
@@ -210,7 +235,7 @@ public:
         bind(res->getStatement(), 6, p6);
         bind(res->getStatement(), 7, p7);
 
-        return executeStatement(res);
+        return executeStatement(res, szSt);
     }
 
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
@@ -229,7 +254,7 @@ public:
         bind(res->getStatement(), 7, p7);
         bind(res->getStatement(), 8, p8);
 
-        return executeStatement(res);
+        return executeStatement(res, szSt);
     }
 
     template<typename T1>
@@ -240,7 +265,7 @@ public:
             return res;
 
         bind(res->getStatement(), 1, p1);
-        return executeStatement(res);
+        return executeStatement(res, szSt);
     }
 
     DBResultPtr executeSQLEx( const char* szSt, Vector<String>& arValues);
@@ -251,12 +276,13 @@ public:
     void endTransaction();
     void rollback();
     void destroy_tables(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables);
-    void setBulkSyncDB(String fDataName);
+    void setBulkSyncDB(String fDataName, String strCryptKey);
 
     void createDeleteTrigger(const String& strTable);
 	
     virtual DBResultPtr prepareStatement( const char* szSt );
-    DBResultPtr executeStatement(common::CAutoPtr<CDBResult>& res);
+    DBResultPtr executeStatement(common::CAutoPtr<CDBResult>& res, const char* szSt);
+    void updateAllAttribChanges();
 	
 private:
 

data/platform/shared/db/DBAttrManager.cpp

@@ -9,7 +9,7 @@
 namespace rho{
 namespace db{
 using namespace rho::common;
-
+/*
 void CDBAttrManager::add( int nSrcID, const char* szAttr )
 {
     synchronized(m_mxSrcAttrs)
@@ -90,8 +90,8 @@ void CDBAttrManager::reset(CDBAdapter& db)
         m_mapSrcAttrs.clear();
         db.executeSQL("UPDATE sources SET source_attribs=?", "" );
     }
-}
-
+}*/
+/*
 #ifndef RHO_NO_RUBY
 unsigned long CDBAttrManager::getAttrsBySrc(int nSrcID)
 {
@@ -115,6 +115,7 @@ unsigned long CDBAttrManager::getAttrsBySrc(int nSrcID)
     }
 }
 #endif //RHO_NO_RUBY
+*/
 
 boolean CDBAttrManager::isBlobAttr(int nSrcID, const char* szAttr)
 {

data/platform/shared/db/DBAttrManager.h

@@ -9,22 +9,22 @@ class CDBAdapter;
 
 class CDBAttrManager
 {
-    common::CMutex m_mxSrcAttrs;
-    HashtablePtr< int, Hashtable<String,int>* > m_mapSrcAttrs;
+    //common::CMutex m_mxSrcAttrs;
+    //HashtablePtr< int, Hashtable<String,int>* > m_mapSrcAttrs;
 
     HashtablePtr< int, Hashtable<String,int>* > m_mapBlobAttrs;
 
     static void loadAttrs(CDBAdapter& db, HashtablePtr< int, Hashtable<String,int>* >& mapAttrs, String strDBAttr);
 public:
-    
+/*    
     void add( int nSrcID, const char* szAttr );
     void remove( int nSrcID, const char* szAttr );
     void save(CDBAdapter& db);
     void load(CDBAdapter& db);
-    void reset(CDBAdapter& db);
-#ifndef RHO_NO_RUBY
-    unsigned long getAttrsBySrc(int nSrcID);
-#endif //RHO_NO_RUBY
+    void reset(CDBAdapter& db);*/
+//#ifndef RHO_NO_RUBY
+//    unsigned long getAttrsBySrc(int nSrcID);
+//#endif //RHO_NO_RUBY
     boolean isBlobAttr(int nSrcID, const char* szAttr);
     boolean isOverwriteBlobFromServer(int nSrcID, const String& strAttr);
     void loadBlobAttrs(CDBAdapter& db);

data/platform/shared/db/res/db/syncdb.triggers

@@ -8,8 +8,3 @@ CREATE TRIGGER rhoupdateTrigger BEFORE UPDATE ON object_values FOR EACH ROW WHEN
        SELECT rhoOnUpdateObjectRecord(OLD.value, OLD.source_id, OLD.attrib );
    END;
 ;   
-CREATE TRIGGER rhoinsertTrigger AFTER INSERT ON object_values FOR EACH ROW 
-   BEGIN 
-       SELECT rhoOnInsertObjectRecord( NEW.source_id, NEW.attrib );
-   END;
-;

data/platform/shared/db/res/db/syncdb_java.triggers

@@ -0,0 +1,21 @@
+CREATE TABLE object_attribs_to_delete(
+ "source_id" BIGINT default NULL,
+ "attrib" varchar(255) default NULL,
+ "object" varchar(255) default NULL,
+ "value" varchar default NULL);
+CREATE TABLE object_attribs_to_update(
+ "source_id" BIGINT default NULL,
+ "attrib" varchar(255) default NULL,
+ "object" varchar(255) default NULL,
+ "value" varchar default NULL);
+ 
+CREATE TRIGGER rhodeleteTrigger BEFORE DELETE ON object_values FOR EACH ROW 
+   BEGIN 
+       INSERT INTO object_attribs_to_delete(source_id, attrib, value) VALUES (OLD.source_id, OLD.attrib, OLD.value);   
+   END;
+;
+CREATE TRIGGER rhoupdateTrigger BEFORE UPDATE ON object_values FOR EACH ROW WHEN NEW.value != OLD.value
+   BEGIN 
+       INSERT INTO object_attribs_to_update(source_id, attrib, value) VALUES (OLD.source_id, OLD.attrib, OLD.value);
+   END;
+;   

data/platform/shared/json/JSONIterator.cpp

@@ -231,6 +231,16 @@ uint64 CJSONEntry::getUInt64(const char* name)
     return nRes;
 }
 
+double CJSONEntry::getDouble(const char* name)
+{
+    double res = 0;
+    struct json_object* obj = json_object_object_get(m_object, const_cast<char*>(name));
+    if (obj != 0)
+        res = json_object_get_double(obj);
+
+    return res;
+}
+
 /*
 uint64 CJSONEntry::getUInt64(const char* name)
 {
@@ -316,4 +326,4 @@ extern "C" VALUE rho_json_quote_value(VALUE v,VALUE str)
 
     return rho_ruby_create_string(strRes.c_str());
 }
-#endif //RHO_NO_RUBY
+#endif //RHO_NO_RUBY

data/platform/shared/json/JSONIterator.h

@@ -26,6 +26,7 @@ public:
 
     int getInt(const char* name);
     uint64 getUInt64(const char* name);
+    double getDouble(const char* name);
     const char* getString(const char* name);
     const char* getString();
 

data/platform/shared/logging/RhoLogConf.cpp

@@ -6,7 +6,7 @@
 #include "common/RhoConf.h"
 #ifndef RHO_NO_RUBY
 #include "ruby/ext/rho/rhoruby.h"
-#endif /RHO_NO_RUBY
+#endif //RHO_NO_RUBY
 
 namespace rho{
 common::CMutex LogSettings::m_FlushLock;
@@ -62,17 +62,15 @@ int LogSettings::getLogTextPos()
 }
 
 void LogSettings::saveToFile(){
-    RHOCONF().setInt("MinSeverity", getMinSeverity() );
-    RHOCONF().setBool("LogToOutput", isLogToOutput() );
-    RHOCONF().setBool("LogToFile", isLogToFile() );
+    RHOCONF().setInt("MinSeverity", getMinSeverity(), true );
+    RHOCONF().setBool("LogToOutput", isLogToOutput(), true );
+    RHOCONF().setBool("LogToFile", isLogToFile(), true );
 #if !defined(OS_MACOSX)	
-    RHOCONF().setString("LogFilePath", getLogFilePath() );
+    RHOCONF().setString("LogFilePath", getLogFilePath(), true );
 #endif
-    RHOCONF().setInt("MaxLogFileSize", getMaxLogFileSize() );
-    RHOCONF().setString("LogCategories", getEnabledCategories() );
-    RHOCONF().setString("ExcludeLogCategories", getDisabledCategories() );
-
-    RHOCONF().saveToFile();
+    RHOCONF().setInt("MaxLogFileSize", getMaxLogFileSize(), true );
+    RHOCONF().setString("LogCategories", getEnabledCategories(), true );
+    RHOCONF().setString("ExcludeLogCategories", getDisabledCategories(), true );
 }
 
 void LogSettings::loadFromConf(rho::common::RhoSettings& oRhoConf){
@@ -162,6 +160,8 @@ void LogSettings::setDisabledCategories( const char* szCatList ){
 }
 
 extern "C" {
+using namespace rho;
+using namespace rho::common;
 
 void rho_logconf_Init(const char* szRootPath){
 
@@ -236,8 +236,7 @@ void rho_logconf_freeString(char* str) {
 // RhoConf.set_property_by_name
 void rho_conf_set_property_by_name(char* name, char* value)
 {
-	rho_conf_setString(name, value);
-	rho_conf_save();
+	RHOCONF().setString(name, value, true);
 
     LOGCONF().loadFromConf(RHOCONF());
 }
@@ -255,6 +254,24 @@ VALUE rho_conf_get_property_by_name(char* name)
     return rho_ruby_create_string(szValue);
 }
 
+VALUE rho_conf_get_conflicts()
+{
+    CHoldRubyValue hashConflicts(rho_ruby_createHash());
+
+    HashtablePtr<String,Vector<String>* >& mapConflicts = RHOCONF().getConflicts();
+    for ( HashtablePtr<String,Vector<String>* >::iterator it=mapConflicts.begin() ; it != mapConflicts.end(); it++ ) 
+    {
+        Vector<String>& values = *(it->second);
+        CHoldRubyValue arValues(rho_ruby_create_array());
+        for( int i = 0; i < (int)values.size(); i++)
+            rho_ruby_add_to_array(arValues, rho_ruby_create_string(values.elementAt(i).c_str()) );
+
+        addHashToHash(hashConflicts, it->first.c_str(), arValues);
+    }
+
+    return hashConflicts;
+}
+
 VALUE rho_conf_read_log(int limit)
 {
     VALUE res = rho_ruby_create_string("");