From f4f07fb437a28d1d9899607e3200d6732e627036 Mon Sep 17 00:00:00 2001
From: Constantin Michael <constantin@codesynthesis.com>
Date: Fri, 21 Oct 2011 08:35:27 +0200
Subject: Remove common_ from all table_prefix arguments in common tests

---
 common/container/makefile | 2 +-
 common/container/test.hxx | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'common/container')

diff --git a/common/container/makefile b/common/container/makefile
index c1b1124..51dd456 100644
--- a/common/container/makefile
+++ b/common/container/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 \
---table-prefix cmn_ctnr_
+--table-prefix container_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/container/test.hxx b/common/container/test.hxx
index ec392ec..2e267f6 100644
--- a/common/container/test.hxx
+++ b/common/container/test.hxx
@@ -54,7 +54,6 @@ struct cont_comp1
 {
   // This composite value does not have any columns.
   //
-  #pragma db id_column("obj_id")
   num_vector sv; // Have the name "conflic" with the one in the object.
 };
 
@@ -64,14 +63,11 @@ struct cont_comp2
   cont_comp2 (): num (777), str ("ggg") {}
 
   int num;
-
-  #pragma db id_column("obj_id")
   str_list sl;
-
   std::string str;
 };
 
-#pragma db object table("obj")
+#pragma db object
 struct object
 {
   object (): nv (comp1_.sv), sl (comp2_.sl) {}
-- 
cgit v1.1