Change query syntax to use . for composite and -> for object pointer access

Also make non-inverse query columns act as both an object pointer and a
normal column. The latter allows us to use natural expressions such as
query<employee>::employer.is_null ().

1 files changed, 2 insertions, 2 deletions

diff --git a/common/inheritance/driver.cxx b/common/inheritance/driver.cxx
index ce72863..0106b5b 100644
--- a/common/inheritance/driver.cxx
+++ b/common/inheritance/driver.cxx
@@ -143,7 +143,7 @@ main (int argc, char* argv[])
 
       transaction t (db->begin ());
 
-      assert (!db->query<base> (b_query::comp::num == 10).empty ());
+      assert (!db->query<base> (b_query::comp.num == 10).empty ());
       assert (!db->query<object1> (o1_query::num1 == 21).empty ());
       assert (!db->query<object2> (o2_query::num == 2).empty ());
 
@@ -155,7 +155,7 @@ main (int argc, char* argv[])
       // Query condition with referenced composite member in base class.
       //
       {
-        r_result r (db->query<reference> (r_query::o1::comp::num == 11));
+        r_result r (db->query<reference> (r_query::o1->comp.num == 11));
         assert (!r.empty ());
         delete r.begin ()->o1_;
       }