From f5e457f5dee11cbd20fc3557f79d6e1f235fb89f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 6 Feb 2015 08:57:30 +0200
Subject: Implement join types support in views

---
 odb/pragma.cxx | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 2 deletions(-)

(limited to 'odb/pragma.cxx')

diff --git a/odb/pragma.cxx b/odb/pragma.cxx
index 618df67..08dc7ae 100644
--- a/odb/pragma.cxx
+++ b/odb/pragma.cxx
@@ -1131,7 +1131,7 @@ handle_pragma (cxx_lexer& l,
   else if (p == "table")
   {
     // table (<name>)
-    // table (<name> [= "<alias>"] [: "<cond>"]  (view only)
+    // table (<name> [= "<alias>"] [type] [: "<cond>"]  (view only)
     //
     // <name> := "name" | "name.name" | "name"."name"
     //
@@ -1183,9 +1183,41 @@ handle_pragma (cxx_lexer& l,
       tt = l.next (tl, &tn);
     }
 
+    if (tt == CPP_NAME)
+    {
+      // We have a JOIN type.
+      //
+      if (tl == "left")
+        vo.join = view_object::left;
+      else if (tl == "right")
+        vo.join = view_object::right;
+      else if (tl == "full")
+        vo.join = view_object::full;
+      else if (tl == "inner")
+        vo.join = view_object::inner;
+      else if (tl == "cross")
+        vo.join = view_object::cross;
+      else
+      {
+        error (l) << "unknown join type '" << tl << "'" << endl;
+        return;
+      }
+
+      tt = l.next (tl, &tn);
+    }
+    else
+      vo.join = view_object::left;
+
     if (tt == CPP_COLON)
     {
       // We have a condition.
+      //
+      if (vo.join == view_object::cross)
+      {
+        error (l)
+          << "no join condition can be specified for a cross join" << endl;
+        return;
+      }
 
       tt = l.next (tl, &tn);
 
@@ -1653,7 +1685,7 @@ handle_pragma (cxx_lexer& l,
   }
   else if (p == "object")
   {
-    // object (fq-name [ = name] [: expr])
+    // object (fq-name [ = name] [type] [: expr])
     //
 
     // Make sure we've got the correct declaration type.
@@ -1706,9 +1738,41 @@ handle_pragma (cxx_lexer& l,
       tt = l.next (tl, &tn);
     }
 
+    if (tt == CPP_NAME)
+    {
+      // We have a JOIN type.
+      //
+      if (tl == "left")
+        vo.join = view_object::left;
+      else if (tl == "right")
+        vo.join = view_object::right;
+      else if (tl == "full")
+        vo.join = view_object::full;
+      else if (tl == "inner")
+        vo.join = view_object::inner;
+      else if (tl == "cross")
+        vo.join = view_object::cross;
+      else
+      {
+        error (l) << "unknown join type '" << tl << "'" << endl;
+        return;
+      }
+
+      tt = l.next (tl, &tn);
+    }
+    else
+      vo.join = view_object::left;
+
     if (tt == CPP_COLON)
     {
       // We have a condition.
+      //
+      if (vo.join == view_object::cross)
+      {
+        error (l)
+          << "no join condition can be specified for a cross join" << endl;
+        return;
+      }
 
       tt = l.next (tl, &tn);
 
-- 
cgit v1.1