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

List:       kde-commits
Subject:    [kmymoney] kmymoney/mymoney/storage: Renamed SQL column "order" to "userOrder" in some tables
From:       Christian_Dávid <christian-david () web ! de>
Date:       2016-07-31 19:39:50
Message-ID: E1bTwaU-0001ZQ-Rf () code ! kde ! org
[Download RAW message or body]

Git commit c0f003134059354e2bc2b19ffa1b3ca7a98cbb19 by Christian Dávid.
Committed on 31/07/2016 at 19:31.
Pushed by christiand into branch 'master'.

Renamed SQL column "order" to "userOrder" in some tables

The name "order" is a reserved keyword. It can be used as identifier but
only if it is escaped. Unfortunately the escape sequence is database
dependent.

This patch is untested as another bug prevents me from opening a
database. Scince this fix is kind of urgent, I publish it anyway. The
port to 4.8 should be straight forward.

BUG: 365615
FIXED-IN: 5.0

M  +3    -3    kmymoney/mymoney/storage/mymoneydbdef.cpp
M  +3    -3    kmymoney/mymoney/storage/mymoneystoragesql.cpp

http://commits.kde.org/kmymoney/c0f003134059354e2bc2b19ffa1b3ca7a98cbb19

diff --git a/kmymoney/mymoney/storage/mymoneydbdef.cpp \
b/kmymoney/mymoney/storage/mymoneydbdef.cpp index 821281e..39752d9 100644
--- a/kmymoney/mymoney/storage/mymoneydbdef.cpp
+++ b/kmymoney/mymoney/storage/mymoneydbdef.cpp
@@ -32,7 +32,7 @@
 #include "mymoneyfile.h"
 
 //***************** THE CURRENT VERSION OF THE DATABASE LAYOUT ****************
-unsigned int MyMoneyDbDef::m_currentVersion = 9;
+unsigned int MyMoneyDbDef::m_currentVersion = 10;
 
 // ************************* Build table descriptions ****************************
 MyMoneyDbDef::MyMoneyDbDef()
@@ -159,7 +159,7 @@ void MyMoneyDbDef::PayeesPayeeIdentifier()
 {
   QList<QExplicitlySharedDataPointer <MyMoneyDbColumn> > fields;
   appendField(MyMoneyDbColumn("payeeId", "varchar(32)",  PRIMARYKEY, NOTNULL, 8));
-  appendField(MyMoneyDbIntColumn("\"order\"", MyMoneyDbIntColumn::SMALL, UNSIGNED, \
PRIMARYKEY, NOTNULL, 8)); +  appendField(MyMoneyDbIntColumn("userOrder", \
MyMoneyDbIntColumn::SMALL, UNSIGNED, PRIMARYKEY, NOTNULL, 8));  \
appendField(MyMoneyDbColumn("identifierId", "varchar(32)", false, NOTNULL, 8));  \
MyMoneyDbTable t("kmmPayeesPayeeIdentifier", fields);  t.buildSQLStrings();
@@ -218,7 +218,7 @@ void MyMoneyDbDef::AccountsPayeeIdentifier()
 {
   QList<QExplicitlySharedDataPointer <MyMoneyDbColumn> > fields;
   appendField(MyMoneyDbColumn("accountId", "varchar(32)",  PRIMARYKEY, NOTNULL, 8));
-  appendField(MyMoneyDbIntColumn("\"order\"", MyMoneyDbIntColumn::SMALL, UNSIGNED, \
PRIMARYKEY, NOTNULL, 8)); +  appendField(MyMoneyDbIntColumn("userOrder", \
MyMoneyDbIntColumn::SMALL, UNSIGNED, PRIMARYKEY, NOTNULL, 8));  \
appendField(MyMoneyDbColumn("identifierId", "varchar(32)", false, NOTNULL, 8));  \
MyMoneyDbTable t("kmmAccountsPayeeIdentifier", fields);  t.buildSQLStrings();
diff --git a/kmymoney/mymoney/storage/mymoneystoragesql.cpp \
b/kmymoney/mymoney/storage/mymoneystoragesql.cpp index 4b6e504..2ac7464 100644
--- a/kmymoney/mymoney/storage/mymoneystoragesql.cpp
+++ b/kmymoney/mymoney/storage/mymoneystoragesql.cpp
@@ -1187,7 +1187,7 @@ void MyMoneyStorageSql::addPayee(const MyMoneyPayee& payee)
       order << i;
       payeeIdList << payee.id();
     }
-    q.prepare("INSERT INTO kmmPayeesPayeeIdentifier (payeeId, identifierId, \
\"order\") VALUES(?, ?, ?)"); +    q.prepare("INSERT INTO kmmPayeesPayeeIdentifier \
(payeeId, identifierId, userOrder) VALUES(?, ?, ?)");  q.bindValue(0, payeeIdList);
     q.bindValue(1, identIds);
     q.bindValue(2, order);
@@ -1265,7 +1265,7 @@ void MyMoneyStorageSql::modifyPayee(MyMoneyPayee payee)
     }
   }
 
-  q.prepare("INSERT INTO kmmPayeesPayeeIdentifier (payeeId, \"order\", identifierId) \
VALUES(?, ?, ?)"); +  q.prepare("INSERT INTO kmmPayeesPayeeIdentifier (payeeId, \
userOrder, identifierId) VALUES(?, ?, ?)");  q.bindValue(0, payeeIdList);
   q.bindValue(1, order);
   q.bindValue(2, identIdList);
@@ -3331,7 +3331,7 @@ const QMap<QString, MyMoneyPayee> \
MyMoneyStorageSql::fetchPayees(const QStringLi  " ) kmmPayees "
     " LEFT OUTER JOIN kmmPayeesPayeeIdentifier ON kmmPayees.Id = \
kmmPayeesPayeeIdentifier.payeeId "  // The order is used below
-    " ORDER BY kmmPayees.id, kmmPayeesPayeeIdentifier.\"order\";");
+    " ORDER BY kmmPayees.id, kmmPayeesPayeeIdentifier.userOrder;");
 
   q.prepare(queryString);
 


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