From f4f07fb437a28d1d9899607e3200d6732e627036 Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Fri, 21 Oct 2011 08:35:27 +0200 Subject: Remove common_ from all table_prefix arguments in common tests --- common/callback/driver.cxx | 2 +- common/callback/makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'common/callback') diff --git a/common/callback/driver.cxx b/common/callback/driver.cxx index bc5b4f0..5f2c258 100644 --- a/common/callback/driver.cxx +++ b/common/callback/driver.cxx @@ -94,7 +94,7 @@ main (int argc, char* argv[]) transaction t (db->begin ()); result r (db->query ( - (query::id < 3) + "ORDER BY common_callback_object.id")); + (query::id < 3) + "ORDER BY callback_object.id")); for (result::iterator i (r.begin ()); i != r.end (); ++i) { diff --git a/common/callback/makefile b/common/callback/makefile index b24b9ae..6dca289 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 --table-prefix common_callback_ +--generate-query --table-prefix callback_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) -- cgit v1.1