a few clazy-ing (cont) [skip ci]

This commit is contained in:
Hamed Masafi 2019-02-10 17:44:25 +03:30
parent a6e1dd932d
commit f18f4481c2
2 changed files with 16 additions and 16 deletions

2
3rdparty/serializer vendored

@ -1 +1 @@
Subproject commit 4b9a4921b561301c09e046c24738201e03afe875 Subproject commit 93e5b24af2e639c031e73e1b9325e8b674d5c856

View File

@ -36,50 +36,50 @@ QString MySqlGenerator::fieldType(FieldModel *field)
QString dbType; QString dbType;
switch (field->type) { switch (field->type) {
case QVariant::Bool: case QMetaType::Bool:
dbType = "BOOLEAN"; dbType = "BOOLEAN";
break; break;
case QVariant::ByteArray: case QMetaType::QByteArray:
dbType = "BLOB"; dbType = "BLOB";
break; break;
case QVariant::DateTime: case QMetaType::QDateTime:
dbType = "DATETIME"; dbType = "DATETIME";
break; break;
case QVariant::Date: case QMetaType::QDate:
dbType = "DATE"; dbType = "DATE";
break; break;
case QVariant::Time: case QMetaType::QTime:
dbType = "TIME"; dbType = "TIME";
break; break;
case QVariant::Double: case QMetaType::Double:
dbType = "REAL"; dbType = "REAL";
break; break;
case QVariant::Int: case QMetaType::Int:
dbType = "INT(4)"; dbType = "INT(4)";
if(field->isAutoIncrement) if(field->isAutoIncrement)
dbType += " AUTO_INCREMENT"; dbType += " AUTO_INCREMENT";
break; break;
case QVariant::String: case QMetaType::QString:
if(field->length) if(field->length)
dbType = QString("VARCHAR(%1)").arg(field->length); dbType = QString("VARCHAR(%1)").arg(field->length);
else else
dbType = "TEXT"; dbType = "TEXT";
break; break;
case QVariant::Point: case QMetaType::QPoint:
case QVariant::PointF: case QMetaType::QPointF:
dbType = "POINT"; dbType = "POINT";
break; break;
case QVariant::Polygon: case QMetaType::QPolygon:
case QVariant::PolygonF: case QMetaType::QPolygonF:
dbType = "POLYGON"; dbType = "POLYGON";
break; break;
case QVariant::Uuid: case QMetaType::QUuid:
dbType = "VARCHAR(64)"; dbType = "VARCHAR(64)";
break; break;
@ -100,12 +100,12 @@ QString MySqlGenerator::fieldType(FieldModel *field)
QString MySqlGenerator::escapeValue(const QVariant &v) const QString MySqlGenerator::escapeValue(const QVariant &v) const
{ {
switch (v.type()) { switch (v.type()) {
case QVariant::Point: { case QMetaType::QPoint: {
QPoint pt = v.toPoint(); QPoint pt = v.toPoint();
return QString("GeomFromText('POINT(%1 %2)',0)").arg(pt.x()).arg(pt.y()); return QString("GeomFromText('POINT(%1 %2)',0)").arg(pt.x()).arg(pt.y());
} }
case QVariant::PointF: { case QMetaType::QPointF: {
QPointF pt = v.toPointF(); QPointF pt = v.toPointF();
return QString("GeomFromText('POINT(%1 %2)',0)").arg(pt.x()).arg(pt.y()); return QString("GeomFromText('POINT(%1 %2)',0)").arg(pt.x()).arg(pt.y());
} }