From ff3950866c0f756a5b6f379b9f95f01fff4a9ec7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 24 Aug 2011 17:13:55 +0200
Subject: Make tests use unique table prefixes

---
 common/callback/driver.cxx | 3 ++-
 common/callback/makefile   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'common/callback')

diff --git a/common/callback/driver.cxx b/common/callback/driver.cxx
index afd6fb3..bc5b4f0 100644
--- a/common/callback/driver.cxx
+++ b/common/callback/driver.cxx
@@ -93,7 +93,8 @@ main (int argc, char* argv[])
       typedef odb::result<object> result;
 
       transaction t (db->begin ());
-      result r (db->query<object> ((query::id < 3) + "ORDER BY object.id"));
+      result r (db->query<object> (
+                  (query::id < 3) + "ORDER BY common_callback_object.id"));
 
       for (result::iterator i (r.begin ()); i != r.end (); ++i)
       {
diff --git a/common/callback/makefile b/common/callback/makefile
index 640e148..b24b9ae 100644
--- a/common/callback/makefile
+++ b/common/callback/makefile
@@ -36,7 +36,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
---generate-query
+--generate-query --table-prefix common_callback_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
-- 
cgit v1.1