Cosmetic changes and cleanups

Rename some functions to have consistent names. Add object() predicate.

4 files changed, 17 insertions, 15 deletions

diff --git a/odb/relational/pgsql/context.cxx b/odb/relational/pgsql/context.cxx
index 6c6c5a0..20dc460 100644
--- a/odb/relational/pgsql/context.cxx
+++ b/odb/relational/pgsql/context.cxx
@@ -113,7 +113,7 @@ namespace relational
         {
           // Ignore transient bases.
           //
-          if (!(c.count ("object") || context::comp_value (c)))
+          if (!(context::object (c) || context::comp_value (c)))
             return;
 
           if (c.count ("pgsql-grow"))
diff --git a/odb/relational/pgsql/header.cxx b/odb/relational/pgsql/header.cxx
index edf9355..1622aff 100644
--- a/odb/relational/pgsql/header.cxx
+++ b/odb/relational/pgsql/header.cxx
@@ -60,7 +60,7 @@ namespace relational
         virtual void
         container_public_extra_pre (semantics::data_member&)
         {
-          if (!c_.count ("object") || abstract (c_))
+          if (!object (c_) || abstract (c_))
             return;
 
           // Container statement names.
diff --git a/odb/relational/pgsql/schema.cxx b/odb/relational/pgsql/schema.cxx
index 0e66e79..761206e 100644
--- a/odb/relational/pgsql/schema.cxx
+++ b/odb/relational/pgsql/schema.cxx
@@ -134,7 +134,7 @@ namespace relational
         }
 
         virtual bool
-        column (semantics::data_member& m, string const& name, bool)
+        traverse_column (semantics::data_member& m, string const& name, bool)
         {
           if (inverse (m))
             return false;
@@ -186,7 +186,7 @@ namespace relational
         }
 
         virtual void
-        container (semantics::data_member& m, semantics::type& t)
+        traverse_container (semantics::data_member& m, semantics::type& t)
         {
           using semantics::type;
           using semantics::data_member;
@@ -208,7 +208,7 @@ namespace relational
           {
             object_columns_references ocr (e_, os_, name, "id");
             string id_name (column_name (m, "id", "object_id"));
-            ocr.column (m, id_name, true);
+            ocr.traverse_column (m, id_name, true);
           }
 
           // value
@@ -216,13 +216,13 @@ namespace relational
           if (semantics::class_* cvt = comp_value_wrapper (vt))
           {
             object_columns_references ocr (e_, os_, name);
-            ocr.traverse_composite (m, *cvt, "value", "value");
+            ocr.traverse (m, *cvt, "value", "value");
           }
           else
           {
             object_columns_references ocr (e_, os_, name, "value");
             string const& value_name (column_name (m, "value", "value"));
-            ocr.column (m, value_name, true);
+            ocr.traverse_column (m, value_name, true);
           }
 
           tables_.insert (name);
@@ -250,7 +250,7 @@ namespace relational
           if (c.file () != unit.file ())
             return;
 
-          if (!c.count ("object") || abstract (c))
+          if (!object (c) || abstract (c))
             return;
 
           string const& name (table_name (c));
diff --git a/odb/relational/pgsql/source.cxx b/odb/relational/pgsql/source.cxx
index 331463d..5050315 100644
--- a/odb/relational/pgsql/source.cxx
+++ b/odb/relational/pgsql/source.cxx
@@ -105,7 +105,9 @@ namespace relational
       struct statement_oids: object_columns_base, context
       {
         virtual bool
-        column (semantics::data_member& m, std::string const&, bool first)
+        traverse_column (semantics::data_member& m,
+                         std::string const&,
+                         bool first)
         {
           if (!first)
             os << ',' << endl;
@@ -933,7 +935,7 @@ namespace relational
                << "{";
 
             instance<statement_oids> st;
-            st->column (*id_m, "", true);
+            st->traverse_column (*id_m, "", true);
 
             os << "};";
           }
@@ -947,7 +949,7 @@ namespace relational
 
             instance<statement_oids> st;
             st->traverse (t);
-            st->column (*id_m, "", false);
+            st->traverse_column (*id_m, "", false);
 
             os << "};";
           }
@@ -960,7 +962,7 @@ namespace relational
                << "{";
 
             instance<statement_oids> st;
-            st->column (*id_m, "", true);
+            st->traverse_column (*id_m, "", true);
 
             os << "};";
           }
@@ -1005,7 +1007,7 @@ namespace relational
         virtual void
         container_extra (semantics::data_member& m, semantics::type& t)
         {
-          if (!c_.count ("object") || abstract (c_))
+          if (!object (c_) || abstract (c_))
             return;
 
           string scope (scope_ + "::" + prefix_ + public_name (m) + "_traits");
@@ -1095,7 +1097,7 @@ namespace relational
                       comp_value_wrapper (container_kt (t)))
                   {
                     instance<statement_oids> st;
-                    st->traverse_composite (m, *ktc, "key", "key");
+                    st->traverse (m, *ktc, "key", "key");
                     os << ",";
                   }
                   else
@@ -1113,7 +1115,7 @@ namespace relational
               if (semantics::class_* vtc = comp_value_wrapper (vt))
               {
                 instance <statement_oids> st;
-                st->traverse_composite (m, *vtc, "value", "value");
+                st->traverse (m, *vtc, "value", "value");
               }
               else
                 os << oids[column_sql_type (m, "value").type];