diff --git a/3rdparty/serializer b/3rdparty/serializer index b3c550c..531e241 160000 --- a/3rdparty/serializer +++ b/3rdparty/serializer @@ -1 +1 @@ -Subproject commit b3c550c5bb7c570b1b10492fcedf287c1915af39 +Subproject commit 531e2411a5ada2cd468b5382ec7a35396d6f2a88 diff --git a/src/database.cpp b/src/database.cpp index ade2fb6..ce9dfe3 100644 --- a/src/database.cpp +++ b/src/database.cpp @@ -175,6 +175,9 @@ bool DatabasePrivate::updateDatabase() if (db.lastError().type() == QSqlError::NoError) { q->databaseUpdated(last.version(), current.version()); + if (!last.count()) + q->databaseCreated(); + } else { qWarning("Unable update database, error = %s", db.lastError().text().toLatin1().data()); @@ -541,6 +544,11 @@ QSqlDatabase Database::database() return d->db; } +void Database::databaseCreated() +{ + +} + void Database::databaseUpdated(int oldVersion, int newVersion) { Q_UNUSED(oldVersion); diff --git a/src/database.h b/src/database.h index bfeab75..65d088a 100644 --- a/src/database.h +++ b/src/database.h @@ -73,6 +73,7 @@ public: protected: //remove minor version + virtual void databaseCreated(); virtual void databaseUpdated(int oldVersion, int newVersion); public slots: diff --git a/src/generators/sqlgeneratorbase.cpp b/src/generators/sqlgeneratorbase.cpp index 4d9bfcd..22b0757 100644 --- a/src/generators/sqlgeneratorbase.cpp +++ b/src/generators/sqlgeneratorbase.cpp @@ -827,6 +827,7 @@ QString SqlGeneratorBase::escapeValue(const QVariant &v) const qWarning("No field escape rule for: %s", v.typeName()); return QString(); } + return "'" + serialized + "'"; } diff --git a/src/query.h b/src/query.h index ef582a6..4103590 100644 --- a/src/query.h +++ b/src/query.h @@ -138,7 +138,7 @@ Q_OUTOFLINE_TEMPLATE QList Query::toList(int count) d->sql = d->database->sqlGenertor()->selectCommand( d->tableName, d->fieldPhrase, d->wherePhrase, d->orderPhrase, d->relations, d->skip, d->take); -qDebug() << d->sql; + QSqlQuery q = d->database->exec(d->sql); if (q.lastError().isValid()) { qDebug() << q.lastError().text(); @@ -519,6 +519,7 @@ Q_OUTOFLINE_TEMPLATE int Query::update(const AssignmentPhraseList &ph) d->tableName, ph, d->wherePhrase); + QSqlQuery q = d->database->exec(d->sql); if (m_autoDelete)