From a25e94e9308312084a30ce611ecdd7a84e16fb11 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sun, 21 Jul 2019 11:16:02 +0430 Subject: [PATCH] polish query --- src/generators/sqlservergenerator.h | 2 +- src/query.h | 32 ++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/generators/sqlservergenerator.h b/src/generators/sqlservergenerator.h index df12602..dff5901 100644 --- a/src/generators/sqlservergenerator.h +++ b/src/generators/sqlservergenerator.h @@ -39,7 +39,7 @@ public: QString escapeValue(const QVariant &v) const override; void appendSkipTake(QString &sql, int skip, int take) override; - void replaceTableNames(QString &command) override; +// void replaceTableNames(QString &command) override; }; diff --git a/src/query.h b/src/query.h index f2205d9..c6729ab 100644 --- a/src/query.h +++ b/src/query.h @@ -323,27 +323,27 @@ Q_OUTOFLINE_TEMPLATE RowList Query::toList(int count) for (int i = 0; i < data.masters.count(); ++i) { int master = data.masters[i]; -#ifdef NUT_SHARED_POINTER - QString mName = QString("set%1").arg(levels[master].lastRow->metaObject()->className()); - QString type = QString("Nut::Row<%1>").arg(levels[master].lastRow->metaObject()->className()); - bool ok = table->metaObject()->invokeMethod(table, - mName.toLocal8Bit().data(), - QGenericArgument(type.toLatin1().data(), levels[master].lastRow)); -// bool ok = table->setProperty(data.masterFields[i].toLocal8Bit().data(), -// QVariant::fromValue(shp.data())); +//#ifdef NUT_SHARED_POINTER +// QString mName = QString("set%1").arg(levels[master].lastRow->metaObject()->className()); +// QString type = QString("Nut::Row<%1>").arg(levels[master].lastRow->metaObject()->className()); +// bool ok = table->metaObject()->invokeMethod(table, +// mName.toLocal8Bit().data(), +// QGenericArgument(type.toLatin1().data(), levels[master].lastRow)); +//// bool ok = table->setProperty(data.masterFields[i].toLocal8Bit().data(), +//// QVariant::fromValue(shp.data())); -#else - bool ok = table->setProperty(data.masterFields[i].toLocal8Bit().data(), - QVariant::fromValue(levels[master].lastRow)); -#endif +//#else +// bool ok = table->setProperty(data.masterFields[i].toLocal8Bit().data(), +// QVariant::fromValue(levels[master].lastRow)); +//#endif - if (!ok) - qWarning("Unable to set property %s::%s", - table->metaObject()->className(), data.masterFields[i].toLocal8Bit().data()); +// if (!ok) +// qWarning("Unable to set property %s::%s", +// table->metaObject()->className(), data.masterFields[i].toLocal8Bit().data()); auto tableset = levels[master].lastRow->childTableSet( data.table->className()); - table->setParentTableSet(tableset); +// table->setParentTableSet(tableset); #ifdef NUT_SHARED_POINTER tableset->add(shp); #else