From 819472d366d5447c4a761c9e97533d1fe3a835b2 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Thu, 18 Sep 2014 11:44:25 +0200
Subject: [PATCH 1/2] Fix owncloud man page formatting

---
 doc/conffile.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/conffile.rst b/doc/conffile.rst
index 57fcf07660..5295bbf843 100644
--- a/doc/conffile.rst
+++ b/doc/conffile.rst
@@ -1,12 +1,12 @@
 The ownCloud Client reads a configuration file.  You can locate this configuration files as follows:
 
-- On Linux distributions:
+On Linux distributions:
         ``$HOME/.local/share/data/ownCloud/owncloud.cfg``
 
-- In Microsoft Windows systems:
+On Microsoft Windows systems:
         ``%LOCALAPPDATA%\ownCloud\owncloud.cfg``
 
-- In MAC OS X systems:
+On MAC OS X systems:
         ``$HOME/Library/Application Support/ownCloud``
 
 

From e9248066df97fdc90d263f0c588b6869bdaa8751 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Thu, 18 Sep 2014 11:44:47 +0200
Subject: [PATCH 2/2] SyncJournal: Better error report for sql statements in
 updateDbStructure

Also, even if the updateDatabaseStructure fails, precompile the sql
statements.

This will help to debug and maybe solve bug #2106
---
 src/mirall/syncjournaldb.cpp | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp
index 1f3be5308f..c77a223f7f 100644
--- a/src/mirall/syncjournaldb.cpp
+++ b/src/mirall/syncjournaldb.cpp
@@ -228,6 +228,9 @@ bool SyncJournalDb::checkConnect()
     commitInternal("checkConnect");
 
     bool rc = updateDatabaseStructure();
+    if( !rc ) {
+        qDebug() << "WARN: Failed to update the database structure!";
+    }
 
     _getFileRecordQuery.reset(new QSqlQuery(_db));
     _getFileRecordQuery->prepare("SELECT path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm FROM "
@@ -311,20 +314,19 @@ bool SyncJournalDb::updateDatabaseStructure()
     if( !checkConnect() ) {
         return false;
     }
-    if( columns.indexOf(QLatin1String("fileid")) == -1 ) {
 
+    if( columns.indexOf(QLatin1String("fileid")) == -1 ) {
         QSqlQuery query(_db);
         query.prepare("ALTER TABLE metadata ADD COLUMN fileid VARCHAR(128);");
-        re = query.exec();
-        if(!re) {
-            qDebug() << Q_FUNC_INFO << "SQL Error " << query.lastError().text();
+        if( !query.exec() ) {
+            sqlFail("updateDatabaseStructure: Add column fileid", query);
+            re = false;
         }
 
         query.prepare("CREATE INDEX metadata_file_id ON metadata(fileid);");
-        re = re && query.exec();
-
-        if(!re) {
-            qDebug() << Q_FUNC_INFO << "SQL Error " << query.lastError().text();
+        if( ! query.exec() ) {
+            sqlFail("updateDatabaseStructure: create index fileid", query);
+            re = false;
         }
         commitInternal("update database structure: add fileid col");
     }
@@ -332,9 +334,9 @@ bool SyncJournalDb::updateDatabaseStructure()
 
         QSqlQuery query(_db);
         query.prepare("ALTER TABLE metadata ADD COLUMN remotePerm VARCHAR(128);");
-        re = re && query.exec();
-        if(!re) {
-            qDebug() << Q_FUNC_INFO << "SQL Error " << query.lastError().text();
+        if( !query.exec()) {
+            sqlFail("updateDatabaseStructure: add column remotePerm", query);
+            re = false;
         }
         commitInternal("update database structure (remotePerm");
     }
@@ -342,10 +344,9 @@ bool SyncJournalDb::updateDatabaseStructure()
     if( 1 ) {
         QSqlQuery query(_db);
         query.prepare("CREATE INDEX IF NOT EXISTS metadata_inode ON metadata(inode);");
-        re = re && query.exec();
-
-        if(!re) {
-            qDebug() << Q_FUNC_INFO << "SQL Error " << query.lastError().text();
+        if( !query.exec()) {
+            sqlFail("updateDatabaseStructure: create index inode", query);
+            re = false;
         }
         commitInternal("update database structure: add inode index");
 
@@ -354,10 +355,9 @@ bool SyncJournalDb::updateDatabaseStructure()
     if( 1 ) {
         QSqlQuery query(_db);
         query.prepare("CREATE INDEX IF NOT EXISTS metadata_pathlen ON metadata(pathlen);");
-        re = re && query.exec();
-
-        if(!re) {
-            qDebug() << Q_FUNC_INFO << "SQL Error " << query.lastError().text();
+        if( !query.exec()) {
+            sqlFail("updateDatabaseStructure: create index pathlen", query);
+            re = false;
         }
         commitInternal("update database structure: add pathlen index");