Adopt to some bpkg namespace types reshape

3 files changed, 22 insertions, 31 deletions

diff --git a/brep/package b/brep/package
index ddfc179..6ca0c12 100644
--- a/brep/package
+++ b/brep/package
@@ -45,13 +45,17 @@ namespace brep
 // bpkg namespace from which we "borrow" types (and some of them use
 // version).
 //
-#pragma db map type(bpkg::version) as(brep::_version)                    \
-  to(brep::_version{(?).epoch (),                                        \
-                    (?).upstream (),                                     \
-                    (?).revision (),                                     \
-                    (?).canonical_upstream ()})                          \
+#pragma db map type(bpkg::version) as(brep::_version)                     \
+  to(brep::_version{(?).epoch,                                            \
+                    (?).upstream,                                         \
+                    (?).revision,                                         \
+                    (?).canonical_upstream})                              \
   from(bpkg::version ((?).epoch, std::move ((?).upstream), (?).revision))
 
+#pragma db map type(bpkg::comparison) as(std::string) \
+    to(bpkg::to_string (?))                           \
+    from(bpkg::to_comparison (?))
+
 namespace brep
 {
   // @@ If namespace, then should probably call it 'repo'.
@@ -157,9 +161,8 @@ namespace brep
   // dependencies
   //
   using comparison = bpkg::comparison;
-  using version_comparison = bpkg::version_comparison;
-  #pragma db value(version_comparison) definition
-  #pragma db member(version_comparison::value) column("")
+  using dependency_condition = bpkg::dependency_condition;
+  #pragma db value(dependency_condition) definition
 
   // Notes:
   //
@@ -192,6 +195,7 @@ namespace brep
   //
   using dependency = bpkg::dependency;
   #pragma db value(dependency) definition
+  #pragma db member(dependency::condition) column("")
 
   using dependency_alternatives = bpkg::dependency_alternatives;
   #pragma db value(dependency_alternatives) definition
diff --git a/brep/package-version-details.cxx b/brep/package-version-details.cxx
index 162e783..0d08a45 100644
--- a/brep/package-version-details.cxx
+++ b/brep/package-version-details.cxx
@@ -116,9 +116,7 @@ namespace brep
 
     try
     {
-      package_version_id id {
-        p, v.epoch (), v.canonical_upstream (), v.revision ()};
-
+      package_version_id id {p, v.epoch, v.canonical_upstream, v.revision};
       pv = db_->load<package_version> (id);
 
       // If the requested package version turned up to be an "external" one
@@ -193,22 +191,11 @@ namespace brep
           if (&d != &da[0])
             s << " | ";
 
-          // @@ Should it be a link to package version search page on the
+          // @@ Should it be a link to the package version search page or
+          //    the best matching package version details page on the
           //    corresponding repository site ?
           //
-          s << d.package;
-
-          if (d.version)
-          {
-            static const strings operations ({"==", "<", ">", "<=", ">="});
-            size_t op (static_cast<size_t> (d.version->operation));
-            assert (op < operations.size ());
-
-            // @@ Should it be a link to the best matching package version
-            //    details page on the corresponding repository site ?
-            //
-            s << " " << operations[op] << " " << d.version->value.string ();
-          }
+          s << d;
         }
 
         if (!da.comment.empty ())
diff --git a/brep/package.cxx b/brep/package.cxx
index 8b9a219..b0c1115 100644
--- a/brep/package.cxx
+++ b/brep/package.cxx
@@ -88,11 +88,11 @@ namespace brep
     return _id_type {
       {
         package.object_id (),
-        version.epoch (),
-        version.canonical_upstream (),
-        version.revision ()
+        version.epoch,
+        version.canonical_upstream,
+        version.revision
       },
-      version.upstream ()};
+      version.upstream};
   }
 
   void package_version::
@@ -100,7 +100,7 @@ namespace brep
   {
     package = lazy_shared_ptr<package_type> (db, v.data.package);
     version = version_type (v.data.epoch, move (v.upstream), v.data.revision);
-    assert (version.canonical_upstream () == v.data.canonical_upstream);
+    assert (version.canonical_upstream == v.data.canonical_upstream);
   }
 
   // max_package_version
@@ -109,7 +109,7 @@ namespace brep
   _id (package_version::_id_type&& v)
   {
     version = version_type (v.data.epoch, move (v.upstream), v.data.revision);
-    assert (version.canonical_upstream () == v.data.canonical_upstream);
+    assert (version.canonical_upstream == v.data.canonical_upstream);
   }
 
   // repository