From 6149a26d16e63d6ab1d2a47a2135a835a8d2caef Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 20 Sep 2011 11:53:03 +0200
Subject: 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 ().
---
 boost/driver.cxx         | 2 +-
 composite/driver.cxx     | 2 +-
 inverse/driver.cxx       | 2 +-
 qt/driver.cxx            | 2 +-
 relationship/driver.cxx  | 2 +-
 schema/custom/driver.cxx | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/boost/driver.cxx b/boost/driver.cxx
index bb1f134..6f59f90 100644
--- a/boost/driver.cxx
+++ b/boost/driver.cxx
@@ -142,7 +142,7 @@ main (int argc, char* argv[])
       transaction t (db->begin ());
 
       result r (db->query<employee> (
-                  query::employer::name == "Complex Systems Inc" &&
+                  query::employer->name == "Complex Systems Inc" &&
                   query::born < date (1978, Apr, 1)));
 
       for (result::iterator i (r.begin ()); i != r.end (); ++i)
diff --git a/composite/driver.cxx b/composite/driver.cxx
index 9c50d45..56be15d 100644
--- a/composite/driver.cxx
+++ b/composite/driver.cxx
@@ -82,7 +82,7 @@ main (int argc, char* argv[])
       transaction t (db->begin ());
 
       result r (db->query<person> (
-                  query::name::extras::nickname == "Squeaky"));
+                  query::name.extras.nickname == "Squeaky"));
 
       if (!r.empty ())
       {
diff --git a/inverse/driver.cxx b/inverse/driver.cxx
index 4aa6bd6..3da8226 100644
--- a/inverse/driver.cxx
+++ b/inverse/driver.cxx
@@ -243,7 +243,7 @@ main (int argc, char* argv[])
       transaction t (db->begin ());
 
       result r (db->query<employee> (
-                  query::employer::name == "Complex Systems Inc"));
+                  query::employer->name == "Complex Systems Inc"));
 
       for (result::iterator i (r.begin ()); i != r.end (); ++i)
         print (*i);
diff --git a/qt/driver.cxx b/qt/driver.cxx
index 3042b48..e15708b 100644
--- a/qt/driver.cxx
+++ b/qt/driver.cxx
@@ -159,7 +159,7 @@ main (int argc, char* argv[])
       transaction t (db->begin ());
 
       result r (db->query<Employee> (
-                  query::employer::name == "Complex Systems Inc" &&
+                  query::employer->name == "Complex Systems Inc" &&
                   query::born < QDate (1978, 4, 1)));
 
       for (result::iterator i (r.begin ()); i != r.end (); ++i)
diff --git a/relationship/driver.cxx b/relationship/driver.cxx
index ed359c1..1690d91 100644
--- a/relationship/driver.cxx
+++ b/relationship/driver.cxx
@@ -153,7 +153,7 @@ main (int argc, char* argv[])
       transaction t (db->begin ());
 
       result r (db->query<employee> (
-                  query::employer::name == "Complex Systems Inc"));
+                  query::employer->name == "Complex Systems Inc"));
 
       for (result::iterator i (r.begin ()); i != r.end (); ++i)
         print (*i);
diff --git a/schema/custom/driver.cxx b/schema/custom/driver.cxx
index 1ca563c..9d049ed 100644
--- a/schema/custom/driver.cxx
+++ b/schema/custom/driver.cxx
@@ -150,7 +150,7 @@ main (int argc, char* argv[])
       session s;
       transaction t (db->begin ());
 
-      result r (db->query<employee> (query::name::last == "Doe"));
+      result r (db->query<employee> (query::name.last == "Doe"));
 
       for (result::iterator i (r.begin ()); i != r.end (); ++i)
       {
-- 
cgit v1.1