Update of /cvsroot/gcblue/gcb_wx/src/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24731/src/database
Modified Files:
tcAccountDatabase.cpp tcDatabase.cpp tcSqlReader.cpp
Log Message:
Upgraded to Sqlite 3.2.5
Index: tcAccountDatabase.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcAccountDatabase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcAccountDatabase.cpp 29 Jul 2005 02:35:52 -0000 1.2
--- tcAccountDatabase.cpp 16 Sep 2005 00:16:08 -0000 1.3
***************
*** 24,28 ****
#include "tcAccountDatabase.h"
! #include "sqlite/sqlite_plus.h"
#include "md5class.h"
#include <sstream>
--- 24,28 ----
#include "tcAccountDatabase.h"
! #include "sqlite/sqlite3x.hpp"
#include "md5class.h"
#include <sstream>
***************
*** 33,36 ****
--- 33,39 ----
+ using sqlite3x::sqlite3_command;
+ using sqlite3x::sqlite3_connection;
+ using sqlite3x::sqlite3_reader;
***************
*** 154,159 ****
bool tcAccountDatabase::GetUserData(const std::string& user, UserData& userData)
{
! sqlite::reader tableData = accountDatabase->executereader(
! "select * from %s where UserName='%s';", tableName.c_str(), user.c_str());
if (tableData.read())
--- 157,165 ----
bool tcAccountDatabase::GetUserData(const std::string& user, UserData& userData)
{
! wxString command = wxString::Format("select * from %s where UserName='%s';",
! tableName.c_str(), user.c_str());
! sqlite3_command sqlCmd(*accountDatabase, command.c_str());
! sqlite3x::sqlite3_reader tableData = sqlCmd.executereader();
!
if (tableData.read())
***************
*** 198,207 ****
try
{
! accountDatabase = new sqlite::connection(databasePath.c_str());
// build column lookup
columnLookup.clear();
! sqlite::reader tableInfo = accountDatabase->executereader(
! "pragma table_info(%s);", tableName.c_str());
unsigned int fieldCount = 0;
--- 204,214 ----
try
{
! accountDatabase = new sqlite3x::sqlite3_connection(databasePath.c_str());
// build column lookup
columnLookup.clear();
! wxString command = wxString::Format("pragma table_info(%s);", tableName.c_str());
! sqlite3_command sqlCmd(*accountDatabase, command.c_str());
! sqlite3x::sqlite3_reader tableInfo = sqlCmd.executereader();
unsigned int fieldCount = 0;
***************
*** 209,213 ****
while (tableInfo.read())
{
! columnLookup[std::string(tableInfo[1])] = fieldCount++;
}
--- 216,220 ----
while (tableInfo.read())
{
! columnLookup[tableInfo.getstring(1)] = fieldCount++;
}
Index: tcSqlReader.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSqlReader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcSqlReader.cpp 12 Jun 2005 20:46:58 -0000 1.5
--- tcSqlReader.cpp 16 Sep 2005 00:16:08 -0000 1.6
***************
*** 22,26 ****
#include "stdwx.h"
#include "tcSqlReader.h"
! #include "sqlite/sqlite_plus.h"
#include <stdarg.h>
--- 22,26 ----
#include "stdwx.h"
#include "tcSqlReader.h"
! #include "sqlite/sqlite3x.hpp"
#include <stdarg.h>
***************
*** 35,39 ****
* Builds column lookup std::map
*/
! void tcSqlReader::BuildColumnLookup(sqlite::reader& tableInfo)
{
unsigned int fieldCount = 0;
--- 35,39 ----
* Builds column lookup std::map
*/
! void tcSqlReader::BuildColumnLookup(sqlite3x::sqlite3_reader& tableInfo)
{
unsigned int fieldCount = 0;
***************
*** 42,46 ****
while(tableInfo.read())
{
! columnLookup[std::string(tableInfo[1])] = fieldCount++;
}
}
--- 42,46 ----
while(tableInfo.read())
{
! columnLookup[tableInfo.getstring(1)] = fieldCount++;
}
}
***************
*** 178,182 ****
! tcSqlReader::tcSqlReader(sqlite::reader& tableInfo, sqlite::reader& _data)
: data(_data)
{
--- 178,182 ----
! tcSqlReader::tcSqlReader(sqlite3x::sqlite3_reader& tableInfo, sqlite3x::sqlite3_reader& _data)
: data(_data)
{
Index: tcDatabase.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** tcDatabase.cpp 7 Jul 2005 01:13:43 -0000 1.31
--- tcDatabase.cpp 16 Sep 2005 00:16:08 -0000 1.32
***************
*** 55,59 ****
#include "tcDatabaseIterator.h"
#include "common/tinyxml.h"
! #include "sqlite/sqlite_plus.h"
#ifdef _DEBUG
--- 55,59 ----
#include "tcDatabaseIterator.h"
#include "common/tinyxml.h"
! #include "sqlite/sqlite3x.hpp"
#ifdef _DEBUG
***************
*** 234,238 ****
! sqlite::connection sqlConnection(fileName.c_str());
// tcGenericDBObject
--- 234,238 ----
! sqlite3x::sqlite3_connection sqlConnection(fileName.c_str());
// tcGenericDBObject
|
