2 files changed, 103 insertions, 14 deletions

diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index bdc32ea..5b0406f 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -119,6 +119,8 @@ QT_BEGIN_NAMESPACE
     returns false.
 */
 
+class QRelatedTableModel;
+
 struct QRelation
 {
     public:
@@ -135,7 +137,7 @@ struct QRelation
         bool isValid();
 
         QSqlRelation rel;
-        QSqlTableModel *model;
+        QRelatedTableModel *model;
         QHash<QString, QVariant> dictionary;//maps keys to display values
 
     private:
@@ -143,6 +145,15 @@ struct QRelation
         bool m_dictInitialized;
 };
 
+class QRelatedTableModel : public QSqlTableModel
+{
+public:
+    QRelatedTableModel(QRelation *rel, QObject *parent = 0, QSqlDatabase db = QSqlDatabase());
+    bool select();
+private:
+    bool firstSelect;
+    QRelation *relation;
+};
 /*
     A QRelation must be initialized before it is considered valid.
     Note: population of the model and dictionary are kept separate
@@ -162,7 +173,7 @@ void QRelation::populateModel()
     Q_ASSERT(m_parent != NULL);
 
     if (!model) {
-        model = new QSqlTableModel(m_parent, m_parent->database());
+        model = new QRelatedTableModel(this, m_parent, m_parent->database());
         model->setTable(rel.tableName());
         model->select();
     }
@@ -219,12 +230,34 @@ bool QRelation::isValid()
     return (rel.isValid() && m_parent != NULL);
 }
 
+
+
+QRelatedTableModel::QRelatedTableModel(QRelation *rel, QObject *parent, QSqlDatabase db) : 
+    QSqlTableModel(parent, db), firstSelect(true), relation(rel)
+{
+}
+
+bool QRelatedTableModel::select()
+{
+    if (firstSelect) {
+        firstSelect = false;
+        return QSqlTableModel::select();
+    }
+    relation->clearDictionary();
+    bool res = QSqlTableModel::select();
+    if (res)
+        relation->populateDictionary();
+    return res;
+}
+
+
 class QSqlRelationalTableModelPrivate: public QSqlTableModelPrivate
 {
     Q_DECLARE_PUBLIC(QSqlRelationalTableModel)
 public:
     QSqlRelationalTableModelPrivate()
-        : QSqlTableModelPrivate()
+        : QSqlTableModelPrivate(),
+        joinMode( QSqlRelationalTableModel::InnerJoin )
     {}
     QString relationField(const QString &tableName, const QString &fieldName) const;
 
@@ -237,6 +270,7 @@ public:
     void revertCachedRow(int row);
 
     void translateFieldNames(int row, QSqlRecord &values) const;
+    QSqlRelationalTableModel::JoinMode joinMode;
 };
 
 static void qAppendWhereClause(QString &query, const QString &clause1, const QString &clause2)
@@ -575,29 +609,55 @@ QString QSqlRelationalTableModel::selectStatement() const
                 fieldNames.insert(fieldList[i], fieldNames.value(fieldList[i])-1);
             }
 
-            // this needs fixing!! the below if is borken.
-            tables.append(relation.tableName().append(QLatin1Char(' ')).append(relTableAlias));
-            if(!where.isEmpty())
-                where.append(QLatin1String(" AND "));
-            where.append(d->relationField(tableName(), d->db.driver()->escapeIdentifier(rec.fieldName(i), QSqlDriver::FieldName)));
-            where.append(QLatin1String(" = "));
-            where.append(d->relationField(relTableAlias, relation.indexColumn()));
+            if (d->joinMode == QSqlRelationalTableModel::InnerJoin) {
+                // this needs fixing!! the below if is borken.
+                // Use LeftJoin mode if you want correct behavior
+                tables.append(relation.tableName().append(QLatin1Char(' ')).append(relTableAlias));
+                if(!where.isEmpty())
+                    where.append(QLatin1String(" AND "));
+                where.append(d->relationField(tableName(), d->db.driver()->escapeIdentifier(rec.fieldName(i), QSqlDriver::FieldName)));
+                where.append(QLatin1String(" = "));
+                where.append(d->relationField(relTableAlias, relation.indexColumn()));
+            } else {
+                tables.append(QLatin1String(" LEFT JOIN"));
+                tables.append(relation.tableName().append(QLatin1Char(' ')).append(relTableAlias));
+                tables.append(QLatin1String("ON"));
+
+                QString clause;
+                clause.append(d->relationField(tableName(), d->db.driver()->escapeIdentifier(rec.fieldName(i), QSqlDriver::FieldName)));
+                clause.append(QLatin1String(" = "));
+                clause.append(d->relationField(relTableAlias, relation.indexColumn()));
+
+                tables.append(clause);
+            }
         } else {
             if (!fList.isEmpty())
                 fList.append(QLatin1String(", "));
             fList.append(d->relationField(tableName(), d->db.driver()->escapeIdentifier(rec.fieldName(i), QSqlDriver::FieldName)));
         }
     }
-    if (!tables.isEmpty())
+
+    if (d->joinMode == QSqlRelationalTableModel::InnerJoin && !tables.isEmpty()) {
         tList.append(tables.join(QLatin1String(", ")));
+        if(!tList.isEmpty())
+            tList.prepend(QLatin1String(", "));
+    } else
+        tList.append(tables.join(QLatin1String(" ")));
+
     if (fList.isEmpty())
         return query;
-    if(!tList.isEmpty())
-        tList.prepend(QLatin1String(", "));
+
     tList.prepend(tableName());
     query.append(QLatin1String("SELECT "));
     query.append(fList).append(QLatin1String(" FROM ")).append(tList);
-    qAppendWhereClause(query, where, filter());
+
+    if (d->joinMode == QSqlRelationalTableModel::InnerJoin) {
+        qAppendWhereClause(query, where, filter());
+    } else if (!filter().isEmpty()) {
+        query.append(QLatin1String(" WHERE ("));
+        query.append(filter());
+        query.append(QLatin1String(")"));
+    }
 
     QString orderBy = orderByClause();
     if (!orderBy.isEmpty())
@@ -649,6 +709,29 @@ void QSqlRelationalTableModel::clear()
     QSqlTableModel::clear();
 }
 
+
+/*! \enum QSqlRelationalTableModel::JoinMode
+
+    \value InnerJoin - Inner join mode, return rows when there is at least one match in both tables.
+    \value LeftJoin - Left join mode, returns all rows from the left table (table_name1), even if there are no matches in the right table (table_name2).
+
+    \see QSqlRelationalTableModel::setJoinMode
+    \since 4.8
+*/
+
+/*!
+    Sets the SQL join mode to show or hide rows with NULL foreign keys.
+    In InnerJoin mode (the default) these rows will not be showed: use the
+    LeftJoin mode if you want to show them.
+
+    \see QSqlRelationalTableModel::JoinMode
+    \since 4.8
+*/
+void QSqlRelationalTableModel::setJoinMode( QSqlRelationalTableModel::JoinMode joinMode )
+{
+    Q_D(QSqlRelationalTableModel);
+    d->joinMode = joinMode;
+}
 /*!
     \reimp
 */
diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h
index 15faae9..32d88b3 100644
--- a/src/sql/models/qsqlrelationaltablemodel.h
+++ b/src/sql/models/qsqlrelationaltablemodel.h
@@ -76,6 +76,11 @@ class Q_SQL_EXPORT QSqlRelationalTableModel: public QSqlTableModel
     Q_OBJECT
 
 public:
+    enum JoinMode {
+        InnerJoin,
+        LeftJoin
+    };
+
     explicit QSqlRelationalTableModel(QObject *parent = 0,
                                       QSqlDatabase db = QSqlDatabase());
     virtual ~QSqlRelationalTableModel();
@@ -91,6 +96,7 @@ public:
     virtual void setRelation(int column, const QSqlRelation &relation);
     QSqlRelation relation(int column) const;
     virtual QSqlTableModel *relationModel(int column) const;
+    void setJoinMode( QSqlRelationalTableModel::JoinMode joinMode );
 
 public Q_SLOTS:
     void revertRow(int row);