Merge lp:~kevin-wright-1/u1db-qt/document-april-6-i into lp:u1db-qt

[Cris Dywan]

"Added a 'revise' property to Document and accompanying functionality that provides the ability to modify existing documents in the database (if the docId already exists).

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:64
http://91.189.93.125:8080/job/u1db-qt-ci/21/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/21
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/21

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/21/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

I'm unsure of the 'revise' functionality, it looks to do mostly what I *intended* 'create' for, *maybe* hinting at a bug in existing code. I'll prefer to discuss this in detail before making a decision.

review: Needs Information

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:64
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kevin-wright-1/u1db-qt/document-april-6-i/+merge/157621/+edit-commit-message

http://91.189.93.125:8080/job/u1db-qt-ci/28/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/28
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/28

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/28/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

For the record: as discussed, the extra API isn't needed. 'contents' should be used instead.

review: Disapprove

Unmerged revisions

64. By Kevin Wright on 2013-04-06

Added a 'revise' property to Document and accompanying functionality that provides the abilty to modify existing documents in the database (if the docId already exists).

=== modified file 'database.cpp'
--- database.cpp	2013-04-06 02:14:24 +0000
+++ database.cpp	2013-04-08 10:16:23 +0000
@@ -317,6 +317,7 @@
         query.bindValue(":docRev", newRev);
         // Parse Variant from QML as JsonDocument, fallback to string
         QString json(QJsonDocument::fromVariant(newDoc).toJson());
+
         query.bindValue(":docJson", json.isEmpty() ? newDoc : json);
         if (!query.exec())
             return setError(QString("Failed to put/ update document %1: %2\n%3").arg(docId).arg(query.lastError().text()).arg(query.lastQuery())) ? -1 : -1;
 
=== modified file 'document.cpp'
--- document.cpp	2013-04-03 15:36:45 +0000
+++ document.cpp	2013-04-08 10:16:23 +0000
@@ -145,7 +145,36 @@
     Q_EMIT createChanged(create);
 
     if (m_create && m_database && m_defaults.isValid() && !m_database->getDocUnchecked(m_docId).isValid())
-        m_database->putDoc(m_defaults, m_docId);
+    {
+        m_database->putDoc(m_defaults, m_docId);
+    }
+
+}
+
+bool
+Document::getRevise()
+{
+    return m_revise;
+}
+
+/*!
+    If revise is true, docId is not empty and no document with the same docId
+    exists, defaults will be used to store the document.
+ */
+void
+Document::setRevise(bool revise)
+{
+    if (m_revise == revise)
+        return;
+
+    m_revise = revise;
+    Q_EMIT reviseChanged(revise);
+
+    if (m_revise && m_database && m_defaults.isValid() && m_database->getDocUnchecked(m_docId).isValid())
+    {
+        m_database->putDoc(m_defaults, m_docId);
+    }
+
 }
 
 QVariant
@@ -167,10 +196,17 @@
         return;
 
     m_defaults = defaults;
+
     Q_EMIT defaultsChanged(defaults);
 
     if (m_create && m_database && m_defaults.isValid() && !m_database->getDocUnchecked(m_docId).isValid())
-        m_database->putDoc(m_defaults, m_docId);
+    {
+        m_database->putDoc(m_defaults, m_docId);
+    }
+    else if (m_revise && m_database && m_defaults.isValid() && m_database->getDocUnchecked(m_docId).isValid())
+    {
+        m_database->putDoc(m_defaults, m_docId);
+    }
 }
 
 /*!
 
=== modified file 'document.h'
--- document.h	2013-04-03 15:36:45 +0000
+++ document.h	2013-04-08 10:16:23 +0000
@@ -37,6 +37,7 @@
 #endif
     Q_PROPERTY(QString docId READ getDocId WRITE setDocId NOTIFY docIdChanged)
     Q_PROPERTY(bool create READ getCreate WRITE setCreate NOTIFY createChanged)
+    Q_PROPERTY(bool revise READ getRevise WRITE setRevise NOTIFY reviseChanged)
     Q_PROPERTY(QVariant defaults READ getDefaults WRITE setDefaults NOTIFY defaultsChanged)
     Q_PROPERTY(QVariant contents READ getContents WRITE setContents NOTIFY contentsChanged)
 public:
@@ -48,7 +49,9 @@
     QString getDocId();
     void setDocId(const QString& docId);
     bool getCreate();
+    bool getRevise();
     void setCreate(bool create);
+    void setRevise(bool revise);
     QVariant getDefaults();
     void setDefaults(QVariant defaults);
     QVariant getContents();
@@ -57,6 +60,7 @@
     void databaseChanged(Database* database);
     void docIdChanged(const QString& docId);
     void createChanged(bool create);
+    void reviseChanged(bool revise);
     void defaultsChanged(QVariant defaults);
     void contentsChanged(QVariant contents);
 private:
@@ -64,6 +68,7 @@
     Database* m_database;
     QString m_docId;
     bool m_create;
+    bool m_revise;
     QVariant m_defaults;
     QVariant m_contents;