Skip to content

Commit

Permalink
[qtcontacts-sqlite] Access columns via a mutable index
Browse files Browse the repository at this point in the history 
This makes it easier to move fields around without having to change a
lot of code; this is especially useful when trying to reduce git diffs
(and conflicts).
  • Loading branch information
@mardy
mardy committed May 18, 2019
1 parent 47dc7f4 commit ead1bf2
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 71 deletions.
62 changes: 32 additions & 30 deletions src/engine/contactreader.cpp
View file
Expand Up @@ -595,13 +595,14 @@ static void readDetail(QContact *contact, QSqlQuery &query, quint32 contactId, q
const quint32 contactId = query.value(1).toUInt();
const QString detailName = query.value(2).toString();
*/
const QString detailUriValue = query.value(3).toString();
const QString linkedDetailUrisValue = query.value(4).toString();
const QString contextValue = query.value(5).toString();
const int accessConstraints = query.value(6).toInt();
QString provenance = query.value(7).toString();
const bool modifiable = query.value(8).toBool();
const bool nonexportable = query.value(9).toBool();
int col = 3;
const QString detailUriValue = query.value(col++).toString();
const QString linkedDetailUrisValue = query.value(col++).toString();
const QString contextValue = query.value(col++).toString();
const int accessConstraints = query.value(col++).toInt();
QString provenance = query.value(col++).toString();
const bool modifiable = query.value(col++).toBool();
const bool nonexportable = query.value(col++).toBool();

if (!detailUriValue.isEmpty()) {
setValue(&detail,
Expand Down Expand Up @@ -2136,58 +2137,59 @@ QContactManager::Error ContactReader::queryContacts(
const int batchSize = (maximumCount > 0) ? 0 : ReportBatchSize; // If count is constrained, don't report periodically

while (contactQuery.next()) {
quint32 dbId = contactQuery.value(0).toUInt();
int col = 0;
quint32 dbId = contactQuery.value(col++).toUInt();

QContact contact;

QContactId id(ContactId::contactId(ContactId::apiId(dbId)));
contact.setId(id);

QString persistedDL = contactQuery.value(1).toString();
QString displayLabelGroup = contactQuery.value(2).toString();
QString persistedDL = contactQuery.value(col++).toString();
QString displayLabelGroup = contactQuery.value(col++).toString();
ContactsEngine::setContactDisplayLabel(&contact, persistedDL, displayLabelGroup);

QContactName name;
setValue(&name, QContactName::FieldFirstName , contactQuery.value(3));
// ignore lowerFirstName
setValue(&name, QContactName::FieldLastName , contactQuery.value(5));
// ignore lowerLastName
setValue(&name, QContactName::FieldMiddleName , contactQuery.value(7));
setValue(&name, QContactName::FieldPrefix , contactQuery.value(8));
setValue(&name, QContactName::FieldSuffix , contactQuery.value(9));
setValue(&name, QContactName__FieldCustomLabel, contactQuery.value(10));
setValue(&name, QContactName::FieldFirstName , contactQuery.value(col++));
col++; // ignore lowerFirstName
setValue(&name, QContactName::FieldLastName , contactQuery.value(col++));
col++; // ignore lowerLastName
setValue(&name, QContactName::FieldMiddleName , contactQuery.value(col++));
setValue(&name, QContactName::FieldPrefix , contactQuery.value(col++));
setValue(&name, QContactName::FieldSuffix , contactQuery.value(col++));
setValue(&name, QContactName__FieldCustomLabel, contactQuery.value(col++));
if (!name.isEmpty())
contact.saveDetail(&name);

const QString syncTarget(contactQuery.value(11).toString());
const QString syncTarget(contactQuery.value(col++).toString());

QContactSyncTarget starget;
setValue(&starget, QContactSyncTarget::FieldSyncTarget, syncTarget);
if (!starget.isEmpty())
contact.saveDetail(&starget);

QContactTimestamp timestamp;
setValue(&timestamp, QContactTimestamp::FieldCreationTimestamp , ContactsDatabase::fromDateTimeString(contactQuery.value(12).toString()));
setValue(&timestamp, QContactTimestamp::FieldModificationTimestamp, ContactsDatabase::fromDateTimeString(contactQuery.value(13).toString()));
setValue(&timestamp, QContactTimestamp::FieldCreationTimestamp , ContactsDatabase::fromDateTimeString(contactQuery.value(col++).toString()));
setValue(&timestamp, QContactTimestamp::FieldModificationTimestamp, ContactsDatabase::fromDateTimeString(contactQuery.value(col++).toString()));

QContactGender gender;
// Gender is an enum in qtpim
QString genderText = contactQuery.value(14).toString();
QString genderText = contactQuery.value(col++).toString();
gender.setGender(static_cast<QContactGender::GenderField>(genderText.toInt()));
contact.saveDetail(&gender);

QContactFavorite favorite;
setValue(&favorite, QContactFavorite::FieldFavorite, contactQuery.value(15).toBool());
setValue(&favorite, QContactFavorite::FieldFavorite, contactQuery.value(col++).toBool());
if (!favorite.isEmpty())
contact.saveDetail(&favorite);

QContactStatusFlags flags;
flags.setFlag(QContactStatusFlags::HasPhoneNumber, contactQuery.value(16).toBool());
flags.setFlag(QContactStatusFlags::HasEmailAddress, contactQuery.value(17).toBool());
flags.setFlag(QContactStatusFlags::HasOnlineAccount, contactQuery.value(18).toBool());
flags.setFlag(QContactStatusFlags::IsOnline, contactQuery.value(19).toBool());
flags.setFlag(QContactStatusFlags::IsDeactivated, contactQuery.value(20).toBool());
flags.setFlag(QContactStatusFlags::IsIncidental, contactQuery.value(21).toBool());
flags.setFlag(QContactStatusFlags::HasPhoneNumber, contactQuery.value(col++).toBool());
flags.setFlag(QContactStatusFlags::HasEmailAddress, contactQuery.value(col++).toBool());
flags.setFlag(QContactStatusFlags::HasOnlineAccount, contactQuery.value(col++).toBool());
flags.setFlag(QContactStatusFlags::IsOnline, contactQuery.value(col++).toBool());
flags.setFlag(QContactStatusFlags::IsDeactivated, contactQuery.value(col++).toBool());
flags.setFlag(QContactStatusFlags::IsIncidental, contactQuery.value(col++).toBool());

if (flags.testFlag(QContactStatusFlags::IsDeactivated)) {
QContactDeactivated deactivated;
Expand All @@ -2198,7 +2200,7 @@ QContactManager::Error ContactReader::queryContacts(
contact.saveDetail(&incidental);
}

int contactType = contactQuery.value(22).toInt();
int contactType = contactQuery.value(col++).toInt();
QContactType typeDetail = contact.detail<QContactType>();
typeDetail.setType(static_cast<QContactType::TypeValues>(contactType));
contact.saveDetail(&typeDetail);
Expand Down
86 changes: 45 additions & 41 deletions src/engine/contactwriter.cpp
View file
Expand Up @@ -3211,10 +3211,11 @@ QContactManager::Error ContactWriter::calculateDelta(QContact *contact, const Co
query.reportError("Failed to select modifiable details");
} else {
while (query.next()) {
const QString syncTarget = query.value<QString>(0);
const QString detail = query.value<QString>(1);
const quint32 contactId = query.value<quint32>(2);
const quint32 detailId = query.value<quint32>(3);
int col = 0;
const QString syncTarget = query.value<QString>(col++);
const QString detail = query.value<QString>(col++);
const quint32 contactId = query.value<quint32>(col++);
const quint32 detailId = query.value<quint32>(col++);

const QString provenance(QStringLiteral("%1:%2:%3").arg(contactId).arg(detailId).arg(syncTarget));
const StringPair identity = qMakePair(provenance, detail);
Expand Down Expand Up @@ -4069,10 +4070,11 @@ QContactManager::Error ContactWriter::syncFetch(const QString &syncTarget, const
return QContactManager::UnspecifiedError;
}
while (query.next()) {
const quint32 aggId(query.value<quint32>(0));
const quint32 constituentId(query.value<quint32>(1));
const QString st(query.value<QString>(2));
const bool incidental(query.value<bool>(3));
int col = 0;
const quint32 aggId(query.value<quint32>(col++));
const quint32 constituentId(query.value<quint32>(col++));
const QString st(query.value<QString>(col++));
const bool incidental(query.value<bool>(col++));

ConstituentDetails details = { constituentId, st, incidental };
constituentDetails[aggId].append(details);
Expand Down Expand Up @@ -5594,35 +5596,37 @@ ContactsDatabase::Query ContactWriter::bindContactDetails(const QContact &contac
const QString firstName(name.value<QString>(QContactName::FieldFirstName).trimmed());
const QString lastName(name.value<QString>(QContactName::FieldLastName).trimmed());

int col = 0;

QContactDisplayLabel label = contact.detail<QContactDisplayLabel>();
const QString displayLabel = label.label().trimmed();
query.bindValue(0, displayLabel);
query.bindValue(col++, displayLabel);
const QString displayLabelGroup = m_database.determineDisplayLabelGroup(contact, &m_displayLabelGroupsChanged);
query.bindValue(1, displayLabelGroup);
query.bindValue(col++, displayLabelGroup);
const int displayLabelGroupSortOrder = m_database.displayLabelGroupSortValue(displayLabelGroup);
query.bindValue(2, displayLabelGroupSortOrder);
query.bindValue(col++, displayLabelGroupSortOrder);

query.bindValue(3, firstName);
query.bindValue(4, firstName.toLower());
query.bindValue(5, lastName);
query.bindValue(6, lastName.toLower());
query.bindValue(7, name.value<QString>(QContactName::FieldMiddleName).trimmed());
query.bindValue(8, name.value<QString>(QContactName::FieldPrefix).trimmed());
query.bindValue(9, name.value<QString>(QContactName::FieldSuffix).trimmed());
query.bindValue(10, name.value<QString>(QContactName__FieldCustomLabel).trimmed());
query.bindValue(col++, firstName);
query.bindValue(col++, firstName.toLower());
query.bindValue(col++, lastName);
query.bindValue(col++, lastName.toLower());
query.bindValue(col++, name.value<QString>(QContactName::FieldMiddleName).trimmed());
query.bindValue(col++, name.value<QString>(QContactName::FieldPrefix).trimmed());
query.bindValue(col++, name.value<QString>(QContactName::FieldSuffix).trimmed());
query.bindValue(col++, name.value<QString>(QContactName__FieldCustomLabel).trimmed());

const QString syncTarget(contact.detail<QContactSyncTarget>().syncTarget());
query.bindValue(11, syncTarget);
query.bindValue(col++, syncTarget);

const QContactTimestamp timestamp = contact.detail<QContactTimestamp>();
query.bindValue(12, ContactsDatabase::dateTimeString(timestamp.value<QDateTime>(QContactTimestamp::FieldCreationTimestamp).toUTC()));
query.bindValue(13, ContactsDatabase::dateTimeString(timestamp.value<QDateTime>(QContactTimestamp::FieldModificationTimestamp).toUTC()));
query.bindValue(col++, ContactsDatabase::dateTimeString(timestamp.value<QDateTime>(QContactTimestamp::FieldCreationTimestamp).toUTC()));
query.bindValue(col++, ContactsDatabase::dateTimeString(timestamp.value<QDateTime>(QContactTimestamp::FieldModificationTimestamp).toUTC()));

const QContactGender gender = contact.detail<QContactGender>();
query.bindValue(14, QString::number(static_cast<int>(gender.gender())));
query.bindValue(col++, QString::number(static_cast<int>(gender.gender())));

const QContactFavorite favorite = contact.detail<QContactFavorite>();
query.bindValue(15, favorite.isFavorite());
query.bindValue(col++, favorite.isFavorite());

// Does this contact contain the information needed to update hasPhoneNumber?
bool hasPhoneNumberKnown = definitionMask.isEmpty() || detailListContains<QContactPhoneNumber>(definitionMask);
Expand Down Expand Up @@ -5657,26 +5661,26 @@ ContactsDatabase::Query ContactWriter::bindContactDetails(const QContact &contac
}

if (update) {
query.bindValue(16, hasPhoneNumberKnown);
query.bindValue(17, hasPhoneNumber);
query.bindValue(18, hasEmailAddressKnown);
query.bindValue(19, hasEmailAddress);
query.bindValue(20, hasOnlineAccountKnown);
query.bindValue(21, hasOnlineAccount);
query.bindValue(22, isOnlineKnown);
query.bindValue(23, isOnline);
query.bindValue(24, isDeactivatedKnown);
query.bindValue(25, isDeactivated);
query.bindValue(26, contactId);
query.bindValue(col++, hasPhoneNumberKnown);
query.bindValue(col++, hasPhoneNumber);
query.bindValue(col++, hasEmailAddressKnown);
query.bindValue(col++, hasEmailAddress);
query.bindValue(col++, hasOnlineAccountKnown);
query.bindValue(col++, hasOnlineAccount);
query.bindValue(col++, isOnlineKnown);
query.bindValue(col++, isOnline);
query.bindValue(col++, isDeactivatedKnown);
query.bindValue(col++, isDeactivated);
query.bindValue(col++, contactId);
} else {
query.bindValue(16, hasPhoneNumber);
query.bindValue(17, hasEmailAddress);
query.bindValue(18, hasOnlineAccount);
query.bindValue(19, isOnline);
query.bindValue(20, isDeactivated);
query.bindValue(col++, hasPhoneNumber);
query.bindValue(col++, hasEmailAddress);
query.bindValue(col++, hasOnlineAccount);
query.bindValue(col++, isOnline);
query.bindValue(col++, isDeactivated);

// Incidental state only applies to creation
query.bindValue(21, !contact.details<QContactIncidental>().isEmpty());
query.bindValue(col++, !contact.details<QContactIncidental>().isEmpty());
}

return query;
Expand Down

0 comments on commit ead1bf2

Please sign in to comment.