Skip to content

Commit

Permalink
Minor Changes: Add trace to db_execute, add error log to syncsource,
Browse files Browse the repository at this point in the history
change output dir for Win32 RhoLib
  • Loading branch information
genywind committed May 28, 2009
1 parent ff85f58 commit 604d4fc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
5 changes: 5 additions & 0 deletions platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c
@@ -1,6 +1,10 @@
#include "sqlite3.h"
#include "ruby.h"

#include "logging/RhoLog.h"
#undef DEFAULT_LOGCATEGORY
#define DEFAULT_LOGCATEGORY "DB"

static VALUE mSqlite3;
static VALUE mDatabase;

Expand Down Expand Up @@ -79,6 +83,7 @@ static VALUE db_execute(int argc, VALUE *argv, VALUE self)
db = *ppDB;
sql = RSTRING_PTR(argv[0]);

RAWTRACE1("db_execute: %s", sql);
if ( (nRes = sqlite3_prepare_v2(db, sql, -1, &statement, NULL)) != SQLITE_OK)
rb_raise(rb_eArgError, "could not prepare statement: %d",nRes);

Expand Down
2 changes: 1 addition & 1 deletion platform/shared/sync/SyncSource.cpp
Expand Up @@ -259,7 +259,7 @@ void CSyncSource::processSyncObject(CJSONEntry& oJsonEntry)

m_nDeleted++;
}else{
//TODO: log error
LOG(ERROR) + "Unknown DB operation: " + (szDbOp ? szDbOp : "");
}
}

Expand Down
1 change: 0 additions & 1 deletion platform/shared/sync/syncthread.cpp
Expand Up @@ -63,7 +63,6 @@ void CSyncThread::processCommand()
m_oSyncEngine.doSyncAllSources();
break;
case scChangePollInterval:
//TODO:scChangePollInterval
break;
case scSyncOne:
//TODO:scSyncOne
Expand Down
8 changes: 4 additions & 4 deletions platform/wm/RhoLib/RhoLib.vcproj
Expand Up @@ -329,8 +329,8 @@
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
Expand Down Expand Up @@ -691,8 +691,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
OutputDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
IntermediateDirectory="..\bin\$(PlatformName)\$(ProjectName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
Expand Down

0 comments on commit 604d4fc

Please sign in to comment.