rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/common/RhodesApp.h

@@ -6,12 +6,10 @@
 #include "common/RhoThread.h"
 #include "net/INetRequest.h"
 #include "common/IRhoClassFactory.h"
-#if defined(RHO_HTTPD_COMMON_IMPL)
 #include "net/HttpServer.h"
-#endif
 #include "rubyext/GeoLocation.h"
 #include "SplashScreen.h"
-
+#include "AppMenu.h"
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhodesApp"
 
@@ -35,25 +33,27 @@ private:
     common::CAutoPtr<net::INetRequest> m_NetRequest;
 
     String m_strListeningPorts;
-#if !defined(RHO_HTTPD_COMMON_IMPL)
-    struct shttpd_ctx * m_shttpdCtx;
-#else
     common::CAutoPtr<net::CHttpServer> m_httpServer;
-#endif
-    String m_strRhoRootPath, m_strLoadingPagePath, m_strLoadingPngPath, m_strBlobsDirPath;
+    String m_strRhoRootPath, m_strLoadingPagePath, m_strLoadingPngPath, m_strBlobsDirPath, m_strDBDirPath;
     String m_strHomeUrl, m_strStartUrl, m_strOptionsUrl, m_strRhobundleReloadUrl, m_strFirstStartUrl;
     String m_strRhoMessage;
 
     int m_currentTabIndex;
     String m_currentUrls[5];
 
-    common::CMutex m_mxViewMenuItems;
-    Hashtable<String,String> m_hashViewMenuItems;
     String m_strAppBackUrl;
     Vector<ICallbackObject*> m_arCallbackObjects;
     rubyext::CGeoLocation m_oGeoLocation;
     CSplashScreen m_oSplashScreen;
 
+    common::CMutex m_mxPushCallback;
+    String m_strPushCallback, m_strPushCallbackParams;
+	
+    common::CMutex m_mxScreenRotationCallback;
+    String m_strScreenRotationCallback, m_strScreenRotationCallbackParams;
+
+    CAppMenu m_oAppMenu;
+	
 public:
     ~CRhodesApp(void);
 
@@ -66,6 +66,7 @@ public:
     String canonicalizeRhoUrl(const String& strUrl) ;
     void  keepLastVisitedUrl(String strUrl);
     void navigateToUrl( const String& strUrl);
+    void navigateBack();
 
     const String& getRhobundleReloadUrl();
     const String& getStartUrl();
@@ -77,17 +78,20 @@ public:
 	const String& getLoadingPngPath(){return m_strLoadingPngPath;}
     const String& getLoadingPagePath(){return m_strLoadingPagePath; }
     const String& getBlobsDirPath(){return m_strBlobsDirPath; }
+    const String& getDBDirPath(){return m_strDBDirPath; }
+    String resolveDBFilesPath(const String& strFilePath);
     const String& getRhoRootPath(){return m_strRhoRootPath;}
 
     const String& getAppBackUrl(){return m_strAppBackUrl;}
+    void setAppBackUrl(const String& url);
 
     void callCameraCallback(String strCallbackUrl, const String& strImagePath, const String& strError, boolean bCancel );
     void callDateTimeCallback(String strCallbackUrl, long lDateTime, const char* szData, int bCancel );
     void callAppActiveCallback(boolean bActive);
+    void callPopupCallback(String strCallbackUrl, const String &id, const String &title);
 
-    void setViewMenu(unsigned long valMenu);
-    void addViewMenuItem( const String& strLabel, const String& strLink );
-
+    CAppMenu& getAppMenu (void) { return m_oAppMenu; }
+	
     boolean sendLog();
 
     String addCallbackObject(ICallbackObject* pCallbackObject, String strName);
@@ -99,6 +103,15 @@ public:
     CSplashScreen& getSplashScreen(){return m_oSplashScreen;}
 
     void runCallbackInThread(const String& strCallback, const String& strBody);
+
+    void setPushNotification(String strUrl, String strParams );
+    boolean callPushCallback(String strData);
+	
+    void setScreenRotationNotification(String strUrl, String strParams);
+    void callScreenRotationCallback(int width, int height, int degrees);
+
+    void loadUrl(String url);
+
 private:
     virtual void run();
 
@@ -140,6 +153,8 @@ void rho_http_redirect(void* httpContext, const char* szUrl);
 void rho_http_senderror(void* httpContext, int nError, const char* szMsg);
 void rho_http_sendresponse(void* httpContext, const char* szBody);
 int	rho_http_snprintf(char *buf, size_t buflen, const char *fmt, ...);
