diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 71aaf78f45..f7a8687bb8 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -176,6 +176,18 @@
true
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
true
true
@@ -753,19 +765,7 @@
true
true
-
- true
- true
- true
- true
-
-
- true
- true
- true
- true
-
%(AdditionalIncludeDirectories)
%(AdditionalIncludeDirectories)
@@ -1023,7 +1023,7 @@
true
true
-
+
true
true
true
@@ -1575,8 +1575,6 @@
-
-
true
true
@@ -1746,6 +1744,7 @@
+
@@ -1810,6 +1809,7 @@
+
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index a7b18e6847..2d7b4c52ef 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -318,15 +318,6 @@
2. %28Unused%29\ripple_db
-
- 1. Modules\ripple_app\_unfactored\db
-
-
- 1. Modules\ripple_app\_unfactored\db
-
-
- 1. Modules\ripple_app\_unfactored\db
-
2. %28Unused%29\ripple_net
@@ -903,6 +894,15 @@
1. Modules\ripple_websocket\subtree
+
+ 1. Modules\ripple_app\_unfactored\db
+
+
+ 1. Modules\ripple_app\_unfactored\db
+
+
+ 1. Modules\ripple_app\_unfactored\db
+
@@ -1085,9 +1085,6 @@
2. %28Unused%29\ripple_db
-
- 1. Modules\ripple_app\_unfactored\db
-
2. %28Unused%29\ripple_net
@@ -1506,9 +1503,6 @@
1. Modules\ripple_basics\utility
-
- 1. Modules\ripple_app\_unfactored\db
-
0. Third Party Code\SQLite
@@ -1728,6 +1722,12 @@
1. Modules\ripple_websocket\subtree
+
+ 1. Modules\ripple_app\_unfactored\db
+
+
+ 1. Modules\ripple_app\_unfactored\db
+
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 34c571dc93..48f90d8479 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -166,8 +166,8 @@
#include "src/cpp/ripple/ripple_InboundLedger.h"
#include "src/cpp/ripple/ripple_InboundLedgers.h"
-#include "src/cpp/database/database.h"
-#include "src/cpp/database/SqliteDatabase.h"
+#include "src/cpp/ripple/ripple_Database.h"
+#include "src/cpp/ripple/ripple_SqliteDatabase.h"
// VFALCO END CLEAN AREA
@@ -272,8 +272,8 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 1
-#include "src/cpp/database/database.cpp"
-#include "src/cpp/database/SqliteDatabase.cpp"
+#include "src/cpp/ripple/ripple_Database.cpp"
+#include "src/cpp/ripple/ripple_SqliteDatabase.cpp"
#include "src/cpp/ripple/ripple_AccountItem.cpp"
#include "src/cpp/ripple/ripple_AccountItems.cpp"
@@ -283,7 +283,7 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#include "src/cpp/ripple/ripple_CanonicalTXSet.cpp"
#include "src/cpp/ripple/ChangeTransactor.cpp" // no log
#include "src/cpp/ripple/Contract.cpp" // no log
-#include "src/cpp/ripple/DBInit.cpp"
+#include "src/cpp/ripple/ripple_DBInit.cpp"
#include "src/cpp/ripple/HTTPRequest.cpp"
#include "src/cpp/ripple/HttpsClient.cpp"
#include "src/cpp/ripple/Interpreter.cpp" // no log
diff --git a/src/cpp/ripple/ripple.proto b/src/cpp/ripple/ripple.proto
index 37390d8e9b..920654c39c 100644
--- a/src/cpp/ripple/ripple.proto
+++ b/src/cpp/ripple/ripple.proto
@@ -1,5 +1,3 @@
-// VFALCO TODO Rename the protobuf namespace from ripple to 'wire' or something
-//
package protocol;
enum MessageType
diff --git a/src/cpp/ripple/DBInit.cpp b/src/cpp/ripple/ripple_DBInit.cpp
similarity index 100%
rename from src/cpp/ripple/DBInit.cpp
rename to src/cpp/ripple/ripple_DBInit.cpp
diff --git a/src/cpp/database/database.cpp b/src/cpp/ripple/ripple_Database.cpp
similarity index 100%
rename from src/cpp/database/database.cpp
rename to src/cpp/ripple/ripple_Database.cpp
diff --git a/src/cpp/database/database.h b/src/cpp/ripple/ripple_Database.h
similarity index 93%
rename from src/cpp/database/database.h
rename to src/cpp/ripple/ripple_Database.h
index 552eac834e..078b5f5068 100644
--- a/src/cpp/database/database.h
+++ b/src/cpp/ripple/ripple_Database.h
@@ -4,9 +4,11 @@
*/
//==============================================================================
-#ifndef __DATABASE__
-#define __DATABASE__
+#ifndef RIPPLE_DATABASE_RIPPLEHEADER
+#define RIPPLE_DATABASE_RIPPLEHEADER
+// VFALCO Get rid of these macros
+//
#define SQL_FOREACH(_db, _strQuery) \
if ((_db)->executeSQL(_strQuery)) \
for (bool _bMore = (_db)->startIterRows(); _bMore; _bMore = (_db)->getNextRow())
@@ -23,21 +25,15 @@ class JobQueue;
class Database
{
-protected:
- int mNumCol;
- std::string mUser;
- std::string mHost;
- std::string mDBPass;
- std::vector mColNameTable;
-
- bool getColNumber (const char* colName, int* retIndex);
-
public:
+ // VFALCO TODO how are user and password even used?
+ //
Database (const char* host, const char* user, const char* pass);
- static Database* newMysqlDatabase (const char* host, const char* user, const char* pass);
+
virtual ~Database ();
virtual void connect () = 0;
+
virtual void disconnect () = 0;
std::string& getPass ()
@@ -104,6 +100,15 @@ public:
{
return -1;
}
+
+protected:
+ bool getColNumber (const char* colName, int* retIndex);
+
+ int mNumCol;
+ std::string mUser;
+ std::string mHost;
+ std::string mDBPass;
+ std::vector mColNameTable;
};
#endif
diff --git a/src/cpp/database/SqliteDatabase.cpp b/src/cpp/ripple/ripple_SqliteDatabase.cpp
similarity index 99%
rename from src/cpp/database/SqliteDatabase.cpp
rename to src/cpp/ripple/ripple_SqliteDatabase.cpp
index 2792bfc23b..0e29c5a4a2 100644
--- a/src/cpp/database/SqliteDatabase.cpp
+++ b/src/cpp/ripple/ripple_SqliteDatabase.cpp
@@ -6,7 +6,7 @@
SETUP_LOG (SqliteDatabase)
-using namespace std;
+//using namespace std;
SqliteStatement::SqliteStatement (SqliteDatabase* db, const char* sql, bool aux)
{
diff --git a/src/cpp/database/SqliteDatabase.h b/src/cpp/ripple/ripple_SqliteDatabase.h
similarity index 97%
rename from src/cpp/database/SqliteDatabase.h
rename to src/cpp/ripple/ripple_SqliteDatabase.h
index ccd4e139e3..05bf6c1ddb 100644
--- a/src/cpp/database/SqliteDatabase.h
+++ b/src/cpp/ripple/ripple_SqliteDatabase.h
@@ -4,8 +4,8 @@
*/
//==============================================================================
-#ifndef RIPPLE_SQLITEDATABASE_H
-#define RIPPLE_SQLITEDATABASE_H
+#ifndef RIPPLE_SQLITEDATABASE_RIPPLEHEADER
+#define RIPPLE_SQLITEDATABASE_RIPPLEHEADER
struct sqlite3;
struct sqlite3_stmt;