bool {,de}serialization
This commit is contained in:
parent
2c7ee423de
commit
94753fbb2f
|
|
@ -1 +1 @@
|
||||||
Subproject commit b3c550c5bb7c570b1b10492fcedf287c1915af39
|
Subproject commit 531e2411a5ada2cd468b5382ec7a35396d6f2a88
|
||||||
|
|
@ -175,6 +175,9 @@ bool DatabasePrivate::updateDatabase()
|
||||||
if (db.lastError().type() == QSqlError::NoError) {
|
if (db.lastError().type() == QSqlError::NoError) {
|
||||||
|
|
||||||
q->databaseUpdated(last.version(), current.version());
|
q->databaseUpdated(last.version(), current.version());
|
||||||
|
if (!last.count())
|
||||||
|
q->databaseCreated();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
qWarning("Unable update database, error = %s",
|
qWarning("Unable update database, error = %s",
|
||||||
db.lastError().text().toLatin1().data());
|
db.lastError().text().toLatin1().data());
|
||||||
|
|
@ -541,6 +544,11 @@ QSqlDatabase Database::database()
|
||||||
return d->db;
|
return d->db;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Database::databaseCreated()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
void Database::databaseUpdated(int oldVersion, int newVersion)
|
void Database::databaseUpdated(int oldVersion, int newVersion)
|
||||||
{
|
{
|
||||||
Q_UNUSED(oldVersion);
|
Q_UNUSED(oldVersion);
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
//remove minor version
|
//remove minor version
|
||||||
|
virtual void databaseCreated();
|
||||||
virtual void databaseUpdated(int oldVersion, int newVersion);
|
virtual void databaseUpdated(int oldVersion, int newVersion);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|
|
||||||
|
|
@ -827,6 +827,7 @@ QString SqlGeneratorBase::escapeValue(const QVariant &v) const
|
||||||
qWarning("No field escape rule for: %s", v.typeName());
|
qWarning("No field escape rule for: %s", v.typeName());
|
||||||
return QString();
|
return QString();
|
||||||
}
|
}
|
||||||
|
|
||||||
return "'" + serialized + "'";
|
return "'" + serialized + "'";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -138,7 +138,7 @@ Q_OUTOFLINE_TEMPLATE QList<T *> Query<T>::toList(int count)
|
||||||
d->sql = d->database->sqlGenertor()->selectCommand(
|
d->sql = d->database->sqlGenertor()->selectCommand(
|
||||||
d->tableName, d->fieldPhrase, d->wherePhrase, d->orderPhrase,
|
d->tableName, d->fieldPhrase, d->wherePhrase, d->orderPhrase,
|
||||||
d->relations, d->skip, d->take);
|
d->relations, d->skip, d->take);
|
||||||
qDebug() << d->sql;
|
|
||||||
QSqlQuery q = d->database->exec(d->sql);
|
QSqlQuery q = d->database->exec(d->sql);
|
||||||
if (q.lastError().isValid()) {
|
if (q.lastError().isValid()) {
|
||||||
qDebug() << q.lastError().text();
|
qDebug() << q.lastError().text();
|
||||||
|
|
@ -519,6 +519,7 @@ Q_OUTOFLINE_TEMPLATE int Query<T>::update(const AssignmentPhraseList &ph)
|
||||||
d->tableName,
|
d->tableName,
|
||||||
ph,
|
ph,
|
||||||
d->wherePhrase);
|
d->wherePhrase);
|
||||||
|
|
||||||
QSqlQuery q = d->database->exec(d->sql);
|
QSqlQuery q = d->database->exec(d->sql);
|
||||||
|
|
||||||
if (m_autoDelete)
|
if (m_autoDelete)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue