From c3c42b69ee9cda9634573497c4476a05c1f3d049 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 12 Sep 2013 06:56:02 +0200
Subject: Make sure that soft-add/delete version is current version

---
 odb/context.hxx | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

(limited to 'odb/context.hxx')

diff --git a/odb/context.hxx b/odb/context.hxx
index 416c7c6..f188a41 100644
--- a/odb/context.hxx
+++ b/odb/context.hxx
@@ -136,9 +136,10 @@ struct default_value
   };
 };
 
-// Database potentially-qualified name.
+// Database potentially-qualified and unqualifed names.
 //
 using semantics::relational::qname;
+using semantics::relational::uname;
 
 // Object or table associated with the view.
 //
@@ -771,6 +772,28 @@ public:
     return r;
   }
 
+  static semantics::data_member*
+  deleted_member (data_member_path const& mp)
+  {
+    semantics::data_member* m (0);
+
+    // Find the earliest version since this member was deleted.
+    //
+    unsigned long long r (0);
+    for (data_member_path::const_reverse_iterator i (mp.rbegin ());
+         i != mp.rend (); ++i)
+    {
+      unsigned long long v ((*i)->get<unsigned long long> ("deleted", 0));
+      if (v != 0 && (r == 0 || v < r))
+      {
+        r = v;
+        m = *i;
+      }
+    }
+
+    return m;
+  }
+
   // Return the addition version or 0 if not soft-added.
   //
   static unsigned long long
@@ -797,6 +820,28 @@ public:
     return r;
   }
 
+  static semantics::data_member*
+  added_member (data_member_path const& mp)
+  {
+    semantics::data_member* m (0);
+
+    // Find the latest version since this member was added.
+    //
+    unsigned long long r (0);
+    for (data_member_path::const_reverse_iterator i (mp.rbegin ());
+         i != mp.rend (); ++i)
+    {
+      unsigned long long v ((*i)->get<unsigned long long> ("added", 0));
+      if (v != 0 && v > r)
+      {
+        r = v;
+        m = *i;
+      }
+    }
+
+    return m;
+  }
+
   static bool
   id (semantics::data_member& m)
   {
-- 
cgit v1.1