Merge branch 'jb44713-empty-subtypes' into 'master'

[qtcontacts-sqlite] Allow empty sub-type for urls and anniversaries. Contributes to JB#44713 See merge request mer-core/qtcontacts-sqlite!18
sailfishos · Apr 18, 2019 · 3959d16 · 3959d16
2 parents 7b785aa + 0ec76a9
commit 3959d16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/engine/contactreader.cpp b/src/engine/contactreader.cpp
@@ -240,7 +240,7 @@ static void setValues(QContactAnniversary *detail, QSqlQuery *query, const int o
 
     setValue(detail, T::FieldOriginalDate, dateValue(query->value(offset + 0)));
     setValue(detail, T::FieldCalendarId  , query->value(offset + 1));
-    setValue(detail, T::FieldSubType     , QVariant::fromValue<int>(query->value(offset + 2).toString().toInt()));
+    setValue(detail, T::FieldSubType     , QVariant::fromValue<QString>(query->value(offset + 2).toString()));
     setValue(detail, T::FieldEvent       , query->value(offset + 3));
 }
 
@@ -532,7 +532,7 @@ static void setValues(QContactUrl *detail, QSqlQuery *query, const int offset)
     typedef QContactUrl T;
 
     setValue(detail, T::FieldUrl    , urlValue(query->value(offset + 0)));
-    setValue(detail, T::FieldSubType, QVariant::fromValue<int>(query->value(offset + 1).toString().toInt()));
+    setValue(detail, T::FieldSubType, QVariant::fromValue<QString>(query->value(offset + 1).toString()));
 }
 
 static const FieldInfo originMetadataFields[] =

diff --git a/src/engine/contactwriter.cpp b/src/engine/contactwriter.cpp
@@ -1659,7 +1659,7 @@ ContactsDatabase::Query bindDetail(ContactsDatabase &db, quint32 contactId, quin
     query.addBindValue(contactId);
     query.addBindValue(detailValue(detail, T::FieldOriginalDate));
     query.addBindValue(detailValue(detail, T::FieldCalendarId));
-    query.addBindValue(QString::number(detail.subType()));
+    query.addBindValue(detail.hasValue(T::FieldSubType) ? QString::number(detail.subType()) : QString());
     query.addBindValue(detail.value<QString>(T::FieldEvent).trimmed());
     return query;
 }
@@ -2172,7 +2172,7 @@ ContactsDatabase::Query bindDetail(ContactsDatabase &db, quint32 contactId, quin
     query.addBindValue(detailId);
     query.addBindValue(contactId);
     query.addBindValue(detail.value<QString>(T::FieldUrl).trimmed());
-    query.addBindValue(QString::number(detail.subType()));
+    query.addBindValue(detail.hasValue(T::FieldSubType) ? QString::number(detail.subType()) : QString());
     return query;
 }