From 373f69ea28c47a4e2b75f897359f74913c34ca1e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 21 Oct 2011 19:50:05 +0200
Subject: Add test_ prefix to view test since it conflicts with view example

---
 common/view/driver.cxx |  2 +-
 common/view/makefile   |  2 +-
 common/view/test.hxx   | 26 +++++++++++++-------------
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'common/view')

diff --git a/common/view/driver.cxx b/common/view/driver.cxx
index 8d62830..24768f6 100644
--- a/common/view/driver.cxx
+++ b/common/view/driver.cxx
@@ -301,7 +301,7 @@ main (int argc, char* argv[])
         result r (
           db->query<view1c> (
             "SELECT first, last, age "
-            "FROM view_person "
+            "FROM test_view_person "
             "WHERE age < 31 ORDER BY age"));
 
         view1_check (r);
diff --git a/common/view/makefile b/common/view/makefile
index 24f60bf..17f9543 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 view_
+--generate-query --table-prefix test_view_ # view_ conflicts with example
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/view/test.hxx b/common/view/test.hxx
index 103439d..8358b9e 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 view_person")
+#pragma db view query("SELECT first, last, age FROM test_view_person")
 struct view1
 {
   std::string first;
@@ -141,7 +141,7 @@ struct view1
 // Complete query.
 //
 #pragma db view query("SELECT first, last, age " \
-                      "FROM view_person "        \
+                      "FROM test_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 view_person "        \
+                      "FROM test_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("view_person")
+#pragma db view table("test_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 view_person")
+  query("SELECT count(id) FROM test_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(view_person.id)")
+  #pragma db column("count(test_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 view_person "           \
+        "FROM test_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 view_person "                                 \
-        "LEFT JOIN view_country AS residence "              \
-        "ON view_person.residence = residence.code")
+        "FROM test_view_person "                            \
+        "LEFT JOIN test_view_country AS residence "         \
+        "ON test_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("view_person" = "p")                   \
-  table("view_employer_employees" = "ee": "ee.value = p.id") \
-  table("view_employer" = "e": "ee.object_id = e.name")
+#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")
 struct view6c
 {
   #pragma db column("p.first")
-- 
cgit v1.1