AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSqlRelationalTableModel doesn't follow relations on the first column

Browse Source 
QSqlRelationalTableModel doesn't follow relations on the first column
of a table. The DisplayRole and the EditRole for indexes on column 0
are always the same. The bug is found in QSqlRelationalTableModel::data.

Task-number: QTBUG-20038
Change-Id: Ie1e98b5f46ffc171113f2d51b9b19ff5febb1c3c
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
This commit is contained in:
Honglei Zhang 2011-12-01 09:57:40 +02:00 committed by Qt by Nokia
parent 35a9e53dea
commit 8c74fe5c7a
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/models/qsqlrelationaltablemodel.cpp
View File

@ -430,7 +430,7 @@ QVariant QSqlRelationalTableModel::data(const QModelIndex &index, int role) cons
{ {
Q_D(const QSqlRelationalTableModel); Q_D(const QSqlRelationalTableModel);
if (role == Qt::DisplayRole && index.column() > 0 && index.column() < d->relations.count() && if (role == Qt::DisplayRole && index.column() >= 0 && index.column() < d->relations.count() &&
d->relations.value(index.column()).isValid()) { d->relations.value(index.column()).isValid()) {
QRelation &relation = d->relations[index.column()]; QRelation &relation = d->relations[index.column()];
if (!relation.isDictionaryInitialized()) if (!relation.isDictionaryInitialized())

55
tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
View File

@ -93,6 +93,7 @@ private slots:
void whiteSpaceInIdentifiers(); void whiteSpaceInIdentifiers();
void psqlSchemaTest(); void psqlSchemaTest();
void selectAfterUpdate(); void selectAfterUpdate();
void relationOnFirstColumn();
private: private:
void dropTestTables( QSqlDatabase db ); void dropTestTables( QSqlDatabase db );
@ -1487,5 +1488,59 @@ void tst_QSqlRelationalTableModel::selectAfterUpdate()
QCOMPARE(model.data(model.index(0,2)), QVariant("mrs")); QCOMPARE(model.data(model.index(0,2)), QVariant("mrs"));
} }
/**
This test case verifies bug fix for QTBUG-20038.
*/
void tst_QSqlRelationalTableModel::relationOnFirstColumn()
{
QFETCH_GLOBAL(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
QString testTable1 = qTableName("QTBUG_20038_test1", __FILE__);
QString testTable2 = qTableName("QTBUG_20038_test2", __FILE__);
tst_Databases::safeDropTables(db, QStringList() << testTable1 << testTable2);
//prepare test1 table
QSqlQuery q(db);
QVERIFY_SQL(q, exec("CREATE TABLE " + testTable1 + " (val1 INTEGER, id1 INTEGER PRIMARY KEY);"));
QVERIFY_SQL(q, exec("DELETE FROM " + testTable1 + ";"));
QVERIFY_SQL(q, exec("INSERT INTO " + testTable1 + " (id1, val1) VALUES(1, 10);"));
QVERIFY_SQL(q, exec("INSERT INTO " + testTable1 + " (id1, val1) VALUES(2, 20);"));
QVERIFY_SQL(q, exec("INSERT INTO " + testTable1 + " (id1, val1) VALUES(3, 30);"));
//prepare test2 table
QVERIFY_SQL(q, exec("CREATE TABLE " + testTable2 + " (id INTEGER PRIMARY KEY, name TEXT);"));
QVERIFY_SQL(q, exec("DELETE FROM " + testTable2 + ";"));
QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (10, 'Hervanta');"));
QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (20, 'Keskusta');"));
QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (30, 'Annala');"));
QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (40, 'Tammela');"));
QVERIFY_SQL(q, exec("INSERT INTO " + testTable2 + " (id, name) VALUES (50, 'Amuri');"));
//set test model
QSqlRelationalTableModel model(NULL, db);
model.setTable(testTable1);
model.setRelation(0, QSqlRelation(testTable2, "id", "name"));
QVERIFY_SQL(model, select());
//verify the data
QCOMPARE(model.data(model.index(0, 0)), QVariant("Hervanta"));
QCOMPARE(model.data(model.index(1, 0)), QVariant("Keskusta"));
QCOMPARE(model.data(model.index(2, 0)), QVariant("Annala"));
//modify the model data
QVERIFY_SQL(model, setData(model.index(0, 0), 40));
QVERIFY_SQL(model, setData(model.index(1, 0), 50));
QVERIFY_SQL(model, setData(model.index(2, 0), 30));
//verify the data after modificaiton
QCOMPARE(model.data(model.index(0, 0)), QVariant("Tammela"));
QCOMPARE(model.data(model.index(1, 0)), QVariant("Amuri"));
QCOMPARE(model.data(model.index(2, 0)), QVariant("Annala"));
tst_Databases::safeDropTables(db, QStringList() << testTable1 << testTable2);
}
QTEST_MAIN(tst_QSqlRelationalTableModel) QTEST_MAIN(tst_QSqlRelationalTableModel)
#include "tst_qsqlrelationaltablemodel.moc" #include "tst_qsqlrelationaltablemodel.moc"