CL-Softwares
/
Nut
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

polish query

This commit is contained in:
Hamed Masafi 2019-07-21 11:16:02 +04:30
parent dfef256598
commit a25e94e930
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/generators/sqlservergenerator.h
View File

@ -39,7 +39,7 @@ public:
QString escapeValue(const QVariant &v) const override; QString escapeValue(const QVariant &v) const override;
void appendSkipTake(QString &sql, int skip, int take) override; void appendSkipTake(QString &sql, int skip, int take) override;
void replaceTableNames(QString &command) override; // void replaceTableNames(QString &command) override;
}; };

32
src/query.h
View File

@ -323,27 +323,27 @@ Q_OUTOFLINE_TEMPLATE RowList<T> Query<T>::toList(int count)
for (int i = 0; i < data.masters.count(); ++i) { for (int i = 0; i < data.masters.count(); ++i) {
int master = data.masters[i]; int master = data.masters[i];
#ifdef NUT_SHARED_POINTER //#ifdef NUT_SHARED_POINTER
QString mName = QString("set%1").arg(levels[master].lastRow->metaObject()->className()); // QString mName = QString("set%1").arg(levels[master].lastRow->metaObject()->className());
QString type = QString("Nut::Row<%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, // bool ok = table->metaObject()->invokeMethod(table,
mName.toLocal8Bit().data(), // mName.toLocal8Bit().data(),
QGenericArgument(type.toLatin1().data(), levels[master].lastRow)); // 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(), // bool ok = table->setProperty(data.masterFields[i].toLocal8Bit().data(),
// QVariant::fromValue(shp.data())); // QVariant::fromValue(levels[master].lastRow));
//#endif
#else // if (!ok)
bool ok = table->setProperty(data.masterFields[i].toLocal8Bit().data(), // qWarning("Unable to set property %s::%s",
QVariant::fromValue(levels[master].lastRow)); // table->metaObject()->className(), data.masterFields[i].toLocal8Bit().data());
#endif
if (!ok)
qWarning("Unable to set property %s::%s",
table->metaObject()->className(), data.masterFields[i].toLocal8Bit().data());
auto tableset = levels[master].lastRow->childTableSet( auto tableset = levels[master].lastRow->childTableSet(
data.table->className()); data.table->className());
table->setParentTableSet(tableset); // table->setParentTableSet(tableset);
#ifdef NUT_SHARED_POINTER #ifdef NUT_SHARED_POINTER
tableset->add(shp); tableset->add(shp);
#else #else