summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--project2/project2-1.2_beta2.tar0
-rw-r--r--project2/sql/Jamfile.jam2
-rw-r--r--project2/sql/mockDatasource.cpp6
-rw-r--r--project2/sql/mockDatasource.h5
4 files changed, 6 insertions, 7 deletions
diff --git a/project2/project2-1.2_beta2.tar b/project2/project2-1.2_beta2.tar
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/project2/project2-1.2_beta2.tar
diff --git a/project2/sql/Jamfile.jam b/project2/sql/Jamfile.jam
index 004b0b5..2affda0 100644
--- a/project2/sql/Jamfile.jam
+++ b/project2/sql/Jamfile.jam
@@ -15,7 +15,7 @@ cpp-pch pch : pch.hpp :
lib p2sql :
pch
- [ glob *.cpp : mockDatasource.cpp ]
+ [ glob *.cpp ]
:
<include>.
<library>dbppcore
diff --git a/project2/sql/mockDatasource.cpp b/project2/sql/mockDatasource.cpp
index 5beb963..9f21e44 100644
--- a/project2/sql/mockDatasource.cpp
+++ b/project2/sql/mockDatasource.cpp
@@ -1,11 +1,11 @@
#include "mockDatasource.h"
#include <connection.h>
-#include <safeMapFind.h>
+#include <mockDatabase.h>
-NAMEDFACTORY("mock", MockDatabase, DB::ConnectionFactory);
+NAMEDPLUGIN("mock", MockConnectionFactory, DB::ConnectionFactory);
DB::Connection *
-MockConnectionLoader::create(const std::string & n) const
+MockConnectionFactory::create(const std::string & n) const
{
return DB::MockDatabase::openConnectionTo(n);
}
diff --git a/project2/sql/mockDatasource.h b/project2/sql/mockDatasource.h
index ed58027..e9a9732 100644
--- a/project2/sql/mockDatasource.h
+++ b/project2/sql/mockDatasource.h
@@ -1,10 +1,9 @@
#ifndef MOCKDATASOURCE_H
#define MOCKDATASOURCE_H
-#include <rdbmsDataSource.h>
-#include "mockDatabase.h"
+#include <connection.h>
-class MockConnectionLoader : public ConnectionLoader {
+class MockConnectionFactory : public DB::ConnectionFactory {
public:
DB::Connection * create(const std::string &) const;
};