From 098b528e2deddd128a05d91ea6b7a555a74b22b2 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 7 Feb 2015 15:44:02 +0200
Subject: Disable parts of test for multi-database case

Since not all the databases support them (JOIN types).
---
 common/view/basics/driver.cxx | 6 ++++--
 common/view/basics/test.hxx   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'common')

diff --git a/common/view/basics/driver.cxx b/common/view/basics/driver.cxx
index 652da58..c1108d7 100644
--- a/common/view/basics/driver.cxx
+++ b/common/view/basics/driver.cxx
@@ -720,7 +720,7 @@ main (int argc, char* argv[])
         t.commit ();
       }
 
-#if !defined(DATABASE_SQLITE)
+#if !defined(DATABASE_SQLITE) && !defined(DATABASE_COMMON)
       {
         typedef odb::query<vright> query;
         typedef odb::result<vright> result;
@@ -737,7 +737,9 @@ main (int argc, char* argv[])
       }
 #endif
 
-#if !defined(DATABASE_MYSQL) && !defined(DATABASE_SQLITE)
+#if !defined(DATABASE_MYSQL) &&  \
+    !defined(DATABASE_SQLITE) && \
+    !defined(DATABASE_COMMON)
       {
         typedef odb::query<vfull> query;
         typedef odb::result<vfull> result;
diff --git a/common/view/basics/test.hxx b/common/view/basics/test.hxx
index 7af255c..87c4d76 100644
--- a/common/view/basics/test.hxx
+++ b/common/view/basics/test.hxx
@@ -546,7 +546,7 @@ namespace test2
     odb::nullable<int> id2;
   };
 
-#if !defined(DATABASE_SQLITE)
+#if !defined(DATABASE_SQLITE) && !defined(DATABASE_COMMON)
 
   #pragma db view object(obj2 = o2) object(obj1 = o1 right: o2::n == o1::n)
   struct vright
@@ -557,7 +557,9 @@ namespace test2
 
 #endif
 
-#if !defined(DATABASE_MYSQL) && !defined(DATABASE_SQLITE)
+#if !defined(DATABASE_MYSQL) &&  \
+    !defined(DATABASE_SQLITE) && \
+    !defined(DATABASE_COMMON)
 
   #pragma db view object(obj1 = o1) object(obj2 = o2 full: o1::n == o2::n)
   struct vfull
-- 
cgit v1.1