[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmymoney] kmymoney/mymoney/storage: Renamed highestIdNumString() -> highestNumberFromIdString()
From:       Christian_Dávid <christian-david () web ! de>
Date:       2015-01-31 21:15:50
Message-ID: E1YHfOQ-0000jm-O3 () scm ! kde ! org
[Download RAW message or body]

Git commit 92cacbb97fd8d75dded9f0de398eb62b5d479bd5 by Christian Dávid.
Committed on 31/01/2015 at 13:28.
Pushed by christiand into branch 'master'.

Renamed highestIdNumString() -> highestNumberFromIdString()

No abbreviations anymore and more precisely - that is the scientist in
me.

M  +3    -3    kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
M  +1    -1    kmymoney/mymoney/storage/mymoneydatabasemgrtest.h
M  +7    -7    kmymoney/mymoney/storage/mymoneydbdriver.cpp
M  +1    -1    kmymoney/mymoney/storage/mymoneydbdriver.h
M  +2    -2    kmymoney/mymoney/storage/mymoneystoragesql.cpp
M  +1    -1    kmymoney/mymoney/storage/mymoneystoragesql.h

http://commits.kde.org/kmymoney/92cacbb97fd8d75dded9f0de398eb62b5d479bd5

diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp \
b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp index 746e2a7..c43026d 100644
--- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
+++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp
@@ -2413,7 +2413,7 @@ void MyMoneyDatabaseMgrTest::testRemoveOnlineJob()
   }
 }
 
-void MyMoneyDatabaseMgrTest::testHighestIdNum()
+void MyMoneyDatabaseMgrTest::testHighestNumberFromIdString()
 {
   testAttachDb();
 
@@ -2422,6 +2422,6 @@ void MyMoneyDatabaseMgrTest::testHighestIdNum()
 
   testAddTransactions();
 
-  QCOMPARE(m->m_sql->highestIdNum(QLatin1String("kmmTransactions"), \
                QLatin1String("id"), 1), 2ul);
-  QCOMPARE(m->m_sql->highestIdNum(QLatin1String("kmmAccounts"), QLatin1String("id"), \
1), 6ul); +  QCOMPARE(m->m_sql->highestNumberFromIdString(QLatin1String("kmmTransactions"), \
QLatin1String("id"), 1), 2ul); +  \
QCOMPARE(m->m_sql->highestNumberFromIdString(QLatin1String("kmmAccounts"), \
QLatin1String("id"), 1), 6ul);  }
diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.h \
b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.h index 71b86d6..d8f2336 100644
--- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.h
+++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.h
@@ -99,7 +99,7 @@ private slots:
   void testAddOnlineJob();
   void testModifyOnlineJob();
   void testRemoveOnlineJob();
-  void testHighestIdNum();
+  void testHighestNumberFromIdString();
 };
 
 #endif
diff --git a/kmymoney/mymoney/storage/mymoneydbdriver.cpp \
b/kmymoney/mymoney/storage/mymoneydbdriver.cpp index cec1221..e8f67bd 100644
--- a/kmymoney/mymoney/storage/mymoneydbdriver.cpp
+++ b/kmymoney/mymoney/storage/mymoneydbdriver.cpp
@@ -66,7 +66,7 @@ public:
   virtual const QString intString(const MyMoneyDbIntColumn& c) const;
   virtual const QString timestampString(const MyMoneyDbDatetimeColumn& c) const;
   virtual const QString tableOptionString() const;
-  virtual const QString highestIdNumString(const QString& tableName, const QString& \
tableField, const int prefixLength) const; +  virtual const QString \
highestNumberFromIdString(const QString& tableName, const QString& tableField, const \
int prefixLength) const;  virtual const QStringList tables(QSql::TableType tt, const \
QSqlDatabase& db) const;  };
 
@@ -80,7 +80,7 @@ public:
   virtual const QString modifyColumnString(const QString& tableName, const QString& \
columnName, const MyMoneyDbColumn& newDef) const;  virtual const QString \
intString(const MyMoneyDbIntColumn& c) const;  virtual const QString textString(const \
                MyMoneyDbTextColumn& c) const;
-  virtual const QString highestIdNumString(const QString& tableName, const QString& \
tableField, const int prefixLength) const; +  virtual const QString \
highestNumberFromIdString(const QString& tableName, const QString& tableField, const \
int prefixLength) const;  };
 
 class MyMoneyODBCDriver : public MyMoneyDbDriver
@@ -106,7 +106,7 @@ public:
   virtual const QString modifyColumnString(const QString& tableName, const QString& \
columnName, const MyMoneyDbColumn& newDef) const;  virtual const QString \
intString(const MyMoneyDbIntColumn& c) const;  virtual const QString textString(const \
                MyMoneyDbTextColumn& c) const;
-  virtual const QString highestIdNumString(const QString& tableName, const QString& \
tableField, const int prefixLength) const; +  virtual const QString \
highestNumberFromIdString(const QString& tableName, const QString& tableField, const \
int prefixLength) const;  };
 
 class MyMoneySybaseDriver : public MyMoneyDbDriver