+
+void rho_rhodesapp_navigate_back();
 	
 char* rho_http_normalizeurl(const char* szUrl);
 void rho_http_free(void* data);
@@ -152,6 +167,12 @@ unsigned long rho_rhodesapp_GetCallbackObject(int nIndex);
 
 void rho_rhodesapp_setViewMenu(unsigned long valMenu);
 const char* rho_rhodesapp_getappbackurl();
+
+int rho_rhodesapp_callPushCallback(const char* szData);
+
+void rho_rhodesapp_callScreenRotationCallback(int width, int height, int degrees);
+void rho_rhodesapp_callPopupCallback(const char *strCallbackUrl, const char *id, const char *title);
+
 int rho_conf_send_log();
 
 int rho_base64_encode(const char *src, int srclen, char *dst);
@@ -159,6 +180,8 @@ int rho_base64_decode(const char *src, int srclen, char *dst);
 
 void rho_net_request(const char *url);
 
+void rho_rhodesapp_load_url(const char *url);
+
 #ifdef __cplusplus
 };
 #endif //__cplusplus

data/platform/shared/common/SplashScreen.cpp

@@ -44,7 +44,7 @@ void CSplashScreen::init()
 	CTokenizer stringtokenizer(strSplash, ";");
 	while (stringtokenizer.hasMoreTokens()) {
 		String tok = stringtokenizer.nextToken();
-		tok = trim(tok);
+		tok = String_trim(tok);
 		if (tok.length() == 0) {
 			continue;
 		}
@@ -55,7 +55,7 @@ void CSplashScreen::init()
 			if (nEq>=0)
 			{
 				String val = tok.substr(nEq+1);
-				val = trim(val);
+				val = String_trim(val);
 				if ( val.length() > 0 )
                     convertFromStringA( val.c_str(), m_nDelay );
 			}

data/platform/shared/common/StringConverter.h

@@ -11,10 +11,10 @@ namespace common{
 #define convertFromString convertFromStringA
 #define convertToString convertToStringA
 #endif
-
+*/
 template<typename T>  inline void convertFromStringW( const wchar_t* szValue, T& value ){ value = szValue; }
 template<typename T>  inline StringW convertToStringW( const T& value ){ return value; }
-*/
+
 
 template<typename T>  inline void convertFromStringA( const char* szValue, T& value ){ value = szValue; }
 template<typename T>  inline String convertToStringA( const T& value ){ return value; }
@@ -70,7 +70,7 @@ inline StringW convertToStringW( const String& str )
 
 /*template<>  inline void convertFromStringA<StringW>( const char* szValue, StringW& value ){ value = StringW(szValue); }
 template<>  inline String convertToStringA<StringW>( const StringW& value ){ return String(value); }
-
+*/
 #define CONVERT_TYPE_W( Type, Fmt ) \
 template<> inline void convertFromStringW<Type>( const wchar_t* szValue, Type& value )\
 { swscanf( szValue, Fmt, &value ); }\
@@ -80,7 +80,6 @@ template<> inline StringW convertToStringW<Type>( const Type& value )\
     swprintf( buf, Fmt, value );\
     return StringW(buf);\
 }
-*/
 
 #define CONVERT_TYPE_A( Type, Fmt ) \
 template<> inline void convertFromStringA<Type>( const char* szValue, Type& value )\
@@ -91,21 +90,21 @@ template<> inline String convertToStringA<Type>( const Type& value )\
     sprintf( buf, Fmt, value );\
     return String(buf);\
 }
-/*
+
+#if defined(OS_WINDOWS) || defined (OS_WINCE)
 CONVERT_TYPE_W( unsigned int, L"%u" );
 CONVERT_TYPE_W( int, L"%d" );
-CONVERT_TYPE_W( unsigned long, L"%u" );
+CONVERT_TYPE_W( unsigned long, L"%lu" );
 CONVERT_TYPE_W( long, L"%d" );
-CONVERT_TYPE_W( wchar_t, L"%c" );
+CONVERT_TYPE_W( wchar_t, L"%lc" );
 CONVERT_TYPE_W( char, L"%c" );
 CONVERT_TYPE_W( unsigned char, L"%c" );
-CONVERT_TYPE_W( short, L"%d" );
+CONVERT_TYPE_W( short, L"%hd" );
 //CONVERT_TYPE_W( unsigned short, _T("%u") );
 CONVERT_TYPE_W( bool, L"%d" );
 CONVERT_TYPE_W( float, L"%f" );
-CONVERT_TYPE_W( double, L"%f" );
-*/
-
+CONVERT_TYPE_W( double, L"%lf" );
+#endif
 CONVERT_TYPE_A( unsigned int, "%u" );
 CONVERT_TYPE_A( int, "%d" );
 CONVERT_TYPE_A( unsigned long, "%lu" );

