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

rename readValue to unescapeValue [skip ci]

This commit is contained in:
Hamed Masafi 2019-02-28 13:19:43 +03:30
parent 7564017a98
commit a6f6217d89
7 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/generators/mysqlgenerator.cpp
View File

@ -182,7 +182,7 @@ QString MySqlGenerator::escapeValue(const QVariant &v) const
// }
}
QVariant MySqlGenerator::readValue(const QMetaType::Type &type, const QVariant &dbValue)
QVariant MySqlGenerator::unescapeValue(const QMetaType::Type &type, const QVariant &dbValue)
{
//#ifdef QT_GUI_LIB
@ -229,7 +229,7 @@ QVariant MySqlGenerator::readValue(const QMetaType::Type &type, const QVariant &
if (type == QMetaType::QDate)
return dbValue.toDate();
return SqlGeneratorBase::readValue(type, dbValue);
return SqlGeneratorBase::unescapeValue(type, dbValue);
}
bool MySqlGenerator::readInsideParentese(QString &text, QString &out)

2
src/generators/mysqlgenerator.h
View File

@ -33,7 +33,7 @@ public:
QString fieldType(FieldModel *field);
QString escapeValue(const QVariant &v) const;
QVariant readValue(const QMetaType::Type &type, const QVariant &dbValue);
QVariant unescapeValue(const QMetaType::Type &type, const QVariant &dbValue);
// QString phrase(const PhraseData *d) const;
// QString selectCommand(AgregateType t, QString agregateArg, QString tableName, QList<WherePhrase> &wheres, QList<WherePhrase> &orders, QList<RelationModel *> joins, int skip, int take);
private:

8
src/generators/postgresqlgenerator.cpp
View File

@ -251,7 +251,7 @@ QString PostgreSqlGenerator::escapeValue(const QVariant &v) const
return SqlGeneratorBase::escapeValue(v);
}
QVariant PostgreSqlGenerator::readValue(const QMetaType::Type &type, const QVariant &dbValue)
QVariant PostgreSqlGenerator::unescapeValue(const QMetaType::Type &type, const QVariant &dbValue)
{
if (type == QMetaType::QDateTime)
return dbValue.toDateTime();
@ -263,10 +263,10 @@ QVariant PostgreSqlGenerator::readValue(const QMetaType::Type &type, const QVari
return dbValue.toDate();
if (type == QMetaType::QPoint)
return SqlGeneratorBase::readValue(QMetaType::QPoint, dbValue.toString()
return SqlGeneratorBase::unescapeValue(QMetaType::QPoint, dbValue.toString()
.replace("(", "").replace(")", ""));
if (type == QMetaType::QPointF)
return SqlGeneratorBase::readValue(QMetaType::QPointF, dbValue.toString()
return SqlGeneratorBase::unescapeValue(QMetaType::QPointF, dbValue.toString()
.replace("(", "").replace(")", ""));
if (type == QMetaType::QStringList)
return dbValue.toString().replace("{", "").replace("}", "")
@ -306,7 +306,7 @@ QVariant PostgreSqlGenerator::readValue(const QMetaType::Type &type, const QVari
return pol;
}
#endif
return SqlGeneratorBase::readValue(type, dbValue);
return SqlGeneratorBase::unescapeValue(type, dbValue);
}

2
src/generators/postgresqlgenerator.h
View File

@ -41,7 +41,7 @@ public:
// SqlGeneratorBase interface
public:
QString escapeValue(const QVariant &v) const;
QVariant readValue(const QMetaType::Type &type, const QVariant &dbValue);
QVariant unescapeValue(const QMetaType::Type &type, const QVariant &dbValue);
};
NUT_END_NAMESPACE

5
src/generators/sqlgeneratorbase.cpp
View File

@ -131,6 +131,11 @@ QString SqlGeneratorBase::fieldDeclare(FieldModel *field)
return field->name + " " + type + (field->notNull ? " NOT NULL" : "");
}
QStringList SqlGeneratorBase::constraints(TableModel *table)
{
return QStringList();
}
QString SqlGeneratorBase::relationDeclare(const RelationModel *relation)
{
return QString("FOREIGN KEY (FK_%1) REFERENCES %2(%1)")

5
src/generators/sqlgeneratorbase_p.h
View File

@ -79,6 +79,9 @@ public:
//fields
virtual QString fieldType(FieldModel *field) = 0;
virtual QString fieldDeclare(FieldModel *field);
virtual QStringList constraints(TableModel *table);
virtual QString escapeValue(const QVariant &v) const;
virtual QVariant unescapeValue(const QMetaType::Type &type, const QVariant &dbValue);
virtual QString masterDatabaseName(QString databaseName);
@ -141,8 +144,6 @@ public:
// virtual QString updateCommand(WherePhrase &phrase, QList<WherePhrase> &wheres, QString tableName);
virtual QString escapeValue(const QVariant &v) const;
virtual QVariant readValue(const QMetaType::Type &type, const QVariant &dbValue);
virtual QString phrase(const PhraseData *d) const;
virtual QString operatorString(const PhraseData::Condition &cond) const;
virtual void appendSkipTake(QString &sql, int skip = -1, int take = -1);

2
src/query.h
View File

@ -267,7 +267,7 @@ Q_OUTOFLINE_TEMPLATE QList<T *> Query<T>::toList(int count)
QList<FieldModel*> childFields = data.table->fields();
foreach (FieldModel *field, childFields)
table->setProperty(field->name.toLatin1().data(),
d->database->sqlGenertor()->readValue(
d->database->sqlGenertor()->unescapeValue(
field->type,
q.value(data.table->name() + "." + field->name)));