StorageSQL Version conflict

[Ralf Habacker]

Hi all,

currently I inspected the differences between 4.8 and master and got the
impression that  git master uses a version already allocated by 4.8.

With commithttps://commits.kde.org/kmymoney/
<https://commits.kde.org/kmymoney/75efcd673f8a750681ba35cc6e12a4d6d13ca474>6bce2ac059f1921ead3362687e48ce84367238d2
sql storage  version has been raised to V11 which is implemented as

int MyMoneyStorageSql::upgradeToV11()

{
  DBG("*** Entering MyMoneyStorageSql::upgradeToV11");
  MyMoneyDbTransaction dbtrans(*this, Q_FUNC_INFO);

  QSqlQuery q(*this);
  if (!alterTable(m_db.m_tables["kmmSchedules"], m_dbVersion))
    return 1;
  return 0;
}

in master commit https://commits.kde.org/kmymoney/
<https://commits.kde.org/kmymoney/75efcd673f8a750681ba35cc6e12a4d6d13ca474>fd6a9557c637875aff7e53415f7c042c8f636858
reuses this version.

int MyMoneyStorageSql::upgradeToV11()
{
  MyMoneyDbTransaction dbtrans(*this, Q_FUNC_INFO);

  QSqlQuery q(*this);
  // add column roundingMethodCol to kmmSecurities
  if (!alterTable(m_db.m_tables["kmmSecurities"], m_dbVersion))
    return (1);
  // add column pricePrecision to kmmCurrencies
  if (!alterTable(m_db.m_tables["kmmCurrencies"], m_dbVersion))
    return (1);

  return 0;
}

To solve the issue, 4.8 branch should be merged into master to be in
sync or the related commit from 4.8 branch should be applied to master
too and master should then update to sql storage version 12.

Regards
 Ralf
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kmymoney-devel/attachments/20171001/34bbe0ec/attachment.html>