From 20a456e33222ed31008db3c328f1e10c212acf00 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 12 Jun 2018 13:57:31 +0300
Subject: Make project url and email optional in package manifest

---
 libbrep/package.cxx |  4 ++--
 libbrep/package.hxx | 12 ++++++------
 libbrep/package.xml | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'libbrep')

diff --git a/libbrep/package.cxx b/libbrep/package.cxx
index 7d94422..3e457b2 100644
--- a/libbrep/package.cxx
+++ b/libbrep/package.cxx
@@ -55,11 +55,11 @@ namespace brep
            strings tg,
            optional<string> ds,
            string ch,
-           url_type ur,
+           optional<url_type> ur,
            optional<url_type> du,
            optional<url_type> su,
            optional<url_type> pu,
-           email_type em,
+           optional<email_type> em,
            optional<email_type> pe,
            optional<email_type> be,
            dependencies_type dp,
diff --git a/libbrep/package.hxx b/libbrep/package.hxx
index b86350e..d403784 100644
--- a/libbrep/package.hxx
+++ b/libbrep/package.hxx
@@ -19,9 +19,9 @@
 
 // Used by the data migration entries.
 //
-#define LIBBREP_PACKAGE_SCHEMA_VERSION_BASE 6
+#define LIBBREP_PACKAGE_SCHEMA_VERSION_BASE 7
 
-#pragma db model version(LIBBREP_PACKAGE_SCHEMA_VERSION_BASE, 6, closed)
+#pragma db model version(LIBBREP_PACKAGE_SCHEMA_VERSION_BASE, 7, open)
 
 namespace brep
 {
@@ -306,11 +306,11 @@ namespace brep
              strings tags,
              optional<string> description,
              string changes,
-             url_type,
+             optional<url_type>,
              optional<url_type> doc_url,
              optional<url_type> src_url,
              optional<url_type> package_url,
-             email_type,
+             optional<email_type>,
              optional<email_type> package_email,
              optional<email_type> build_email,
              dependencies_type,
@@ -342,11 +342,11 @@ namespace brep
     strings tags;
     optional<string> description;
     string changes;
-    url_type url;
+    optional<url_type> url;
     optional<url_type> doc_url;
     optional<url_type> src_url;
     optional<url_type> package_url;
-    email_type email;
+    optional<email_type> email;
     optional<email_type> package_email;
     optional<email_type> build_email;
     dependencies_type dependencies;
diff --git a/libbrep/package.xml b/libbrep/package.xml
index 9b83bb2..08ecc61 100644
--- a/libbrep/package.xml
+++ b/libbrep/package.xml
@@ -1,5 +1,5 @@
 <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" schema-name="package" version="1">
-  <model version="6">
+  <model version="7">
     <table name="repository" kind="object">
       <column name="name" type="TEXT" null="false"/>
       <column name="location" type="TEXT" null="false"/>
@@ -82,16 +82,16 @@
       <column name="summary" type="TEXT" null="false"/>
       <column name="description" type="TEXT" null="true"/>
       <column name="changes" type="TEXT" null="false"/>
-      <column name="url" type="TEXT" null="false"/>
-      <column name="url_comment" type="TEXT" null="false"/>
+      <column name="url" type="TEXT" null="true"/>
+      <column name="url_comment" type="TEXT" null="true"/>
       <column name="doc_url" type="TEXT" null="true"/>
       <column name="doc_url_comment" type="TEXT" null="true"/>
       <column name="src_url" type="TEXT" null="true"/>
       <column name="src_url_comment" type="TEXT" null="true"/>
       <column name="package_url" type="TEXT" null="true"/>
       <column name="package_url_comment" type="TEXT" null="true"/>
-      <column name="email" type="TEXT" null="false"/>
-      <column name="email_comment" type="TEXT" null="false"/>
+      <column name="email" type="TEXT" null="true"/>
+      <column name="email_comment" type="TEXT" null="true"/>
       <column name="package_email" type="TEXT" null="true"/>
       <column name="package_email_comment" type="TEXT" null="true"/>
       <column name="build_email" type="TEXT" null="true"/>
-- 
cgit v1.1