Make tests use unique table prefixes

21 files changed, 30 insertions, 21 deletions

diff --git a/common/auto/makefile b/common/auto/makefile
index 7907eb9..1d5b66a 100644
--- a/common/auto/makefile
+++ b/common/auto/makefile
@@ -35,7 +35,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema
+$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
+--table-prefix common_auto_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
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)
 
diff --git a/common/composite/makefile b/common/composite/makefile
index c7b21dc..9c4a29d 100644
--- a/common/composite/makefile
+++ b/common/composite/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_composite_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/const/makefile b/common/const/makefile
index d5a233e..d8a1410 100644
--- a/common/const/makefile
+++ b/common/const/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_const_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/container/makefile b/common/container/makefile
index 115adb0..fb14cb0 100644
--- a/common/container/makefile
+++ b/common/container/makefile
@@ -35,7 +35,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema
+$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
+--table-prefix common_container_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/ctor/makefile b/common/ctor/makefile
index 9c0c0ee..8271074 100644
--- a/common/ctor/makefile
+++ b/common/ctor/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_ctor_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/default/driver.cxx b/common/default/driver.cxx
index 32c1923..a47051c 100644
--- a/common/default/driver.cxx
+++ b/common/default/driver.cxx
@@ -33,7 +33,7 @@ main (int argc, char* argv[])
     //
     {
       transaction t (db->begin ());
-      db->execute ("INSERT INTO object (obj_id) VALUES (1)");
+      db->execute ("INSERT INTO common_default_object (obj_id) VALUES (1)");
       t.commit ();
     }
 
diff --git a/common/default/makefile b/common/default/makefile
index fd77d01..ce5f9e9 100644
--- a/common/default/makefile
+++ b/common/default/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_default_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/enum/makefile b/common/enum/makefile
index a6b16e2..03c4915 100644
--- a/common/enum/makefile
+++ b/common/enum/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_enum_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/erase-query/makefile b/common/erase-query/makefile
index a31aeab..27ac281 100644
--- a/common/erase-query/makefile
+++ b/common/erase-query/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_erase_query_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/inheritance/makefile b/common/inheritance/makefile
index b9715e3..8afa961 100644
--- a/common/inheritance/makefile
+++ b/common/inheritance/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_inheritance_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/inverse/makefile b/common/inverse/makefile
index 4e393c8..08c02e9 100644
--- a/common/inverse/makefile
+++ b/common/inverse/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_inverse_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/lazy-ptr/makefile b/common/lazy-ptr/makefile
index ee599d2..24e6e43 100644
--- a/common/lazy-ptr/makefile
+++ b/common/lazy-ptr/makefile
@@ -35,7 +35,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema
+$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
+--table-prefix common_lazy_ptr_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile
index 9dc6dd6..a47d6bf 100644
--- a/common/lifecycle/makefile
+++ b/common/lifecycle/makefile
@@ -35,7 +35,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema
+$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
+--table-prefix common_lifecycle_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/query/makefile b/common/query/makefile
index c41b1d5..bcdc9c4 100644
--- a/common/query/makefile
+++ b/common/query/makefile
@@ -36,7 +36,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
---generate-query --hxx-prologue '\#include "traits.hxx"'
+--generate-query --hxx-prologue '\#include "traits.hxx"' \
+--table-prefix common_query_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/relationship/makefile b/common/relationship/makefile
index b60f0b2..fa00a78 100644
--- a/common/relationship/makefile
+++ b/common/relationship/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_relationship_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/schema/makefile b/common/schema/makefile
index 7c67a8b..a0e81eb 100644
--- a/common/schema/makefile
+++ b/common/schema/makefile
@@ -35,7 +35,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema
+$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
+--table-prefix common_schema_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/template/makefile b/common/template/makefile
index 34d7faf..eec13b5 100644
--- a/common/template/makefile
+++ b/common/template/makefile
@@ -35,7 +35,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema
+$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
+--table-prefix common_template_ #@@ CHANGE THIS
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/threads/makefile b/common/threads/makefile
index ddc97b9..dd07155 100644
--- a/common/threads/makefile
+++ b/common/threads/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_threads_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/wrapper/makefile b/common/wrapper/makefile
index 3a9b98d..a8477de 100644
--- a/common/wrapper/makefile
+++ b/common/wrapper/makefile
@@ -35,7 +35,8 @@ gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): $(odb)
 $(gen): odb := $(odb)
-$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema
+$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
+--table-prefix common_wrapper_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)