data/platform/shared/common/rhoparams.c

@@ -1,16 +1,10 @@
 #include "common/rhoparams.h"
-
 #include "common/RhoPort.h"
 
-#include "logging/RhoLog.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#undef DEFAULT_LOGCATEGORY
-#define DEFAULT_LOGCATEGORY "Alert"
-
 rho_param *rho_param_str(char *s)
 {
     rho_param *ret = (rho_param *)malloc(sizeof(rho_param));

data/platform/shared/curl/lib/rhossl.c

@@ -59,7 +59,7 @@
 
 extern void * rho_ssl_create_storage();
 extern void rho_ssl_free_storage(void *);
-extern CURLcode rho_ssl_connect(int sockfd, int nonblocking, int *done, void *storage);
+extern CURLcode rho_ssl_connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage);
 extern void rho_ssl_shutdown(void *storage);
 extern ssize_t rho_ssl_send(const void *mem, size_t len, void *storage);
 extern ssize_t rho_ssl_recv(char *buf, size_t size, int *wouldblock, void *storage);
@@ -84,6 +84,7 @@ static CURLcode rhossl_connect_common(struct connectdata *conn, int sockindex,
 {
     curl_socket_t sockfd = conn->sock[sockindex];
     struct ssl_connect_data *connssl = &conn->ssl[sockindex];
+    struct ssl_config_data *config = &conn->ssl_config;
     CURLcode retcode;
 
     if (connssl->state == ssl_connection_complete)
@@ -92,7 +93,7 @@ static CURLcode rhossl_connect_common(struct connectdata *conn, int sockindex,
     connssl->storage = rho_ssl_create_storage();
     
     int idone = *done;
-    retcode = rho_ssl_connect(sockfd, nonblocking, &idone, connssl->storage);
+    retcode = rho_ssl_connect(sockfd, nonblocking, &idone, config->verifypeer, connssl->storage);
     if (retcode)
         return retcode;
     

data/platform/shared/curl/lib/url.c

@@ -698,12 +698,7 @@ CURLcode Curl_init_userdefined(struct UserDefined *set)
    * libcurl 7.10 introduced SSL verification *by default*! This needs to be
    * switched off unless wanted.
    */
-#ifdef OS_ANDROID
-  /* TODO: implement binding with system CA storage and rollback this setting to default */
-  set->ssl.verifypeer = FALSE;
-#else
   set->ssl.verifypeer = TRUE;
-#endif
   set->ssl.verifyhost = 2;
   set->ssh_auth_types = CURLSSH_AUTH_DEFAULT; /* defaults to any auth
                                                       type */

data/platform/shared/db/DBAdapter.cpp

@@ -10,6 +10,7 @@
 namespace rho{
 namespace db{
 IMPLEMENT_LOGCLASS(CDBAdapter,"DB");
+HashtablePtr<String,CDBAdapter*> CDBAdapter::m_mapDBPartitions;
 
 using namespace rho::common;
 
@@ -21,19 +22,27 @@ static int onDBBusy(void* data,int nTry)
 
 void SyncBlob_DeleteCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs)
 {
-    char* type = NULL;
-    if ( nArgs < 4 )
+    if ( nArgs < 3 )
         return;
 
-    type = (char*)sqlite3_value_text(*(ppArgs+1));
-    if ( type && strcmp(type,"blob.file") == 0 )
+    CDBAttrManager& attrMgr = CDBAdapter::getDBByHandle(sqlite3_context_db_handle(dbContext)).getAttrMgr();
+
+    char* szAttrName = (char*)sqlite3_value_text(*(ppArgs+2));
+    int nSrcID = sqlite3_value_int(*(ppArgs+1));
+    if ( attrMgr.isBlobAttr(nSrcID, szAttrName) )
     {
-        String strFilePath = RHODESAPP().getRhoRootPath()+ "apps";
-        strFilePath += (char*)sqlite3_value_text(*(ppArgs));
+        String strFilePath = RHODESAPP().resolveDBFilesPath((char*)sqlite3_value_text(*(ppArgs)));
         CRhoFile::deleteFile(strFilePath.c_str());
     }
 
-    sync::CSyncThread::getDBAdapter().getAttrMgr().remove( sqlite3_value_int(*(ppArgs+2)), (char*)sqlite3_value_text(*(ppArgs+3)) );
+    attrMgr.remove( nSrcID, szAttrName );
+}
+
+void SyncBlob_DeleteSchemaCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs)
+{
+    CDBAttrManager& attrMgr = CDBAdapter::getDBByHandle(sqlite3_context_db_handle(dbContext)).getAttrMgr();
+    //TODO: SyncBlob_DeleteSchemaCallback
+    //TODO: add to reset - set callback
 }
 
 void SyncBlob_InsertCallback(sqlite3_context* dbContext, int nArgs, sqlite3_value** ppArgs)
@@ -41,7 +50,7 @@ void SyncBlob_InsertCallback(sqlite3_context* dbContext, int nArgs, sqlite3_valu
     if ( nArgs < 2 )
         return;
 
-    sync::CSyncThread::getDBAdapter().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)
@@ -96,8 +105,11 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
     if ( !bExist )
         createSchema();
 
-    sqlite3_create_function( m_dbHandle, "rhoOnDeleteObjectRecord", 4, SQLITE_ANY, 0,
+    sqlite3_create_function( m_dbHandle, "rhoOnDeleteObjectRecord", 3, SQLITE_ANY, 0,
 	    SyncBlob_DeleteCallback, 0, 0 );
+    sqlite3_create_function( m_dbHandle, "rhoOnDeleteRecord", 1, SQLITE_ANY, 0,
+	    SyncBlob_DeleteSchemaCallback, 0, 0 );
+
     sqlite3_create_function( m_dbHandle, "rhoOnInsertObjectRecord", 2, SQLITE_ANY, 0,
 	    SyncBlob_InsertCallback, 0, 0 );
 
@@ -287,7 +299,33 @@ sqlite3_stmt* CDBAdapter::createInsertStatement(rho::db::CDBResult& res, const S
 	return stInsert;
 }
 
-void CDBAdapter::destroy_table(String strTable)
+static boolean destroyTableName(String tableName, const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables )
+{
+    int i;
+    for (i = 0; i < (int)arExcludeTables.size(); i++ )
+    {
+        if ( arExcludeTables.elementAt(i).compare(tableName) == 0 )
+            return false;
+    }
+
+    for (i = 0; i < (int)arIncludeTables.size(); i++ )
+    {
+        if ( arIncludeTables.elementAt(i).compare(tableName) == 0 )
+            return true;
+    }
+
+    return arIncludeTables.size()==0;
+}
+
+boolean CDBAdapter::isTableExist(String strTableName)
+{
+    Vector<String> vecTables;
+
+    DBResult( res , executeSQL( "SELECT name FROM sqlite_master WHERE type='table' AND name=?", strTableName.c_str() ) );
+    return !res.isEnd();
+}
+
+void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables, const rho::Vector<rho::String>& arExcludeTables)
 {
     getAttrMgr().reset(*this);
     CFilePath oFilePath(m_strDbPath);
@@ -311,7 +349,7 @@ void CDBAdapter::destroy_table(String strTable)
     for ( int i = 0; i < (int)vecTables.size(); i++ )
     {
         String tableName = vecTables.elementAt(i);
-        if ( tableName.compare(strTable)==0 )
+        if (destroyTableName(tableName, arIncludeTables, arExcludeTables)  )
             continue;
 
         String strSelect = "SELECT * from " + tableName;
@@ -344,10 +382,11 @@ void CDBAdapter::destroy_table(String strTable)
     open( dbOldName, m_strDbVer, false );
 }
 
-void CDBAdapter::setInitialSyncDB(String fDataName)
+void CDBAdapter::setBulkSyncDB(String fDataName)
 {
     CDBAdapter db;
     db.open( fDataName, m_strDbVer, true );
+    db.createTriggers();
 
     db.startTransaction();
 
@@ -370,13 +409,26 @@ void CDBAdapter::setInitialSyncDB(String fDataName)
 	}
     //copy sources
 	{
-		DBResult( res, executeSQL("SELECT name, source_url,priority,session from sources") );
+        String tableName = "sources";
+        String strSelect = "SELECT * from " + tableName;
+        DBResult( res , executeSQL( strSelect.c_str() ) );
+		String strInsert = "";
+        int rc = 0;
 	    for ( ; !res.isEnd(); res.next() )
 	    {
-	    	String strName = res.getStringByIdx(0);
-	    	
-            db.executeSQL("UPDATE sources SET source_url=?,priority=?,session=? where name=?", 
-                res.getStringByIdx(1), res.getIntByIdx(2), res.getStringByIdx(3), strName ); 
+            String strName = res.getStringByIdx(1);
+            DBResult( res2, db.executeSQL("SELECT name from sources where name=?", strName) );
+            if (!res2.isEnd())
+                continue;
+
+	    	sqlite3_stmt* stInsert = createInsertStatement(res, tableName, db, strInsert);
+
+            if (stInsert)
+            {
+                rc = sqlite3_step(stInsert);
+                checkDbError(rc);
+                sqlite3_finalize(stInsert);
+            }
 	    }
 	}
 
@@ -393,95 +445,71 @@ void CDBAdapter::setInitialSyncDB(String fDataName)
     open( dbOldName, m_strDbVer, false );
 }
 
-/*
-static const char* g_szDbSchema = 
-    "CREATE TABLE client_info ("
-    " client_id VARCHAR(255) PRIMARY KEY,"
-    " token VARCHAR(255) default NULL,"
-    " token_sent int default 0,"
-    " reset int default 0,"
-    " port VARCHAR(10) default NULL,"
-    " last_sync_success VARCHAR(100) default NULL);"
-    "CREATE TABLE object_values ("
-    " id INTEGER PRIMARY KEY,"
-    " source_id int default NULL,"
-    " attrib varchar(255) default NULL,"
-    " object varchar(255) default NULL,"
-    " value text default NULL,"
-    " attrib_type varchar(255) default NULL);"
-    "CREATE TABLE changed_values ("
-    " id INTEGER PRIMARY KEY,"
-    " source_id int default NULL,"
-    " attrib varchar(255) default NULL,"
-    " object varchar(255) default NULL,"
-    " value text default NULL,"
-    " attrib_type varchar(255) default NULL,"
-    " update_type varchar(255) default NULL,"
-    " sent int default 0,"
-    " main_id INTEGER default 0);"
-    "CREATE TABLE sources ("
-    //" id INTEGER PRIMARY KEY,"
-    " source_url VARCHAR(255) PRIMARY KEY,"
-    " source_id int,"
-    " name VARCHAR(255) default NULL,"
-    " token INTEGER default NULL,"
-    " priority INTEGER,"
-    " session VARCHAR(255) default NULL,"
-    " last_updated int default 0,"
-    " last_inserted_size int default 0,"
-    " last_deleted_size int default 0,"
-    " last_sync_duration int default 0,"
-    " last_sync_success int default 0,"
-    " backend_refresh_time int default 0,"
-    " source_attribs varchar default NULL);"
-    //"CREATE INDEX by_attrib_utype on object_values (attrib,update_type);"
-    //"CREATE INDEX by_src_type ON object_values (source_id, attrib_type, object);"
-    //"CREATE INDEX by_src_utype on object_values (source_id,update_type);"
-    //"CREATE INDEX by_type ON object_values (attrib_type);"
-    "CREATE INDEX by_src_id on object_values (source_id);"
-	"CREATE UNIQUE INDEX by_src_object ON object_values (object, attrib, source_id);"
-    "CREATE INDEX by_src_value ON object_values (attrib, source_id, value);"
-    "CREATE TRIGGER rhodeleteTrigger BEFORE DELETE ON object_values FOR EACH ROW "
-        "BEGIN "
-            "SELECT rhoOnDeleteObjectRecord(OLD.value, OLD.attrib_type, 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;"
-    ";";
-*/
-
 void CDBAdapter::createSchema()
 {
     char* errmsg = 0;
     CFilePath oPath(m_strDbPath);
 
-    String strSqlScript, strSqlTriggers;
+    String strSqlScript;
     CRhoFile::loadTextFile(oPath.changeBaseName("syncdb.schema").c_str(), strSqlScript);
-    CRhoFile::loadTextFile(oPath.changeBaseName("syncdb.triggers").c_str(), strSqlTriggers);
 
     if ( strSqlScript.length() == 0 )
     {
         LOG(ERROR)+"createSchema failed. Cannot read schema file: " + strSqlScript;
         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 )
+        createTriggers();
+}
+
+void CDBAdapter::createTriggers()
+{
+    char* errmsg = 0;
+    CFilePath oPath(m_strDbPath);
+
+    String strSqlTriggers;
+    CRhoFile::loadTextFile(oPath.changeBaseName("syncdb.triggers").c_str(), strSqlTriggers);
+
     if ( strSqlTriggers.length() == 0 )
     {
         LOG(ERROR)+"createSchema failed. Cannot read triggers file: " + strSqlTriggers;
         return;
     }
 
-    int rc = sqlite3_exec(m_dbHandle, (strSqlScript+strSqlTriggers).c_str(),  NULL, NULL, &errmsg);
+    int rc = sqlite3_exec(m_dbHandle, strSqlTriggers.c_str(),  NULL, NULL, &errmsg);
 
     if ( rc != SQLITE_OK )
-        LOG(ERROR)+"createSchema failed. Error code: " + rc + ";Message: " + (errmsg ? errmsg : "");
+        LOG(ERROR)+"createTriggers failed. Error code: " + rc + ";Message: " + (errmsg ? errmsg : "");
 
     if ( errmsg )
         sqlite3_free(errmsg);
 }
 
+void CDBAdapter::createDeleteTrigger(const String& strTable)
+{
+String strTrigger = String("CREATE TRIGGER rhodeleteSchemaTrigger BEFORE DELETE ON ") + strTable + " FOR EACH ROW "
+"   BEGIN "
+"       SELECT rhoOnDeleteRecord( OLD );"
+"   END;"
+";";
+    char* errmsg = 0;
+    //TODO: createDeleteTrigger
+/*    int rc = sqlite3_exec(m_dbHandle, strTrigger.c_str(),  NULL, NULL, &errmsg);
+
+    if ( rc != SQLITE_OK )
+        LOG(ERROR)+"createTriggers failed. Error code: " + rc + ";Message: " + (errmsg ? errmsg : "");
+*/
+}
+
 void CDBAdapter::close()
 {
     for (Hashtable<String,sqlite3_stmt*>::iterator it = m_mapStatements.begin();  it != m_mapStatements.end(); ++it )
@@ -496,6 +524,22 @@ void CDBAdapter::close()
     m_strDbPath = String();
 }
 
+int CDBAdapter::prepareSqlStatement(const char* szSql, int nByte, sqlite3_stmt **ppStmt)
+{
+    int rc = SQLITE_OK;
+    sqlite3_stmt* st = m_mapStatements.get(szSql);
+    if ( st != null )
+        *ppStmt	 = st;
+    else
+    {
+        rc = sqlite3_prepare_v2(m_dbHandle, szSql, nByte, ppStmt, NULL);
+        if ( rc == SQLITE_OK )
+            m_mapStatements.put(szSql, st);
+    }
+
+    return rc;
+}
+
 DBResultPtr CDBAdapter::prepareStatement( const char* szSt )
 {
     if ( m_dbHandle == null )
@@ -522,6 +566,31 @@ DBResultPtr CDBAdapter::prepareStatement( const char* szSt )
     return res;
 }
 
+DBResultPtr CDBAdapter::executeSQLReportNonUniqueEx( const char* szSt, Vector<String>& arValues )
+{
+    DBResultPtr res = prepareStatement(szSt);
+    if ( res->getStatement() == null )
+        return res;
+
+    for (int i = 0; i < (int)arValues.size(); i++ )
+        bind(res->getStatement(), i+1, arValues.elementAt(i));
+
+    res->setReportNonUnique(true);
+    return executeStatement(res);
+}
+
+DBResultPtr CDBAdapter::executeSQLEx( const char* szSt, Vector<String>& arValues)
+{
+    DBResultPtr res = prepareStatement(szSt);
+    if ( res->getStatement() == null )
+        return res;
+
+    for (int i = 0; i < (int)arValues.size(); i++ )
+        bind(res->getStatement(), i+1, arValues.elementAt(i));
+
+    return executeStatement(res);
+}
+
 DBResultPtr CDBAdapter::executeSQL( const char* szSt)
 {
     DBResultPtr res = prepareStatement(szSt);
@@ -611,7 +680,161 @@ void CDBAdapter::rollback()
     Unlock();
 }
 
+/*static*/ void CDBAdapter::closeAll()
+{
+    for (Hashtable<String,CDBAdapter*>::iterator it = m_mapDBPartitions.begin();  it != m_mapDBPartitions.end(); ++it )
+        it->second->close();
+}
+
+/*static*/ void CDBAdapter::initAttrManager()
+{
+    for (Hashtable<String,CDBAdapter*>::iterator it = m_mapDBPartitions.begin();  it != m_mapDBPartitions.end(); ++it )
+        it->second->getAttrMgr().loadBlobAttrs(*(it->second));
+}
+
+/*static*/ CDBAdapter& CDBAdapter::getUserDB()
+{
+    return *getDBPartitions().get("user");
+}
+
+/*static*/ CDBAdapter& CDBAdapter::getDB(const char* szPartition)
+{
+    return *getDBPartitions().get(szPartition);
+}
+
+/*static*/ boolean CDBAdapter::isAnyInsideTransaction()
+{
+    for (Hashtable<String,CDBAdapter*>::iterator it = m_mapDBPartitions.begin();  it != m_mapDBPartitions.end(); ++it )
+    {
+        if ( it->second->isInsideTransaction() )
+            return true;
+    }
+
+    return false;
+}
+
+/*static*/ db::CDBAdapter& CDBAdapter::getDBByHandle(sqlite3* db)
+{
+    for (Hashtable<String,CDBAdapter*>::iterator it = m_mapDBPartitions.begin();  it != m_mapDBPartitions.end(); ++it )
+    {
+        if ( it->second->getDbHandle() == db )
+            return *(it->second);
+    }
+
+    return *getDBPartitions().get("user");
+}
+
+}
+}
+
+extern "C" {
+using namespace rho::db;
+
+int rho_db_open(const char* szDBPath, const char* szDBPartition, void** ppDB)
+{
+    CFilePath oPath(szDBPath);
+
+    CDBAdapter* pDB = CDBAdapter::getDBPartitions().get(szDBPartition);
+    if ( !pDB )
+    {
+        pDB = new CDBAdapter();
+        CDBAdapter::getDBPartitions().put(szDBPartition, pDB);
+    }
+
+    rho::String strVer = RhoRuby_getRhoDBVersion(); 
+    pDB->open(szDBPath,strVer, false);
+
+    *ppDB = pDB;
+    return 0;
+}
+
+int rho_db_startTransaction(void* pDB)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    db.startTransaction();
+
+    //TODO: get error code from DBException
+    return 0;
+}
+
+int rho_db_commitTransaction(void* pDB)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    db.endTransaction();
+    //TODO: get error code from DBException
+    return 0;
+}
+
+int rho_db_rollbackTransaction(void* pDB)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    db.rollback();
+    //TODO: get error code from DBException
+    return 0;
+}
+
+int rho_db_is_ui_waitfordb(void* pDB)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    return db.isUIWaitDB() ? 1 :0;
+}
+
+extern "C" void
+string_iter(const char* szVal, void* par)
+{
+    rho::Vector<rho::String>& ar = *((rho::Vector<rho::String>*)(par));
+    ar.addElement(szVal);
+}
+
+int rho_db_destroy_tables(void* pDB, unsigned long arInclude, unsigned long arExclude)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+
+    rho::Vector<rho::String> arIncludeTables;
+    rho_ruby_enum_strary(arInclude, string_iter, &arIncludeTables);
+
+    rho::Vector<rho::String> arExcludeTables;
+    rho_ruby_enum_strary(arExclude, string_iter, &arExcludeTables);
+
+    db.destroy_tables(arIncludeTables,arExcludeTables);
+    return 0;
+}
+
+void* rho_db_get_handle(void* pDB)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    return db.getDbHandle();
+}
+
+int rho_db_prepare_statement(void* pDB, const char* szSql, int nByte, sqlite3_stmt **ppStmt)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    return db.prepareSqlStatement(szSql, nByte, ppStmt);
+}
+
+void rho_db_lock(void* pDB)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    db.Lock();
 }
+
+void rho_db_unlock(void* pDB)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    db.Unlock();
+}
+
+int rho_db_is_table_exist(void* pDB, const char* szTableName)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    return db.isTableExist(szTableName) ? 1 : 0;
+}
+
+void rho_db_init_attr_manager()
+{
+    rho::db::CDBAdapter::initAttrManager();
+}
+
 }
 
 namespace rho{