rhodes 2.0.3 → 2.1.0

data/platform/shared/db/DBAdapter.cpp

@@ -5,7 +5,10 @@
 #include "common/RhoFilePath.h"
 #include "common/RhoConf.h"
 #include "common/RhodesApp.h"
+#include "common/RhoAppAdapter.h"
+#ifndef RHO_NO_RUBY 
 #include "ruby/ext/rho/rhoruby.h"
+#endif //RHO_NO_RUBY
 
 namespace rho{
 namespace db{
@@ -13,6 +16,7 @@ IMPLEMENT_LOGCLASS(CDBAdapter,"DB");
 HashtablePtr<String,CDBAdapter*> CDBAdapter::m_mapDBPartitions;
 
 using namespace rho::common;
+using namespace rho;	
 
 static int onDBBusy(void* data,int nTry)
 {
@@ -31,7 +35,7 @@ void SyncBlob_DeleteCallback(sqlite3_context* dbContext, int nArgs, sqlite3_valu
     int nSrcID = sqlite3_value_int(*(ppArgs+1));
     if ( attrMgr.isBlobAttr(nSrcID, szAttrName) )
     {
-        String strFilePath = RHODESAPP().resolveDBFilesPath((char*)sqlite3_value_text(*(ppArgs)));
+        String strFilePath = RHODESAPPBASE().resolveDBFilesPath((char*)sqlite3_value_text(*(ppArgs)));
         CRhoFile::deleteFile(strFilePath.c_str());
     }
 
@@ -49,14 +53,14 @@ void SyncBlob_UpdateCallback(sqlite3_context* dbContext, int nArgs, sqlite3_valu
     int nSrcID = sqlite3_value_int(*(ppArgs+1));
     if ( attrMgr.isBlobAttr(nSrcID, szAttrName) )
     {
-        String strFilePath = RHODESAPP().resolveDBFilesPath((char*)sqlite3_value_text(*(ppArgs)));
+        String strFilePath = RHODESAPPBASE().resolveDBFilesPath((char*)sqlite3_value_text(*(ppArgs)));
         CRhoFile::deleteFile(strFilePath.c_str());
     }
 }
 
 void SyncBlob_DeleteSchemaCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs)
 {
-    CDBAttrManager& attrMgr = CDBAdapter::getDBByHandle(sqlite3_context_db_handle(dbContext)).getAttrMgr();
+    //CDBAttrManager& attrMgr = CDBAdapter::getDBByHandle(sqlite3_context_db_handle(dbContext)).getAttrMgr();
     //TODO: SyncBlob_DeleteSchemaCallback
     //TODO: add to reset - set callback
 }
@@ -90,7 +94,7 @@ boolean CDBAdapter::checkDbErrorEx(int rc, rho::db::CDBResult& res)
     const char * szErrMsg = sqlite3_errmsg(m_dbHandle);
     int nErrCode = sqlite3_errcode(m_dbHandle);
 
-    res.setErrorCode(nErrCode);
+    res.getDBError().setError(nErrCode, szErrMsg);
     if ( nErrCode == SQLITE_CONSTRAINT && res.getReportNonUnique() )
         return true;
 
@@ -100,9 +104,10 @@ boolean CDBAdapter::checkDbErrorEx(int rc, rho::db::CDBResult& res)
 
 void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
 {
-    LOG(INFO) + "Open DB: " + strDbPath;
     if ( strcasecmp(strDbPath.c_str(),m_strDbPath.c_str() ) == 0 )
         return;
+
+    LOG(INFO) + "Open DB: " + strDbPath;
     close();
 
     m_strDbPath = strDbPath;
@@ -218,7 +223,7 @@ void CDBAdapter::checkDBVersion(String& strRhoDBVer)
         CRhoFile::deleteFile(m_strDbPath.c_str());
         CRhoFile::deleteFile((m_strDbPath+"-journal").c_str());
 
-        CRhoFile::deleteFilesInFolder(RHODESAPP().getBlobsDirPath().c_str());
+        CRhoFile::deleteFilesInFolder(RHODESAPPBASE().getBlobsDirPath().c_str());
 
         writeDBVersion( CDBVersion(strRhoDBVer, strAppDBVer) );
 	}
@@ -381,7 +386,7 @@ void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables,
     String dbOldName = m_strDbPath;
     close();
 
-    CRhoFile::deleteFilesInFolder(RHODESAPP().getBlobsDirPath().c_str());
+    CRhoFile::deleteFilesInFolder(RHODESAPPBASE().getBlobsDirPath().c_str());
 
     CRhoFile::deleteFile(dbOldName.c_str());
     CRhoFile::renameFile(dbNewName.c_str(),dbOldName.c_str());
@@ -439,16 +444,29 @@ void CDBAdapter::setBulkSyncDB(String fDataName)
     String dbOldName = m_strDbPath;
     close();
 
-    CRhoFile::deleteFilesInFolder(RHODESAPP().getBlobsDirPath().c_str());
+    CRhoFile::deleteFilesInFolder(RHODESAPPBASE().getBlobsDirPath().c_str());
 
     CRhoFile::deleteFile(dbOldName.c_str());
     CRhoFile::renameFile(fDataName.c_str(),dbOldName.c_str());
     open( dbOldName, m_strDbVer, false );
 }
 
-void CDBAdapter::createSchema()
+void CDBAdapter::executeBatch(const char* szSql, CDBError& error)
 {
     char* errmsg = 0;
+    int rc = sqlite3_exec(m_dbHandle, szSql,  NULL, NULL, &errmsg);
+	
+    if ( rc != SQLITE_OK )
+        LOG(ERROR)+"execute batch failed. Error code: " + rc + ";Message: " + (errmsg ? errmsg : "");
+	
+	error.setError(rc, errmsg);
+	
+    if ( errmsg )
+        sqlite3_free(errmsg);
+}
+	
+void CDBAdapter::createSchema()
+{
     CFilePath oPath(m_strDbPath);
 
     String strSqlScript;
@@ -460,15 +478,10 @@ void CDBAdapter::createSchema()
         return;
     }
 
-    int rc = sqlite3_exec(m_dbHandle, strSqlScript.c_str(),  NULL, NULL, &errmsg);
-
-    if ( rc != SQLITE_OK )
-        LOG(ERROR)+"createSchema failed. Error code: " + rc + ";Message: " + (errmsg ? errmsg : "");
-
-    if ( errmsg )
-        sqlite3_free(errmsg);
-
-    if ( rc == SQLITE_OK )
+	CDBError dbError;
+	executeBatch(strSqlScript.c_str(), dbError);
+	
+    if ( dbError.isOK() )
         createTriggers();
 }
 
@@ -502,7 +515,7 @@ String strTrigger = String("CREATE TRIGGER rhodeleteSchemaTrigger BEFORE DELETE
 "       SELECT rhoOnDeleteRecord( OLD );"
 "   END;"
 ";";
-    char* errmsg = 0;
+    //char* errmsg = 0;
     //TODO: createDeleteTrigger
 /*    int rc = sqlite3_exec(m_dbHandle, strTrigger.c_str(),  NULL, NULL, &errmsg);
 
@@ -535,7 +548,7 @@ int CDBAdapter::prepareSqlStatement(const char* szSql, int nByte, sqlite3_stmt *
     {
         rc = sqlite3_prepare_v2(m_dbHandle, szSql, nByte, ppStmt, NULL);
         if ( rc == SQLITE_OK )
-            m_mapStatements.put(szSql, st);
+            m_mapStatements.put(szSql, *ppStmt);
     }
 
     return rc;
@@ -714,6 +727,14 @@ void CDBAdapter::rollback()
     return false;
 }
 
+/*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)
 {
     for (Hashtable<String,CDBAdapter*>::iterator it = m_mapDBPartitions.begin();  it != m_mapDBPartitions.end(); ++it )
@@ -742,7 +763,7 @@ int rho_db_open(const char* szDBPath, const char* szDBPartition, void** ppDB)
         CDBAdapter::getDBPartitions().put(szDBPartition, pDB);
     }
 
-    rho::String strVer = RhoRuby_getRhoDBVersion(); 
+    rho::String strVer = RhoAppAdapter.getRhoDBVersion(); 
     pDB->open(szDBPath,strVer, false);
 
     *ppDB = pDB;
@@ -787,6 +808,7 @@ string_iter(const char* szVal, void* par)
     ar.addElement(szVal);
 }
 
+#ifndef RHO_NO_RUBY
 int rho_db_destroy_tables(void* pDB, unsigned long arInclude, unsigned long arExclude)
 {
     rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
@@ -800,6 +822,7 @@ int rho_db_destroy_tables(void* pDB, unsigned long arInclude, unsigned long arEx
     db.destroy_tables(arIncludeTables,arExcludeTables);
     return 0;
 }
+#endif //RHO_NO_RUBY
 
 void* rho_db_get_handle(void* pDB)
 {
@@ -853,6 +876,7 @@ void rho_db_init_attr_manager()
 namespace rho{
 namespace common{
 
+#ifndef RHO_NO_RUBY
 CRubyMutex::CRubyMutex(boolean bIgnore) : m_nLockCount(0), m_valThread(0), m_valMutex(null)
 {
     if ( !bIgnore )
@@ -890,7 +914,7 @@ void CRubyMutex::Lock()
 
 void CRubyMutex::Unlock()
 {
-    if ( m_valMutex == null )
+    if ( m_valMutex == null || m_nLockCount == 0)
         return;
 
     m_nLockCount--;
@@ -900,6 +924,28 @@ void CRubyMutex::Unlock()
         rho_ruby_unlock_mutex(m_valMutex);
     }
 }
+#else //RHO_NO_RUBY
+CRubyMutex::CRubyMutex(boolean bIgnore) : m_nLockCount(0), m_valThread(0), m_valMutex(null)
+{
+}
+
+CRubyMutex::~CRubyMutex()
+{
+}
+
+boolean CRubyMutex::isMainRubyThread()
+{
+    return true;
+}
+
+void CRubyMutex::Lock()
+{
+}
+
+void CRubyMutex::Unlock()
+{
+}
 
+#endif //RHO_NO_RUBY
 }
 }

data/platform/shared/db/DBAdapter.h

@@ -76,6 +76,7 @@ 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);
 
     boolean isTableExist(String strTableName);
     int prepareSqlStatement(const char* szSql, int nByte, sqlite3_stmt **ppStmt);
@@ -212,6 +213,25 @@ public:
         return executeStatement(res);
     }
 
+    template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
+    DBResultPtr executeSQL( const char* szSt, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8 )
+    {
+        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);
+        bind(res->getStatement(), 8, p8);
+
+        return executeStatement(res);
+    }
+
     template<typename T1>
     DBResultPtr executeSQL( const char* szSt, T1 p1)
     {
@@ -225,7 +245,8 @@ public:
 
     DBResultPtr executeSQLEx( const char* szSt, Vector<String>& arValues);
     DBResultPtr executeSQL( const char* szSt);
-
+	void        executeBatch(const char* szSql, CDBError& error);
+	
     void startTransaction();
     void endTransaction();
     void rollback();
@@ -233,8 +254,11 @@ public:
     void setBulkSyncDB(String fDataName);
 
     void createDeleteTrigger(const String& strTable);
-private:
+	
+    virtual DBResultPtr prepareStatement( const char* szSt );
     DBResultPtr executeStatement(common::CAutoPtr<CDBResult>& res);
+	
+private:
 
     void checkDBVersion(String& strVer);
     CDBVersion readDBVersion();//throws Exception
@@ -245,8 +269,6 @@ private:
     boolean checkDbErrorEx(int rc, rho::db::CDBResult& res);
     sqlite3_stmt* createInsertStatement(rho::db::CDBResult& res, const String& tableName, CDBAdapter& db, String& strInsert);
 
-    virtual DBResultPtr prepareStatement( const char* szSt );
-
     boolean migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer, const String& strAppDBVer);
     void copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbTo);
 };
@@ -254,4 +276,13 @@ private:
 }
 }
 
-extern "C" void rho_db_init_attr_manager();
+#ifdef __cplusplus
+extern "C" {
+#endif //__cplusplus
+
+void rho_db_init_attr_manager();
+int rho_db_open(const char* szDBPath, const char* szDBPartition, void** ppDB);
+
+#ifdef __cplusplus
+};
+#endif //__cplusplus

data/platform/shared/db/DBAttrManager.cpp

@@ -2,7 +2,9 @@
 #include "DBAdapter.h"
 #include "common/StringConverter.h"
 #include "common/Tokenizer.h"
+#ifndef RHO_NO_RUBY
 #include "ruby/ext/rho/rhoruby.h"
+#endif //RHO_NO_RUBY
 
 namespace rho{
 namespace db{
@@ -90,6 +92,7 @@ void CDBAttrManager::reset(CDBAdapter& db)
     }
 }
 
+#ifndef RHO_NO_RUBY
 unsigned long CDBAttrManager::getAttrsBySrc(int nSrcID)
 {
     synchronized(m_mxSrcAttrs)
@@ -111,6 +114,7 @@ unsigned long CDBAttrManager::getAttrsBySrc(int nSrcID)
         return arRes;
     }
 }
+#endif //RHO_NO_RUBY
 
 boolean CDBAttrManager::isBlobAttr(int nSrcID, const char* szAttr)
 {

data/platform/shared/db/DBAttrManager.h

@@ -22,8 +22,9 @@ public:
     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
     boolean isBlobAttr(int nSrcID, const char* szAttr);
     boolean isOverwriteBlobFromServer(int nSrcID, const String& strAttr);
     void loadBlobAttrs(CDBAdapter& db);

data/platform/shared/db/DBResult.cpp

@@ -7,7 +7,7 @@ namespace db{
 CDBResult::CDBResult(sqlite3_stmt* st,CDBAdapter* pDB) : m_pDB(pDB), m_dbStatement(st)
 {
     m_bReportNonUnique=false;
-    m_nErrorCode=0;
+    //m_nErrorCode=0;
 
     if ( m_pDB )
         m_pDB->Lock();
@@ -16,7 +16,7 @@ CDBResult::CDBResult(sqlite3_stmt* st,CDBAdapter* pDB) : m_pDB(pDB), m_dbStateme
 CDBResult::CDBResult() : m_pDB(null), m_dbStatement(null)
 {
     m_bReportNonUnique=false;
-    m_nErrorCode=0;
+    //m_nErrorCode=0;
 }
 
 CDBResult::~CDBResult(void)

data/platform/shared/db/DBResult.h

@@ -9,12 +9,30 @@ namespace rho{
 namespace db{
 
 class CDBAdapter;
+	
+class CDBError
+{
+	int m_rc;
+	String m_strError;
+		
+public:
+	CDBError() : m_rc(SQLITE_OK){}
+	
+	void setError( int rc, const char* szError){ m_rc = rc; m_strError = szError ? szError : ""; }
+	boolean isOK(){ return m_rc == SQLITE_OK; }
+	boolean isSuccessfulCode(){return m_rc == SQLITE_OK || m_rc == SQLITE_ROW || m_rc == SQLITE_DONE; }
+		
+	int getCode(){ return m_rc;}
+	const String& getError(){ return m_strError;}
+};	
+	
 class CDBResult
 {
     CDBAdapter* m_pDB;
     sqlite3_stmt* m_dbStatement;
     boolean m_bReportNonUnique;
-    int     m_nErrorCode;
+    CDBError m_dbError;
+	
 public:
     CDBResult(sqlite3_stmt* st,CDBAdapter* pDB);
     CDBResult();
@@ -24,10 +42,12 @@ public:
     sqlite3_stmt* getStatement(){ return m_dbStatement; }
     boolean getReportNonUnique(){ return m_bReportNonUnique; }
     void setReportNonUnique(boolean bSet){ m_bReportNonUnique = bSet; }
-    boolean isNonUnique(){ return m_nErrorCode==SQLITE_CONSTRAINT; }
-    boolean isError(){ return m_nErrorCode!=SQLITE_OK; }
-    int     getErrorCode(){ return m_nErrorCode; }
-    void    setErrorCode(int nError){ m_nErrorCode=nError; }
+    boolean isNonUnique(){ return m_dbError.getCode()==SQLITE_CONSTRAINT; }
+	
+	CDBError& getDBError(){ return m_dbError; }
+//    boolean isError(){ return m_dbError.getCode()!=SQLITE_OK; }
+//    int     getErrorCode(){ return m_dbError.getCode(); }
+//    void    setErrorCode(int nError){ m_nErrorCode=nError; }
 
     virtual bool isEnd(){ return m_dbStatement == null; }
     void next()

data/platform/shared/json/JSONIterator.cpp

@@ -1,8 +1,9 @@
 #include "JSONIterator.h"
 
 #include "json/json.h"
+#ifndef RHO_NO_RUBY
 #include "ruby/ext/rho/rhoruby.h"
-
+#endif //RHO_NO_RUBY
 #if defined(OS_WINCE) || defined (OS_WINDOWS)
 #define rho_atoi64 _atoi64
 #elif defined(OS_SYMBIAN)
@@ -303,10 +304,11 @@ CJSONEntry CJSONEntry::getEntry(const char* name)const
 
 }
 }
-
+#ifndef RHO_NO_RUBY
 extern "C" VALUE rho_json_quote_value(VALUE v,VALUE str)
 {
     rho::String strRes = rho::json::CJSONEntry::quoteValue(getStringFromValue(str));
 
     return rho_ruby_create_string(strRes.c_str());
 }
+#endif //RHO_NO_RUBY

data/platform/shared/json/RJSONTokener.c

@@ -113,6 +113,7 @@ VALUE rjson_tokener_parse(const char *str, char** pszError)
   }
 
   rjson_tokener_free(tok);
+
   return (VALUE)obj;
 }
 
@@ -168,6 +169,15 @@ void rjson_object_object_add(struct json_object* hash, const char *key,
 extern char* strndup(const char* str, size_t n);
 #endif
 
+void _release_values(struct json_tokener *tok)
+{
+  int n = 0;
+  for ( ; n < JSON_TOKENER_MAX_DEPTH; n++ )
+  {
+    if ( tok->stack[n].current )
+        rho_ruby_releaseValue((VALUE)tok->stack[n].current);
+  }
+}
 
 #define state  tok->stack[tok->depth].state
 #define saved_state  tok->stack[tok->depth].saved_state
@@ -180,7 +190,6 @@ struct json_object* rjson_tokener_parse_ex(struct json_tokener *tok,
   struct json_object *obj = NULL;
   char c;
   int bRoot = 0;
-  VALUE root_item = 0;
 
   tok->char_offset = 0;
   tok->err = json_tokener_success;
@@ -217,25 +226,19 @@ struct json_object* rjson_tokener_parse_ex(struct json_tokener *tok,
       case '{':
 	state = json_tokener_state_eatws;
 	saved_state = json_tokener_state_object_field_start;
-    bRoot = current == 0 && tok->depth == 0;
+    bRoot = current == 0;
 	current = rjson_object_new_object();
     if (bRoot)
-    {
-        root_item = (VALUE)current;
-        rho_ruby_holdValue(root_item);
-    }
+        rho_ruby_holdValue((VALUE)current);
 
 	break;
       case '[':
 	state = json_tokener_state_eatws;
 	saved_state = json_tokener_state_array;
-    bRoot = current == 0 && tok->depth == 0;
+    bRoot = current == 0;
 	current = rjson_object_new_array();
     if (bRoot)
-    {
-        root_item = (VALUE)current;
-        rho_ruby_holdValue(root_item);
-    }
+        rho_ruby_holdValue((VALUE)current);
 
 	break;
       case 'N':
@@ -575,8 +578,8 @@ struct json_object* rjson_tokener_parse_ex(struct json_tokener *tok,
 
  out:
 
-  if (root_item);
-    rho_ruby_releaseValue((VALUE)root_item);
+  //if (root_item)
+  _release_values(tok);
 
   if(tok->err == json_tokener_success) 
       return rjson_object_get(current);

data/platform/shared/logging/RhoLog.cpp

@@ -37,7 +37,7 @@ void LogMessage::addPrefix(const char* file, int line){
     else
         *this + LogSeverityNames[m_severity][0];
 
-    *this + " " + common::CLocalTime().toString(false) + ' ' +
+    *this + " " + common::CLocalTime().toString(true) + ' ' +
         LOGFMT("%08x") + common::CSystem().getThreadID() + ' ';
     
     if ( m_category.isEmpty() )

data/platform/shared/logging/RhoLogConf.cpp

@@ -4,6 +4,9 @@
 #include "common/RhoFile.h"
 #include "common/RhoFilePath.h"
 #include "common/RhoConf.h"
+#ifndef RHO_NO_RUBY
+#include "ruby/ext/rho/rhoruby.h"
+#endif /RHO_NO_RUBY
 
 namespace rho{
 common::CMutex LogSettings::m_FlushLock;
@@ -227,4 +230,13 @@ void rho_conf_set_property_by_name(char* name, char* value)
     LOGCONF().loadFromConf(RHOCONF());
 }
 
+#ifndef RHO_NO_RUBY
+VALUE rho_conf_get_property_by_name(char* name)
+{
+	char* szValue = rho_conf_getString(name);
+
+    return rho_ruby_create_string(szValue);
+}
+#endif //RHO_NO_RUBY
+
 }