From 3a951b92f1a4da2779b503e15130663429ca0d6d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 24 Oct 2011 16:23:14 +0200 Subject: Add t_ prefix to all the common tests that conflict with examples --- common/composite/makefile | 2 +- common/container/makefile | 2 +- common/inheritance/makefile | 2 +- common/inverse/makefile | 2 +- common/relationship/makefile | 2 +- common/view/driver.cxx | 2 +- common/view/makefile | 2 +- common/view/test.hxx | 26 +++++++++++++------------- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/common/composite/makefile b/common/composite/makefile index 1813080..1a4ceb7 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 --table-prefix composite_ +--generate-query --table-prefix t_composite_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) diff --git a/common/container/makefile b/common/container/makefile index 51dd456..a482d9b 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 container_ +--table-prefix t_container_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) diff --git a/common/inheritance/makefile b/common/inheritance/makefile index 47ffcaa..6f6675e 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 --table-prefix inheritance_ +--generate-query --table-prefix t_inheritance_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) diff --git a/common/inverse/makefile b/common/inverse/makefile index 6b33f10..3b5fa1b 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 --table-prefix inverse_ +--generate-query --table-prefix t_inverse_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) diff --git a/common/relationship/makefile b/common/relationship/makefile index d9f77e6..71ab773 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 --table-prefix relationship_ +--generate-query --table-prefix t_relationship_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) diff --git a/common/view/driver.cxx b/common/view/driver.cxx index 24768f6..2ede99c 100644 --- a/common/view/driver.cxx +++ b/common/view/driver.cxx @@ -301,7 +301,7 @@ main (int argc, char* argv[]) result r ( db->query ( "SELECT first, last, age " - "FROM test_view_person " + "FROM t_view_person " "WHERE age < 31 ORDER BY age")); view1_check (r); diff --git a/common/view/makefile b/common/view/makefile index 17f9543..3b7c03d 100644 --- a/common/view/makefile +++ b/common/view/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 test_view_ # view_ conflicts with example +--generate-query --table-prefix t_view_ $(gen): cpp_options := -I$(src_base) $(gen): $(common.l.cpp-options) diff --git a/common/view/test.hxx b/common/view/test.hxx index 8358b9e..5efbd1c 100644 --- a/common/view/test.hxx +++ b/common/view/test.hxx @@ -130,7 +130,7 @@ struct employer // Complete suffix query template. // -#pragma db view query("SELECT first, last, age FROM test_view_person") +#pragma db view query("SELECT first, last, age FROM t_view_person") struct view1 { std::string first; @@ -141,7 +141,7 @@ struct view1 // Complete query. // #pragma db view query("SELECT first, last, age " \ - "FROM test_view_person " \ + "FROM t_view_person " \ "WHERE age < 31 ORDER BY age") struct view1a { @@ -153,7 +153,7 @@ struct view1a // Complete placeholder query template. // #pragma db view query("SELECT first, last, age " \ - "FROM test_view_person " \ + "FROM t_view_person " \ "WHERE age < 31 AND (?) ORDER BY age") struct view1b { @@ -174,7 +174,7 @@ struct view1c // Assembled SELECT and FROM-lists. // -#pragma db view table("test_view_person") +#pragma db view table("t_view_person") struct view1d { #pragma db column("first") @@ -194,7 +194,7 @@ struct view1d // Complete suffix query. // #pragma db view object(person) \ - query("SELECT count(id) FROM test_view_person") + query("SELECT count(id) FROM t_view_person") struct view2 { std::size_t count; @@ -214,7 +214,7 @@ struct view2a #pragma db view object(person) struct view2b { - #pragma db column("count(test_view_person.id)") + #pragma db column("count(t_view_person.id)") std::size_t count; }; @@ -235,7 +235,7 @@ struct view2c // #pragma db view object(person = test) \ query("SELECT last, count(last) " \ - "FROM test_view_person " \ + "FROM t_view_person " \ "GROUP BY last") struct view3 { @@ -265,9 +265,9 @@ struct view3a // #pragma db view object(person) object(country = residence) \ query("SELECT first, last, residence.name " \ - "FROM test_view_person " \ - "LEFT JOIN test_view_country AS residence " \ - "ON test_view_person.residence = residence.code") + "FROM t_view_person " \ + "LEFT JOIN t_view_country AS residence " \ + "ON t_view_person.residence = residence.code") struct view4 { std::string first_name; @@ -347,9 +347,9 @@ struct view6b // The same using tables. // -#pragma db view table("test_view_person" = "p") \ - table("test_view_employer_employees" = "ee": "ee.value = p.id") \ - table("test_view_employer" = "e": "ee.object_id = e.name") +#pragma db view table("t_view_person" = "p") \ + table("t_view_employer_employees" = "ee": "ee.value = p.id") \ + table("t_view_employer" = "e": "ee.object_id = e.name") struct view6c { #pragma db column("p.first") -- cgit v1.1