Revert "Revert "Merge remote-tracking branch 'origin/4.15'""

This reverts commit f0a86d45104f585b7aeef07fcc68cea24061aedb.

Reverting a merge doesn't "undo" it - the changes would be lost
forever even with subsequent merges.
So we need to revert the revert to get the changes.

Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3
Reviewed-by: Marco Bubke <[email protected]>

1 files changed, 12 insertions, 6 deletions

diff --git a/src/libs/sqlite/sqlstatementbuilder.cpp b/src/libs/sqlite/sqlstatementbuilder.cpp
index ecef170a346..7a6cc1a81a3 100644
--- a/src/libs/sqlite/sqlstatementbuilder.cpp
+++ b/src/libs/sqlite/sqlstatementbuilder.cpp
@@ -179,12 +179,18 @@ bool SqlStatementBuilder::isBuild() const
 Utils::SmallString SqlStatementBuilder::columnTypeToString(ColumnType columnType)
 {
     switch (columnType) {
-        case ColumnType::Numeric: return "NUMERIC";
-        case ColumnType::Integer: return "INTEGER";
-        case ColumnType::Real: return "REAL";
-        case ColumnType::Text: return "TEXT";
-        case ColumnType::Blob: return "BLOB";
-        case ColumnType::None: return {};
+    case ColumnType::Numeric:
+        return " NUMERIC";
+    case ColumnType::Integer:
+        return " INTEGER";
+    case ColumnType::Real:
+        return " REAL";
+    case ColumnType::Text:
+        return " TEXT";
+    case ColumnType::Blob:
+        return " BLOB";
+    case ColumnType::None:
+        return {};
     }
 
     Q_UNREACHABLE();