aboutsummaryrefslogtreecommitdiff
path: root/sqlite
diff options
context:
space:
mode:
Diffstat (limited to 'sqlite')
-rw-r--r--sqlite/custom/driver.cxx5
-rw-r--r--sqlite/database/driver.cxx3
-rw-r--r--sqlite/native/driver.cxx6
-rw-r--r--sqlite/template/driver.cxx5
-rw-r--r--sqlite/truncation/driver.cxx11
-rw-r--r--sqlite/types/driver.cxx8
6 files changed, 22 insertions, 16 deletions
diff --git a/sqlite/custom/driver.cxx b/sqlite/custom/driver.cxx
index 9e387b0..d189767 100644
--- a/sqlite/custom/driver.cxx
+++ b/sqlite/custom/driver.cxx
@@ -18,14 +18,15 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb::core;
+namespace sqlite = odb::sqlite;
+using namespace sqlite;
int
main (int argc, char* argv[])
{
try
{
- auto_ptr<database> db (create_database (argc, argv));
+ auto_ptr<database> db (create_specific_database<database> (argc, argv));
object o (1);
o.nv.push_back ("123"); // INTEGER
diff --git a/sqlite/database/driver.cxx b/sqlite/database/driver.cxx
index cb531c6..6e09d30 100644
--- a/sqlite/database/driver.cxx
+++ b/sqlite/database/driver.cxx
@@ -9,7 +9,8 @@
#include <odb/sqlite/database.hxx>
-using namespace odb::sqlite;
+namespace sqlite = odb::sqlite;
+using namespace sqlite;
int
main (int argc, char* argv[])
diff --git a/sqlite/native/driver.cxx b/sqlite/native/driver.cxx
index 30f0197..91b04e6 100644
--- a/sqlite/native/driver.cxx
+++ b/sqlite/native/driver.cxx
@@ -15,14 +15,16 @@
#include <common/common.hxx>
using namespace std;
-using namespace odb::core;
+namespace sqlite = odb::sqlite;
+using namespace sqlite;
int
main (int argc, char* argv[])
{
try
{
- auto_ptr<database> db (create_database (argc, argv, false));
+ auto_ptr<database> db (
+ create_specific_database<database> (argc, argv, false));
// Create the database schema.
//
diff --git a/sqlite/template/driver.cxx b/sqlite/template/driver.cxx
index 83766fd..c7979df 100644
--- a/sqlite/template/driver.cxx
+++ b/sqlite/template/driver.cxx
@@ -18,14 +18,15 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb::core;
+namespace sqlite = odb::sqlite;
+using namespace sqlite;
int
main (int argc, char* argv[])
{
try
{
- auto_ptr<database> db (create_database (argc, argv));
+ auto_ptr<database> db (create_specific_database<database> (argc, argv));
//
//
diff --git a/sqlite/truncation/driver.cxx b/sqlite/truncation/driver.cxx
index c8b9dab..70fde25 100644
--- a/sqlite/truncation/driver.cxx
+++ b/sqlite/truncation/driver.cxx
@@ -18,7 +18,8 @@
#include "test-odb.hxx"
using namespace std;
-using namespace odb::core;
+namespace sqlite = odb::sqlite;
+using namespace sqlite;
int
main (int argc, char* argv[])
@@ -33,7 +34,7 @@ main (int argc, char* argv[])
// Test basic operations.
//
{
- auto_ptr<database> db (create_database (argc, argv));
+ auto_ptr<database> db (create_specific_database<database> (argc, argv));
// Run persist/load so that the initial bindings are established
// (version == 0).
@@ -98,10 +99,10 @@ main (int argc, char* argv[])
// Test query.
//
{
- typedef odb::query<object1> query;
- typedef odb::result<object1> result;
+ auto_ptr<database> db (create_specific_database<database> (argc, argv));
- auto_ptr<database> db (create_database (argc, argv));
+ typedef sqlite::query<object1> query;
+ typedef odb::result<object1> result;
// Run persist/query so that the initial bindings are established
// (version == 0).
diff --git a/sqlite/types/driver.cxx b/sqlite/types/driver.cxx
index ac8c8d4..69e8473 100644
--- a/sqlite/types/driver.cxx
+++ b/sqlite/types/driver.cxx
@@ -13,21 +13,21 @@
#include <odb/sqlite/database.hxx>
#include <odb/sqlite/transaction.hxx>
-#include <common/buffer.hxx>
#include <common/common.hxx>
#include "test.hxx"
#include "test-odb.hxx"
using namespace std;
-using namespace odb::core;
+namespace sqlite = odb::sqlite;
+using namespace sqlite;
int
main (int argc, char* argv[])
{
try
{
- auto_ptr<database> db (create_database (argc, argv));
+ auto_ptr<database> db (create_specific_database<database> (argc, argv));
object o (1);
@@ -58,7 +58,7 @@ main (int argc, char* argv[])
assert (o == *o1);
}
- typedef odb::query<object> query;
+ typedef sqlite::query<object> query;
typedef odb::result<object> result;
#ifdef _WIN32