Fix broken join feature

Added a Row<Table> property to each table object to being able
to pass a QVariant encapsulated Row<Table> through the
QObject::setProperty in the toList method.

Author: martonmiklos

src/defines.h

@@ -82,24 +82,14 @@ public:                                                                        \
         propertyChanged(#name);                                                \
     }
 
-#define NUT_FOREIGN_KEY(type, keytype, name, read, write)                     \
-    Q_PROPERTY(Nut::Row<type> name READ read WRITE write)                      \
-    NUT_DECLARE_FIELD(keytype, name##Id, read##Id, write##Id)                  \
-    NUT_INFO(__nut_FOREIGN_KEY, name, type)                                   \
-    Nut::Row<type> m_##name;                                                   \
-public slots:                                                                        \
-    Nut::Row<type> read() const { return m_##name ; }                          \
-    Q_INVOKABLE void write(Nut::Row<type> name){                                           \
-        m_##name = name;                                                       \
-    }
-
 #define NUT_FOREIGN_KEY_DECLARE(type, keytype, name, read, write)                     \
     NUT_INFO(__nut_FIELD, name##Id, 0)                                             \
     NUT_INFO(__nut_FOREIGN_KEY, name, type)                                   \
     Nut::Row<type> m_##name; \
     keytype m_##name##Id; \
     Q_PROPERTY(Nut::Row<type> name READ read WRITE write)                                \
     Q_PROPERTY(keytype name##Id READ read##Id WRITE write##Id)                                \
+    Q_PROPERTY(Nut::Row<Table> _##name READ _##read WRITE _##write)                \
 public:                                                                        \
     Nut::Row<type> read() const;                          \
     keytype read##Id() const;                                                   \
@@ -109,9 +99,11 @@ public:                                                                        \
                         (staticMetaObject.className(), #name);                 \
         return f;                                                              \
     }                                                                          \
-public slots: \
     void write(Nut::Row<type> name); \
-    void write##Id(keytype name##Id);
+    void write##Id(keytype name##Id); \
+private: \
+    Nut::Row<Table> _##read() const;                                               \
+    void _##write(Nut::Row<Table> name);
 
 #define NUT_FOREIGN_KEY_IMPLEMENT(class, type, keytype, name, read, write)                     \
     \
@@ -132,6 +124,13 @@ public slots: \
         m_##name##Id = name##Id;                                                       \
         m_##name = nullptr; \
         propertyChanged(QT_STRINGIFY2(name##Id));                                                \
+    } \
+    Nut::Row<Table> class::_##read() const { return m_##name ; }                           \
+    \
+    void class::_##write(Nut::Row<Table> name) {                                           \
+        propertyChanged(QT_STRINGIFY2(keyname));                                                \
+        m_##name = qSharedPointerCast< type >( name );\
+        m_##name##Id = m_##name->primaryValue().value<keytype>(); \
     }
 
 

src/query.h

@@ -232,21 +232,15 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
 
         levels.append(data);
     };
+
+    // Always add the reference to the query's base table as first item
+    add_table(0, d->database->model().tableByName(d->tableName));
     for (int i = 0; i < d->relations.count(); ++i) {
         RelationModel *rel = d->relations[i];
         add_table(i, rel->masterTable);
         add_table(i, rel->slaveTable);
     }
 
-    if (!importedTables.count()) {
-        LevelData data;
-        data.table = d->database->model().tableByName(d->tableName);
-        data.keyFiledname = d->tableName + "." + data.table->primaryKey();
-        data.lastKeyValue = QVariant();
-
-        levels.append(data);
-    }
-
     QVector<bool> checked;
     checked.reserve(levels.count());
     for (int i = 0; i < levels.count(); ++i)
@@ -290,6 +284,7 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
             //create table row
             Row<Table> row;
             if (data.table->className() == d->className) {
+                // create a row for the current table
                 row = Nut::create<T>();
 #ifdef NUT_SHARED_POINTER
                 returnList.append(row.objectCast<T>());
@@ -299,6 +294,7 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
                 d->tableSet->add(row);
 
             } else {
+                // create row for a related table
                 Table *table;
                 const QMetaObject *childMetaObject
                         = QMetaType::metaObjectForType(data.table->typeId());
@@ -308,6 +304,20 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
                     qFatal("Could not create instance of %s",
                            qPrintable(data.table->name()));
                 row = createFrom(table);
+                if (levels[0].lastRow) {
+                    // assign the current row (belongs to a joined table) to the query's base table
+                    foreach (RelationModel *rel, d->relations) {
+                        if (rel->slaveTable->className() == levels[0].table->className()
+                                && rel->masterTable->className() == data.table->className()) {
+                            // relation found -> assign the row to the query's base table proper field
+                            QString propertyName = "_" + rel->localProperty;
+                            levels[0].lastRow.data()->setProperty(
+                                        propertyName.toUtf8().constData(),
+                                        QVariant::fromValue(row));
+                            break;
+                        }
+                    }
+                }
             }
 
             QList<FieldModel*> childFields = data.table->fields();

src/table.cpp

@@ -45,7 +45,9 @@ NUT_BEGIN_NAMESPACE
 
 Table::Table(QObject *parent) : QObject(parent),
     d(new TablePrivate)
-{ }
+{
+    qRegisterMetaType<Nut::Row<Table>>("Nut::Row<Table>");
+}
 
 Table::~Table()
 {

src/table.h

@@ -97,4 +97,6 @@ public slots:
 
 NUT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(Nut::Row<Nut::Table>)
+
 #endif // TABLE_H

test/tst_basic/tst_basic.cpp

@@ -227,17 +227,16 @@ void BasicTest::testDate()
 
 void BasicTest::join()
 {
-//    TIC();
-//    auto q = db.comments()->query()
-//            ->join<User>()
-//            ->join<Post>();
-
-//    auto comments = q->toList();
+    TIC();
+    auto q = db.comments()->query()
+            ->join<User>()
+            ->join<Post>();
 
-//    TOC();
-//    QTEST_ASSERT(comments.length());
-//    QTEST_ASSERT(comments[0]->author());
-//    QTEST_ASSERT(comments[0]->author()->username() == "admin");
+    auto comments = q->toList();
+    TOC();
+    QTEST_ASSERT(comments.length());
+    QTEST_ASSERT(comments[0]->author());
+    QTEST_ASSERT(comments[0]->author()->username() == "admin");
 }