@@ -636,22 +636,22 @@ const QString MyMoneyDbDriver::tableOptionString() const
 //***********************************************
 // Define the highestIdNum string
 // PostgreSQL and Oracle return errors when a non-numerical string is cast to an \
integer, so a regex is used to skip strings that aren't entirely numerical after the \
                prefix is removed
-const QString MyMoneyDbDriver::highestIdNumString(const QString& tableName, const \
QString& tableField, const int prefixLength) const +const QString \
MyMoneyDbDriver::highestNumberFromIdString(const QString& tableName, const QString& \
tableField, const int prefixLength) const  {
   return QString("SELECT MAX(CAST(SUBSTR(%1, %2) AS INTEGER)) FROM \
%3;").arg(tableField).arg(prefixLength + 1).arg(tableName);  }
 
-const QString MyMoneyMysqlDriver::highestIdNumString(const QString& tableName, const \
QString& tableField, const int prefixLength) const +const QString \
MyMoneyMysqlDriver::highestNumberFromIdString(const QString& tableName, const \
QString& tableField, const int prefixLength) const  {
   return QString("SELECT MAX(CAST(SUBSTR(%1, %2) AS UNSIGNED INTEGER)) FROM \
%3;").arg(tableField).arg(prefixLength + 1).arg(tableName);  }
 
-const QString MyMoneyPostgresqlDriver::highestIdNumString(const QString& tableName, \
const QString& tableField, const int prefixLength) const +const QString \
MyMoneyPostgresqlDriver::highestNumberFromIdString(const QString& tableName, const \
QString& tableField, const int prefixLength) const  {
   return QString("SELECT MAX(CAST(SUBSTR(%1, %2) AS INTEGER)) FROM %3 WHERE \
SUBSTR(%1, %2) ~ '^[0-9]+$';").arg(tableField).arg(prefixLength + 1).arg(tableName);  \
}  
-const QString MyMoneyOracleDriver::highestIdNumString(const QString& tableName, \
const QString& tableField, const int prefixLength) const +const QString \
MyMoneyOracleDriver::highestNumberFromIdString(const QString& tableName, const \
QString& tableField, const int prefixLength) const  {
   return QString("SELECT MAX(TO_NUMBER(SUBSTR(%1, %2))) FROM %3 WHERE \
REGEXP_LIKE(SUBSTR(%1, %2), '^[0-9]+$');").arg(tableField).arg(prefixLength + \
1).arg(tableName);  }
diff --git a/kmymoney/mymoney/storage/mymoneydbdriver.h \
b/kmymoney/mymoney/storage/mymoneydbdriver.h index b0171b6..0d071d3 100644
--- a/kmymoney/mymoney/storage/mymoneydbdriver.h
+++ b/kmymoney/mymoney/storage/mymoneydbdriver.h
@@ -161,7 +161,7 @@ public:
   /**
    * @return The SQL string to find the highest ID number with an arbitrary prefix
    */
-  virtual const QString highestIdNumString(const QString& tableName, const QString& \
tableField, const int prefixLength) const; +  virtual const QString \
highestNumberFromIdString(const QString& tableName, const QString& tableField, const \
int prefixLength) const;  
   /**
    * Override standard tables() call for bug 252841
diff --git a/kmymoney/mymoney/storage/mymoneystoragesql.cpp \
b/kmymoney/mymoney/storage/mymoneystoragesql.cpp index ff10f38..572386b 100644
--- a/kmymoney/mymoney/storage/mymoneystoragesql.cpp
+++ b/kmymoney/mymoney/storage/mymoneystoragesql.cpp
@@ -896,12 +896,12 @@ bool MyMoneyStorageSql::writeFile(void)
   }
 }
 
-long unsigned MyMoneyStorageSql::highestIdNum(QString tableName, QString tableField, \
int prefixLength) +long unsigned MyMoneyStorageSql::highestNumberFromIdString(QString \
tableName, QString tableField, int prefixLength)  {
   MyMoneyDbTransaction t(*this, Q_FUNC_INFO);
   QSqlQuery q(*this);
 
-  if (!q.exec(m_driver->highestIdNumString(tableName, tableField, prefixLength)) || \
!q.next()) +  if (!q.exec(m_driver->highestNumberFromIdString(tableName, tableField, \
                prefixLength)) || !q.next())
     throw MYMONEYEXCEPTION(buildError(q, Q_FUNC_INFO, QString("retrieving highest ID \
number"))); // krazy:exclude=crashy  
   return q.value(0).toULongLong();
diff --git a/kmymoney/mymoney/storage/mymoneystoragesql.h \
b/kmymoney/mymoney/storage/mymoneystoragesql.h index f85ab1b..96a37ce 100644
--- a/kmymoney/mymoney/storage/mymoneystoragesql.h
+++ b/kmymoney/mymoney/storage/mymoneystoragesql.h
@@ -187,7 +187,7 @@ public:
    * @return : highest ID number
    *
    */
-  long unsigned highestIdNum(QString tableName, QString tableField, int \
prefixLength); +  long unsigned highestNumberFromIdString(QString tableName, QString \
tableField, int prefixLength);  
   /**
    * This method is used when a database file is open, and the data is to


[prev in list] [next in list] [prev in thread] [next in thread]