diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-08-24 17:13:55 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-08-24 17:13:55 +0200 |
| commit | ff3950866c0f756a5b6f379b9f95f01fff4a9ec7 (patch) | |
| tree | 1171b1c1ecd9cffc5022d34d8d411846b98adf09 /common/callback | |
| parent | 1fca8273447e0048941bbfe8ca23466f103c42f3 (diff) | |
Make tests use unique table prefixes
Diffstat (limited to 'common/callback')
| -rw-r--r-- | common/callback/driver.cxx | 3 | ||||
| -rw-r--r-- | common/callback/makefile | 2 |
2 files changed, 3 insertions, 2 deletions
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) |