From 732dd69e4d9e1b70edffad9829e34d84155cd91b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 18 Jul 2017 14:55:38 +0300
Subject: Adapt to non-optional buildtab target

---
 libbrep/build.cxx |  2 +-
 libbrep/build.hxx | 17 +++++------------
 libbrep/build.xml |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'libbrep')

diff --git a/libbrep/build.cxx b/libbrep/build.cxx
index 78a3a2d..10ff792 100644
--- a/libbrep/build.cxx
+++ b/libbrep/build.cxx
@@ -60,7 +60,7 @@ namespace brep
          string tnm, version tvr,
          optional<string> afp, optional<string> ach,
          string mnm, string msm,
-         optional<butl::target_triplet> trg)
+         butl::target_triplet trg)
       : id (package_id (move (pnm), pvr), move (cfg), tvr),
         package_name (id.package.name),
         package_version (move (pvr)),
diff --git a/libbrep/build.hxx b/libbrep/build.hxx
index 7f0aba6..7edf70c 100644
--- a/libbrep/build.hxx
+++ b/libbrep/build.hxx
@@ -146,13 +146,9 @@ namespace brep
 
   // target_triplet
   //
-  using optional_target_triplet = optional<butl::target_triplet>;
-
-  #pragma db map type(optional_target_triplet) as(optional_string) \
-    to((?) ? (?)->string () : brep::optional_string ())            \
-    from((?)                                                       \
-         ? butl::target_triplet (*(?))                             \
-         : brep::optional_target_triplet ())
+  #pragma db map type(butl::target_triplet) as(string) \
+    to((?).string ())                                  \
+    from(butl::target_triplet (?))
 
   // operation_results
   //
@@ -176,7 +172,7 @@ namespace brep
            optional<string> agent_fingerprint,
            optional<string> agent_challenge,
            string machine, string machine_summary,
-           optional<butl::target_triplet> target);
+           butl::target_triplet);
 
     build_id id;
 
@@ -206,10 +202,7 @@ namespace brep
 
     string machine;
     string machine_summary;
-
-    // Default for the machine if absent.
-    //
-    optional<butl::target_triplet> target;
+    butl::target_triplet target;
 
     // Note that the logs are stored as std::string/TEXT which is Ok since
     // they are UTF-8 and our database is UTF-8.
diff --git a/libbrep/build.xml b/libbrep/build.xml
index 5b45d6d..e765c00 100644
--- a/libbrep/build.xml
+++ b/libbrep/build.xml
@@ -24,7 +24,7 @@
       <column name="agent_challenge" type="TEXT" null="true"/>
       <column name="machine" type="TEXT" null="false"/>
       <column name="machine_summary" type="TEXT" null="false"/>
-      <column name="target" type="TEXT" null="true"/>
+      <column name="target" type="TEXT" null="false"/>
       <primary-key>
         <column name="package_name"/>
         <column name="package_version_epoch"/>
-- 
cgit v1.1