Split 'in' binding into insert/update pair; rename 'out' to select

Also add the initial infrastructure for the readonly members support.
Right now the split insert/update bindings allows us to avoid sending
object id in UPDATE statements. It will also allows us to support
readonly members.

1 files changed, 49 insertions, 7 deletions

diff --git a/odb/relational/sqlite/source.cxx b/odb/relational/sqlite/source.cxx
index 8b02e6c..89173dd 100644
--- a/odb/relational/sqlite/source.cxx
+++ b/odb/relational/sqlite/source.cxx
@@ -49,7 +49,10 @@ namespace relational
                << "//" << endl;
 
             if (inverse (mi.m, key_prefix_))
-              os << "if (out)"
+              os << "if (sk == statement_select)"
+                 << "{";
+            else if (id (mi.m) || readonly (mi.m))
+              os << "if (sk != statement_update)"
                  << "{";
           }
 
@@ -62,11 +65,42 @@ namespace relational
           if (var_override_.empty ())
           {
             if (semantics::class_* c = composite (mi.t))
-              os << "n += " << in_column_count (*c) << "UL;";
+            {
+              column_count_type const& cc (column_count (*c));
+
+              os << "n += " << cc.total << "UL";
+
+              // select = total
+              // insert = total - inverse
+              // update = total - inverse - readonly
+              //
+              if (cc.inverse != 0 || cc.readonly != 0)
+              {
+                os << " - (" << endl
+                   << "sk == statement_select ? 0 : ";
+
+                if (cc.inverse != 0)
+                  os << cc.inverse << "UL" << endl;
+
+                if (cc.readonly != 0)
+                {
+                  if (cc.inverse != 0)
+                    os << " + ";
+
+                  os << "(" << endl
+                     << "sk == statement_insert ? 0 : " <<
+                    cc.readonly << "UL)";
+                }
+
+                os << ")";
+              }
+
+              os << ";";
+            }
             else
               os << "n++;";
 
-            if (inverse (mi.m, key_prefix_))
+            if (inverse (mi.m, key_prefix_) || id (mi.m) || readonly (mi.m))
               os << "}";
             else
               os << endl;
@@ -77,7 +111,7 @@ namespace relational
         traverse_composite (member_info& mi)
         {
           os << "composite_value_traits< " << mi.fq_type () <<
-            " >::bind (b + n, " << arg << "." << mi.var << "value);";
+            " >::bind (b + n, " << arg << "." << mi.var << "value, sk);";
         }
 
         virtual void
@@ -158,7 +192,7 @@ namespace relational
         post (member_info& mi)
         {
           if (semantics::class_* c = composite (mi.t))
-            index_ += in_column_count (*c);
+            index_ += column_count (*c).total;
           else
             index_++;
         }
@@ -223,7 +257,7 @@ namespace relational
         pre (member_info& mi)
         {
           // Ignore containers (they get their own table) and inverse
-          // object pointers (they are not present in the 'in' binding).
+          // object pointers (they are not present in this binding).
           //
           if (container (mi.t) || inverse (mi.m, key_prefix_))
             return false;
@@ -237,6 +271,11 @@ namespace relational
 
             os << "// " << name << endl
                << "//" << endl;
+
+            if (id (mi.m) || readonly (mi.m))
+              // The block scope is added later, if necessary.
+              //
+              os << "if (sk == statement_insert)";
           }
 
           // If this is a wrapped composite value, then we need to
@@ -345,9 +384,12 @@ namespace relational
         virtual void
         traverse_composite (member_info& mi)
         {
+          // Should be a single statement or a block.
+          //
           os << "if (" << traits << "::init (" << endl
              << "i." << mi.var << "value," << endl
-             << member << "))"
+             << member << "," << endl
+             << "sk))"
              << "{"
              << "grew = true;"
              << "}";