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

wip: query and model improvment

This commit is contained in:
blackdal 2017-08-10 19:39:41 +04:30
parent 0f47ffd28a
commit 87b46a808a
8 changed files with 298 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/database.cpp
View File

@ -161,6 +161,7 @@ bool DatabasePrivate::updateDatabase()
bool DatabasePrivate::getCurrectScheema() bool DatabasePrivate::getCurrectScheema()
{ {
Q_Q(Database); Q_Q(Database);
if (allTableMaps.contains(q->metaObject()->className())) { if (allTableMaps.contains(q->metaObject()->className())) {
currentModel = allTableMaps[q->metaObject()->className()]; currentModel = allTableMaps[q->metaObject()->className()];
return false; return false;
@ -207,7 +208,7 @@ bool DatabasePrivate::getCurrectScheema()
int typeId = QMetaType::type(tableProperty.typeName()); int typeId = QMetaType::type(tableProperty.typeName());
if (tables.values().contains(tableProperty.name()) if (tables.values().contains(tableProperty.name())
&& typeId >= QVariant::UserType) { && (unsigned)typeId >= QVariant::UserType) {
TableModel *sch = new TableModel(typeId, tableProperty.name()); TableModel *sch = new TableModel(typeId, tableProperty.name());
currentModel.append(sch); currentModel.append(sch);
} }
@ -215,7 +216,7 @@ bool DatabasePrivate::getCurrectScheema()
foreach (TableModel *sch, currentModel) foreach (TableModel *sch, currentModel)
foreach (RelationModel *fk, sch->foregionKeys()) foreach (RelationModel *fk, sch->foregionKeys())
fk->table = currentModel.modelByClass(fk->className); fk->table = currentModel.tableByClassName(fk->className);
allTableMaps.insert(q->metaObject()->className(), currentModel); allTableMaps.insert(q->metaObject()->className(), currentModel);
return true; return true;
@ -224,12 +225,12 @@ bool DatabasePrivate::getCurrectScheema()
DatabaseModel DatabasePrivate::getLastScheema() DatabaseModel DatabasePrivate::getLastScheema()
{ {
Q_Q(Database); Q_Q(Database);
// ChangeLogTable *u = q->_change_logs()->createQuery()->orderBy("id",
// "desc")->first();
ChangeLogTable *u
= changeLogs->query()->orderBy("id", "desc")->first();
DatabaseModel ret; ChangeLogTable *u = changeLogs->query()
->orderBy(!ChangeLogTable::idField())
->first();
DatabaseModel ret(q->metaObject()->className());
if (u) { if (u) {
QJsonObject json QJsonObject json
@ -291,7 +292,7 @@ bool DatabasePrivate::storeScheemaInDB()
void DatabasePrivate::createChangeLogs() void DatabasePrivate::createChangeLogs()
{ {
// currentModel.model("change_log") // currentModel.model("change_log")
QString diff = sqlGenertor->diff(0, currentModel.model("__change_log")); QString diff = sqlGenertor->diff(0, currentModel.tableByName("__change_log"));
db.exec(diff); db.exec(diff);
} }
@ -392,7 +393,7 @@ DatabaseModel Database::model() const
QString Database::tableName(QString className) QString Database::tableName(QString className)
{ {
Q_D(Database); Q_D(Database);
TableModel *m = model().modelByClass(className); TableModel *m = model().tableByClassName(className);
if (m) if (m)
return m->name(); return m->name();
else else
@ -438,7 +439,7 @@ void Database::setConnectionName(QString connectionName)
void Database::setDriver(QString driver) void Database::setDriver(QString driver)
{ {
Q_D(Database); Q_D(Database);
d->driver = driver; d->driver = driver.toUpper();
} }
SqlGeneratorBase *Database::sqlGenertor() const SqlGeneratorBase *Database::sqlGenertor() const

2
src/database.h
View File

@ -53,6 +53,7 @@ public:
QSqlQuery exec(QString sql); QSqlQuery exec(QString sql);
//TODO: make me private and rename me
void add(TableSetBase *); void add(TableSetBase *);
int saveChanges(); int saveChanges();
void cleanUp(); void cleanUp();
@ -71,6 +72,7 @@ public:
SqlGeneratorBase *sqlGenertor() const; SqlGeneratorBase *sqlGenertor() const;
protected: protected:
//remove minor version
virtual void databaseUpdated(int oldMajor, int oldMinor, int newMajor, virtual void databaseUpdated(int oldMajor, int oldMinor, int newMajor,
int newMinor); int newMinor);

32
src/databasemodel.cpp
View File

@ -25,9 +25,11 @@
NUT_BEGIN_NAMESPACE NUT_BEGIN_NAMESPACE
DatabaseModel::DatabaseModel() : QList<TableModel*>(), _versionMajor(0), _versionMinor(0) QMap<QString, DatabaseModel*> DatabaseModel::_models;
{
DatabaseModel::DatabaseModel(const QString &name) : QList<TableModel*>(), _databaseClassName(name), _versionMajor(0), _versionMinor(0)
{
_models.insert(name, this);
} }
DatabaseModel::DatabaseModel(const DatabaseModel &other) : QList<TableModel*>(other), _versionMajor(0), _versionMinor(0) DatabaseModel::DatabaseModel(const DatabaseModel &other) : QList<TableModel*>(other), _versionMajor(0), _versionMinor(0)
@ -35,7 +37,7 @@ DatabaseModel::DatabaseModel(const DatabaseModel &other) : QList<TableModel*>(ot
} }
TableModel *DatabaseModel::model(QString tableName) const TableModel *DatabaseModel::tableByName(QString tableName) const
{ {
for(int i = 0; i < size(); i++){ for(int i = 0; i < size(); i++){
TableModel *s = at(i); TableModel *s = at(i);
@ -49,7 +51,7 @@ TableModel *DatabaseModel::model(QString tableName) const
return 0; return 0;
} }
TableModel *DatabaseModel::modelByClass(QString className) const TableModel *DatabaseModel::tableByClassName(QString className) const
{ {
for(int i = 0; i < size(); i++){ for(int i = 0; i < size(); i++){
TableModel *s = at(i); TableModel *s = at(i);
@ -71,7 +73,7 @@ bool DatabaseModel::operator ==(const DatabaseModel &other) const
for(int i = 0; i < size(); i++){ for(int i = 0; i < size(); i++){
TableModel *mine = at(i); TableModel *mine = at(i);
TableModel *others = other.model(mine->name()); TableModel *others = other.tableByName(mine->name());
if(!others) if(!others)
return false; return false;
@ -98,9 +100,9 @@ QJsonObject DatabaseModel::toJson() const
return obj; return obj;
} }
RelationModel *DatabaseModel::relationByClassNames(QString masterClassName, QString childClassName) RelationModel *DatabaseModel::relationByClassNames(const QString &masterClassName, const QString &childClassName)
{ {
TableModel *childTable = modelByClass(childClassName); TableModel *childTable = tableByClassName(childClassName);
if(!childTable) if(!childTable)
return 0; return 0;
@ -112,9 +114,9 @@ RelationModel *DatabaseModel::relationByClassNames(QString masterClassName, QStr
return 0; return 0;
} }
RelationModel *DatabaseModel::relationByTableNames(QString masterTableName, QString childTableName) RelationModel *DatabaseModel::relationByTableNames(const QString &masterTableName, const QString &childTableName)
{ {
TableModel *childTable = model(childTableName); TableModel *childTable = tableByName(childTableName);
if(!childTable) if(!childTable)
return 0; return 0;
@ -128,7 +130,7 @@ RelationModel *DatabaseModel::relationByTableNames(QString masterTableName, QStr
DatabaseModel DatabaseModel::fromJson(QJsonObject &json) DatabaseModel DatabaseModel::fromJson(QJsonObject &json)
{ {
DatabaseModel model; DatabaseModel model(QString::null);
// model.setVersionMajor(json.value(QT_STRINGIFY(versionMajor)).toInt()); // model.setVersionMajor(json.value(QT_STRINGIFY(versionMajor)).toInt());
// model.setVersionMinor(json.value(QT_STRINGIFY(versionMinor)).toInt()); // model.setVersionMinor(json.value(QT_STRINGIFY(versionMinor)).toInt());
@ -163,7 +165,7 @@ void DatabaseModel::setVersionMinor(int versionMinor)
_versionMinor = versionMinor; _versionMinor = versionMinor;
} }
bool DatabaseModel::remove(QString tableName) bool DatabaseModel::remove(const QString &tableName)
{ {
for(int i = 0; i < size(); i++){ for(int i = 0; i < size(); i++){
TableModel *s = at(i); TableModel *s = at(i);
@ -175,4 +177,12 @@ bool DatabaseModel::remove(QString tableName)
return false; return false;
} }
DatabaseModel *DatabaseModel::modelByName(const QString &name)
{
if (_models.contains(name))
return _models[name];
return Q_NULLPTR;
}
NUT_END_NAMESPACE NUT_END_NAMESPACE

19
src/databasemodel.h
View File

@ -32,16 +32,21 @@ class TableModel;
struct RelationModel; struct RelationModel;
class DatabaseModel : public QList<TableModel *> class DatabaseModel : public QList<TableModel *>
{ {
QString _databaseClassName;
int _versionMajor, _versionMinor; int _versionMajor, _versionMinor;
static QMap<QString, DatabaseModel *> _models;
public: public:
DatabaseModel(); DatabaseModel(const QString &name = QString::null);
DatabaseModel(const DatabaseModel &other); DatabaseModel(const DatabaseModel &other);
TableModel *model(QString tableName) const; TableModel *tableByName(QString tableName) const;
TableModel *modelByClass(QString className) const; TableModel *tableByClassName(QString className) const;
RelationModel *relationByClassNames(QString masterClassName, QString childClassName); RelationModel *relationByClassNames(const QString &masterClassName,
RelationModel *relationByTableNames(QString masterTableName, QString childTableName); const QString &childClassName);
RelationModel *relationByTableNames(const QString &masterClassName,
const QString &childClassName);
bool operator==(const DatabaseModel &other) const; bool operator==(const DatabaseModel &other) const;
@ -54,7 +59,9 @@ public:
int versionMinor() const; int versionMinor() const;
void setVersionMinor(int versionMinor); void setVersionMinor(int versionMinor);
bool remove(QString tableName); bool remove(const QString &tableName);
static DatabaseModel *modelByName(const QString &name);
}; };
NUT_END_NAMESPACE NUT_END_NAMESPACE

11
src/defines.h
View File

@ -43,18 +43,19 @@
#endif #endif
// Database // Database
//TODO: remove minor version
#define NUT_DB_VERSION(major, minor) Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX __nut_DB_VERSION), QT_STRINGIFY(#major "." #minor)) #define NUT_DB_VERSION(major, minor) Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX __nut_DB_VERSION), QT_STRINGIFY(#major "." #minor))
#define NUT_DECLARE_TABLE(type, name) \ #define NUT_DECLARE_TABLE(type, name) \
Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX __nut_TABLE " " #type), #name) \ Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX __nut_TABLE " " #type), #name) \
Q_PROPERTY(type* name READ name) \ Q_PROPERTY(type* name READ name) \
Q_PROPERTY(__NUT_NAMESPACE_PERFIX TableSet<type> name##s READ name##s) \ Q_PROPERTY(NUT_WRAP_NAMESPACE(TableSet<type>) name##s READ name##s) \
type* m_##name; \ type* m_##name; \
__NUT_NAMESPACE_PERFIX TableSet<type> *m_##name##s; \ NUT_WRAP_NAMESPACE(TableSet<type>) *m_##name##s; \
public: \ public: \
static const type _##name; \ static const type _##name; \
type* name() const{ return m_##name; } \ type* name() const{ return m_##name; } \
__NUT_NAMESPACE_PERFIX TableSet<type> *name##s() const { return m_##name##s; } NUT_WRAP_NAMESPACE(TableSet<type>) *name##s() const { return m_##name##s; }
//Table //Table
#define NUT_DECLARE_FIELD(type, name, read, write) \ #define NUT_DECLARE_FIELD(type, name, read, write) \
@ -62,8 +63,8 @@ public: \
Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #name " " __nut_FIELD), #name) \ Q_CLASSINFO(QT_STRINGIFY(__nut_NAME_PERFIX #name " " __nut_FIELD), #name) \
type m_##name; \ type m_##name; \
public: \ public: \
static __NUT_NAMESPACE_PERFIX FieldPhrase<type> name##Field(){ \ static NUT_WRAP_NAMESPACE(FieldPhrase<type>) name ## Field(){ \
static __NUT_NAMESPACE_PERFIX FieldPhrase<type> f = __NUT_NAMESPACE_PERFIX FieldPhrase<type>(staticMetaObject.className(), #name); \ static NUT_WRAP_NAMESPACE(FieldPhrase<type>) f = NUT_WRAP_NAMESPACE(FieldPhrase<type>)(staticMetaObject.className(), #name); \
return f; \ return f; \
} \ } \
type read() const{ \ type read() const{ \

127
src/query.h
View File

@ -54,12 +54,13 @@ public:
Query<T> *join(const QString &tableName); Query<T> *join(const QString &tableName);
Query<T> *setWhere(WherePhrase where); Query<T> *setWhere(WherePhrase where);
Query<T> *join(Table *c){ Query<T> *join(Table *c)
{
join(c->metaObject()->className()); join(c->metaObject()->className());
return this; return this;
} }
Query<T> *orderBy(QString fieldName, QString type); // Query<T> *orderBy(QString fieldName, QString type);
Query<T> *orderBy(WherePhrase phrase); Query<T> *orderBy(WherePhrase phrase);
int count(); int count();
@ -78,20 +79,25 @@ public:
}; };
template <typename T> template <typename T>
inline Query<T> *createQuery(TableSet<T> *tableSet){ inline Query<T> *createQuery(TableSet<T> *tableSet)
{
} }
template <class T> template <class T>
Q_OUTOFLINE_TEMPLATE Query<T>::Query(Database *database, TableSetBase *tableSet, bool autoDelete) : QueryBase(database), Q_OUTOFLINE_TEMPLATE Query<T>::Query(Database *database, TableSetBase *tableSet,
d_ptr(new QueryPrivate(this)), m_autoDelete(autoDelete) bool autoDelete)
: QueryBase(database), d_ptr(new QueryPrivate(this)),
m_autoDelete(autoDelete)
{ {
Q_D(Query); Q_D(Query);
d->database = database; d->database = database;
d->tableSet = tableSet; d->tableSet = tableSet;
d->tableName = //TableModel::findByClassName(T::staticMetaObject.className())->name(); d->tableName
d->database->model().modelByClass(T::staticMetaObject.className())->name(); = // TableModel::findByClassName(T::staticMetaObject.className())->name();
d->database->model()
.tableByClassName(T::staticMetaObject.className())
->name();
} }
template <class T> template <class T>
@ -109,35 +115,39 @@ Q_OUTOFLINE_TEMPLATE QList<T *> Query<T>::toList(int count)
QList<T *> result; QList<T *> result;
d->select = "*"; d->select = "*";
// QSqlQuery q = d->database->exec(d->database->sqlGenertor()->selectCommand(d->wheres, d->orders, d->tableName, d->joinClassName)); // QSqlQuery q =
// d->database->exec(d->database->sqlGenertor()->selectCommand(d->wheres,
// d->orders, d->tableName, d->joinClassName));
d->sql = d->database->sqlGenertor()->selectCommand( d->sql = d->database->sqlGenertor()->selectCommand(
SqlGeneratorBase::SelectAll, SqlGeneratorBase::SelectAll, "", d->wheres, d->orderPhrases,
"", d->tableName, d->joinClassName);
d->wheres,
d->orderPhrases,
d->tableName,
d->joinClassName);
QSqlQuery q = d->database->exec(d->sql); QSqlQuery q = d->database->exec(d->sql);
// QString pk = TableModel::findByName(d->tableName)->primaryKey(); // QString pk = TableModel::findByName(d->tableName)->primaryKey();
QString pk = d->database->model().model(d->tableName)->primaryKey(); QString pk = d->database->model().tableByName(d->tableName)->primaryKey();
QVariant lastPkValue = QVariant(); QVariant lastPkValue = QVariant();
int childTypeId = 0; int childTypeId = 0;
T *lastRow = 0; T *lastRow = 0;
TableSetBase *childTableSet = Q_NULLPTR; TableSetBase *childTableSet = Q_NULLPTR;
// FIXME: getting table error // FIXME: getting table error
// QStringList masterFields = TableModel::findByName(d->tableName)->fieldsNames(); // QStringList masterFields =
QStringList masterFields = d->database->model().model(d->tableName)->fieldsNames(); // TableModel::findByName(d->tableName)->fieldsNames();
QStringList masterFields
= d->database->model().tableByName(d->tableName)->fieldsNames();
QStringList childFields; QStringList childFields;
if (!d->joinClassName.isNull()) { if (!d->joinClassName.isNull()) {
TableModel *joinTableModel = TableModel::findByClassName(d->joinClassName); TableModel *joinTableModel
= TableModel::findByClassName(d->joinClassName);
if (joinTableModel) { if (joinTableModel) {
// childFields = d->database->model().modelByClass(d->joinClassName)->fieldsNames(); // childFields =
childFields = TableModel::findByClassName(d->joinClassName)->fieldsNames(); // d->database->model().modelByClass(d->joinClassName)->fieldsNames();
childFields
= TableModel::findByClassName(d->joinClassName)->fieldsNames();
QString joinTableName = d->database->tableName(d->joinClassName); QString joinTableName = d->database->tableName(d->joinClassName);
childTypeId = d->database->model().model(joinTableName)->typeId(); childTypeId = d->database->model().tableByName(joinTableName)->typeId();
// childTypeId = TableModel::findByName(joinTableName)->typeId(); // childTypeId =
// TableModel::findByName(joinTableName)->typeId();
} }
} }
@ -146,10 +156,14 @@ Q_OUTOFLINE_TEMPLATE QList<T *> Query<T>::toList(int count)
T *t = new T(); T *t = new T();
foreach (QString field, masterFields) foreach (QString field, masterFields)
t->setProperty(field.toLatin1().data(), q.value(field)); t->setProperty(field.toLatin1().data(), q.value(field));
// for (int i = 0; i < t->metaObject()->propertyCount(); i++) { // for (int i = 0; i < t->metaObject()->propertyCount();
// const QMetaProperty p = t->metaObject()->property(i); // i++) {
// const QMetaProperty p =
// t->metaObject()->property(i);
// p.write(t, d->database->sqlGenertor()->readValue(p.type(), q.value(p.name()))); // p.write(t,
// d->database->sqlGenertor()->readValue(p.type(),
// q.value(p.name())));
// } // }
t->setTableSet(d->tableSet); t->setTableSet(d->tableSet);
@ -169,11 +183,14 @@ Q_OUTOFLINE_TEMPLATE QList<T *> Query<T>::toList(int count)
} }
if (childTypeId) { if (childTypeId) {
const QMetaObject *childMetaObject = QMetaType::metaObjectForType(childTypeId); const QMetaObject *childMetaObject
Table *childTable = qobject_cast<Table*>(childMetaObject->newInstance()); = QMetaType::metaObjectForType(childTypeId);
Table *childTable
= qobject_cast<Table *>(childMetaObject->newInstance());
foreach (QString field, childFields) foreach (QString field, childFields)
childTable->setProperty(field.toLatin1().data(), q.value(field)); childTable->setProperty(field.toLatin1().data(),
q.value(field));
// TODO: set database for table // TODO: set database for table
childTable->setParent(this); childTable->setParent(this);
childTable->setParentTable(lastRow); childTable->setParentTable(lastRow);
@ -200,12 +217,8 @@ Q_OUTOFLINE_TEMPLATE QList<F> Query<T>::select(const FieldPhrase<F> f)
Q_D(Query); Q_D(Query);
QList<F> ret; QList<F> ret;
d->sql = d->database->sqlGenertor()->selectCommand( d->sql = d->database->sqlGenertor()->selectCommand(
SqlGeneratorBase::SignleField, SqlGeneratorBase::SignleField, f.data()->text, d->wheres,
f.data()->text, d->orderPhrases, d->tableName, d->joinClassName);
d->wheres,
d->orderPhrases,
d->tableName,
d->joinClassName);
QSqlQuery q = d->database->exec(d->sql); QSqlQuery q = d->database->exec(d->sql);
while (q.next()) { while (q.next()) {
@ -235,7 +248,8 @@ Q_OUTOFLINE_TEMPLATE int Query<T>::count()
Q_D(Query); Q_D(Query);
d->select = "COUNT(*)"; d->select = "COUNT(*)";
d->sql = d->database->sqlGenertor()->selectCommand("COUNT(*)", d->wheres, d->orders, d->tableName, d->joinClassName); d->sql = d->database->sqlGenertor()->selectCommand(SqlGeneratorBase::Count,
QStringLiteral("*"), d->wheres, d->orderPhrases, d->tableName, d->joinClassName);
QSqlQuery q = d->database->exec(d->sql); QSqlQuery q = d->database->exec(d->sql);
if (q.next()) if (q.next())
@ -244,10 +258,13 @@ Q_OUTOFLINE_TEMPLATE int Query<T>::count()
} }
template <class T> template <class T>
Q_OUTOFLINE_TEMPLATE QVariant Query<T>::max(FieldPhrase<int> &f){ Q_OUTOFLINE_TEMPLATE QVariant Query<T>::max(FieldPhrase<int> &f)
{
Q_D(Query); Q_D(Query);
d->sql = d->database->sqlGenertor()->selectCommand("MAX(" + f.data()->text + ")", d->wheres, d->orders, d->tableName, d->joinClassName); d->sql = d->database->sqlGenertor()->selectCommand(
SqlGeneratorBase::Max, f.data()->text, d->wheres, d->orderPhrases,
d->tableName, d->joinClassName);
QSqlQuery q = d->database->exec(d->sql); QSqlQuery q = d->database->exec(d->sql);
if (q.next()) if (q.next())
@ -256,10 +273,13 @@ Q_OUTOFLINE_TEMPLATE QVariant Query<T>::max(FieldPhrase<int> &f){
} }
template <class T> template <class T>
Q_OUTOFLINE_TEMPLATE QVariant Query<T>::min(FieldPhrase<int> &f){ Q_OUTOFLINE_TEMPLATE QVariant Query<T>::min(FieldPhrase<int> &f)
{
Q_D(Query); Q_D(Query);
d->sql = d->database->sqlGenertor()->selectCommand("MIN(" + f.data()->text + ")", d->wheres, d->orders, d->tableName, d->joinClassName); d->sql = d->database->sqlGenertor()->selectCommand(
SqlGeneratorBase::Min, f.data()->text, d->wheres, d->orderPhrases,
d->tableName, d->joinClassName);
QSqlQuery q = d->database->exec(d->sql); QSqlQuery q = d->database->exec(d->sql);
if (q.next()) if (q.next())
@ -272,7 +292,9 @@ Q_OUTOFLINE_TEMPLATE QVariant Query<T>::average(FieldPhrase<int> &f)
{ {
Q_D(Query); Q_D(Query);
d->sql = d->database->sqlGenertor()->selectCommand("AVG(" + f.data()->text + ")", d->wheres, d->orders, d->tableName, d->joinClassName); d->sql = d->database->sqlGenertor()->selectCommand(
SqlGeneratorBase::Average, f.data()->text, d->wheres, d->orderPhrases,
d->tableName, d->joinClassName);
QSqlQuery q = d->database->exec(d->sql); QSqlQuery q = d->database->exec(d->sql);
if (q.next()) if (q.next())
@ -296,13 +318,14 @@ Q_OUTOFLINE_TEMPLATE Query<T> *Query<T>::setWhere(WherePhrase where)
return this; return this;
} }
template<class T> //template <class T>
Q_OUTOFLINE_TEMPLATE Query<T> *Query<T>::orderBy(QString fieldName, QString type) //Q_OUTOFLINE_TEMPLATE Query<T> *Query<T>::orderBy(QString fieldName,
{ // QString type)
Q_D(Query); //{
d->orders.insert(fieldName, type); // Q_D(Query);
return this; // d->orderPhrases.append(fieldName, type);
} // return this;
//}
template <class T> template <class T>
Q_OUTOFLINE_TEMPLATE Query<T> *Query<T>::orderBy(WherePhrase phrase) Q_OUTOFLINE_TEMPLATE Query<T> *Query<T>::orderBy(WherePhrase phrase)
@ -317,9 +340,7 @@ Q_OUTOFLINE_TEMPLATE int Query<T>::update(WherePhrase phrase)
{ {
Q_D(Query); Q_D(Query);
d->sql = d->database->sqlGenertor()->updateCommand( d->sql = d->database->sqlGenertor()->updateCommand(phrase, d->wheres,
phrase,
d->wheres,
d->tableName); d->tableName);
QSqlQuery q = d->database->exec(d->sql); QSqlQuery q = d->database->exec(d->sql);
@ -333,9 +354,7 @@ Q_OUTOFLINE_TEMPLATE int Query<T>::remove()
{ {
Q_D(Query); Q_D(Query);
d->sql = d->database->sqlGenertor()->deleteCommand( d->sql = d->database->sqlGenertor()->deleteCommand(d->wheres, d->tableName);
d->wheres,
d->tableName);
QSqlQuery q = d->database->exec(d->sql); QSqlQuery q = d->database->exec(d->sql);
if (m_autoDelete) if (m_autoDelete)

189
src/sqlgeneratorbase.cpp
View File

@ -33,7 +33,8 @@
NUT_BEGIN_NAMESPACE NUT_BEGIN_NAMESPACE
SqlGeneratorBase::SqlGeneratorBase(Database *parent) : QObject((QObject*)parent) SqlGeneratorBase::SqlGeneratorBase(Database *parent)
: QObject((QObject *)parent)
{ {
if (parent) if (parent)
_database = parent; _database = parent;
@ -41,7 +42,6 @@ SqlGeneratorBase::SqlGeneratorBase(Database *parent) : QObject((QObject*)parent)
SqlGeneratorBase::~SqlGeneratorBase() SqlGeneratorBase::~SqlGeneratorBase()
{ {
} }
QString SqlGeneratorBase::masterDatabaseName(QString databaseName) QString SqlGeneratorBase::masterDatabaseName(QString databaseName)
@ -77,7 +77,8 @@ QString SqlGeneratorBase::fieldDeclare(FieldModel *field)
return field->name + " " + fieldType(field); return field->name + " " + fieldType(field);
} }
QStringList SqlGeneratorBase::diff(DatabaseModel lastModel, DatabaseModel newModel) QStringList SqlGeneratorBase::diff(DatabaseModel lastModel,
DatabaseModel newModel)
{ {
QStringList ret; QStringList ret;
@ -88,10 +89,9 @@ QStringList SqlGeneratorBase::diff(DatabaseModel lastModel, DatabaseModel newMod
foreach (TableModel *table, newModel) foreach (TableModel *table, newModel)
tableNames.insert(table->name()); tableNames.insert(table->name());
foreach (QString tableName, tableNames) { foreach (QString tableName, tableNames) {
TableModel *oldTable = lastModel.model(tableName); TableModel *oldTable = lastModel.tableByName(tableName);
TableModel *newTable = newModel.model(tableName); TableModel *newTable = newModel.tableByName(tableName);
QString sql = diff(oldTable, newTable); QString sql = diff(oldTable, newTable);
ret << sql; ret << sql;
} }
@ -151,19 +151,16 @@ QString SqlGeneratorBase::diff(TableModel *oldTable, TableModel *newTable)
} }
QString sql; QString sql;
if (oldTable) { if (oldTable) {
sql = QString("ALTER TABLE %1 \n%2") sql = QString("ALTER TABLE %1 \n%2").arg(newTable->name()).arg(
.arg(newTable->name()) columnSql.join(",\n"));
.arg(columnSql.join(",\n"));
} else { } else {
if (!newTable->primaryKey().isNull()) if (!newTable->primaryKey().isNull())
columnSql << QString("CONSTRAINT pk_%1 PRIMARY KEY (%2)") columnSql << QString("CONSTRAINT pk_%1 PRIMARY KEY (%2)")
.arg(newTable->name()) .arg(newTable->name())
.arg(newTable->primaryKey()); .arg(newTable->primaryKey());
sql = QString("CREATE TABLE %1 \n(%2)") sql = QString("CREATE TABLE %1 \n(%2)").arg(newTable->name()).arg(
.arg(newTable->name()) columnSql.join(",\n"));
.arg(columnSql.join(",\n"));
} }
return sql; return sql;
} }
@ -176,7 +173,8 @@ QString SqlGeneratorBase::insertRecord(Table *t, QString tableName)
foreach (QString f, t->changedProperties()) foreach (QString f, t->changedProperties())
if (f != key) if (f != key)
values.append("'" + t->property(f.toLatin1().data()).toString() + "'"); values.append("'" + t->property(f.toLatin1().data()).toString()
+ "'");
QString changedPropertiesText = ""; QString changedPropertiesText = "";
QSet<QString> props = t->changedProperties(); QSet<QString> props = t->changedProperties();
@ -201,7 +199,8 @@ QString SqlGeneratorBase::updateRecord(Table *t, QString tableName)
foreach (QString f, t->changedProperties()) foreach (QString f, t->changedProperties())
if (f != key) if (f != key)
values.append(f + "='" + t->property(f.toLatin1().data()).toString() + "'"); values.append(f + "='" + t->property(f.toLatin1().data()).toString()
+ "'");
sql = QString("UPDATE %1 SET %2 WHERE %3=%4") sql = QString("UPDATE %1 SET %2 WHERE %3=%4")
.arg(tableName) .arg(tableName)
.arg(values.join(", ")) .arg(values.join(", "))
@ -219,7 +218,8 @@ QString SqlGeneratorBase::deleteRecord(Table *t, QString tableName)
.arg(t->primaryValue().toString()); .arg(t->primaryValue().toString());
} }
QString SqlGeneratorBase::agregateText(const AgregateType &t, const QString &arg) const QString SqlGeneratorBase::agregateText(const AgregateType &t,
const QString &arg) const
{ {
switch (t) { switch (t) {
case SelectAll: case SelectAll:
@ -251,14 +251,17 @@ QString SqlGeneratorBase::agregateText(const AgregateType &t, const QString &arg
} }
} }
QString SqlGeneratorBase::fromTableText(const QString &tableName, QString &joinClassName, QString &orderBy) const QString SqlGeneratorBase::fromTableText(const QString &tableName,
QString &joinClassName,
QString &orderBy) const
{ {
QString tableNameText = tableName; QString tableNameText = tableName;
if (!joinClassName.isNull()) { if (!joinClassName.isNull()) {
QString joinTableName = _database->tableName(joinClassName); QString joinTableName = _database->tableName(joinClassName);
RelationModel *rel = _database->model().relationByTableNames(tableName, joinTableName); RelationModel *rel
= _database->model().relationByTableNames(tableName, joinTableName);
if (rel) { if (rel) {
QString pk = _database->model().model(tableName)->primaryKey(); QString pk = _database->model().tableByName(tableName)->primaryKey();
tableNameText = QString("%1 INNER JOIN %2 ON (%1.%3 = %2.%4)") tableNameText = QString("%1 INNER JOIN %2 ON (%1.%3 = %2.%4)")
.arg(tableName) .arg(tableName)
.arg(joinTableName) .arg(joinTableName)
@ -266,11 +269,14 @@ QString SqlGeneratorBase::fromTableText(const QString &tableName, QString &joinC
.arg(rel->localColumn); .arg(rel->localColumn);
orderBy = tableName + "." + pk; orderBy = tableName + "." + pk;
} else { } else {
qWarning(QString("Relation between table %1 and class %2 (%3) not exists!") qWarning(
QString(
"Relation between table %1 and class %2 (%3) not exists!")
.arg(tableName) .arg(tableName)
.arg(joinClassName) .arg(joinClassName)
.arg(joinTableName.isNull() ? "NULL" : joinTableName) .arg(joinTableName.isNull() ? "NULL" : joinTableName)
.toLatin1().data()); .toLatin1()
.data());
joinClassName = QString::null; joinClassName = QString::null;
} }
} }
@ -291,7 +297,12 @@ QString SqlGeneratorBase::deleteRecords(QString tableName, QString where)
return sql; return sql;
} }
QString SqlGeneratorBase::selectCommand(SqlGeneratorBase::AgregateType t, QString agregateArg, QList<WherePhrase> &wheres, QList<WherePhrase> &orders, QString tableName, QString joinClassName) QString SqlGeneratorBase::selectCommand(SqlGeneratorBase::AgregateType t,
QString agregateArg,
QList<WherePhrase> &wheres,
QList<WherePhrase> &orders,
QString tableName,
QString joinClassName)
{ {
QString select = agregateText(t, agregateArg); QString select = agregateText(t, agregateArg);
QString where = createWhere(wheres); QString where = createWhere(wheres);
@ -313,64 +324,24 @@ QString SqlGeneratorBase::selectCommand(SqlGeneratorBase::AgregateType t, QStrin
sql.append(" ORDER BY " + order); sql.append(" ORDER BY " + order);
for (int i = 0; i < _database->model().count(); i++) for (int i = 0; i < _database->model().count(); i++)
sql = sql.replace(_database->model().at(i)->className() + "." , _database->model().at(i)->name() + "."); sql = sql.replace(_database->model().at(i)->className() + ".",
_database->model().at(i)->name() + ".");
replaceTableNames(sql); replaceTableNames(sql);
return sql; return sql;
} }
QString SqlGeneratorBase::selectCommand(QString selectPhrase, QString agregateArg,
QList<WherePhrase> &wheres, QList<WherePhrase> &orders,
QString tableName, QString joinClassName)
{
QString where = createWhere(wheres);
QString order = "";
QString from = fromTableText(tableName, joinClassName, order);
foreach(WherePhrase p, orders){
if(order != "")
order.append(", ");
order.append(phraseOrder(p.data()));
}
QString sql = "SELECT " + selectPhrase + " FROM " + from;
if(where != "")
sql.append(" WHERE " + where);
if(order != "")
sql.append(" ORDER BY " + order);
for(int i = 0; i < _database->model().count(); i++)
sql = sql.replace(_database->model().at(i)->className() + "." , _database->model().at(i)->name() + ".");
replaceTableNames(sql);
return sql;
}
QString SqlGeneratorBase::selectCommand(QList<WherePhrase> &wheres, QHash<QString, QString> &orders, QString tableName, QString joinClassName)
{
return selectCommand("*", wheres, orders, tableName, joinClassName);
}
QString SqlGeneratorBase::createWhere(QList<WherePhrase> &wheres) QString SqlGeneratorBase::createWhere(QList<WherePhrase> &wheres)
{ {
QString whereText = ""; QString whereText = "";
// for (int i = 0; i < wheres.count(); i++) {
// if(whereText != "")
// whereText.append(" AND ");
// whereText.append(phrase(wheres[i].data()));
// }
foreach (WherePhrase w, wheres) { foreach (WherePhrase w, wheres) {
if (whereText != "") if (whereText != "")
whereText.append(" AND "); whereText.append(" AND ");
whereText.append(phrase(w.data())); whereText.append(phrase(w.data()));
} }
// if(whereText != "")
// whereText.prepend(" WHERE ");
return whereText; return whereText;
} }
@ -381,58 +352,8 @@ void SqlGeneratorBase::replaceTableNames(QString &command)
command = command.replace("[" + m->className() + "].", m->name() + "."); command = command.replace("[" + m->className() + "].", m->name() + ".");
} }
QString SqlGeneratorBase::selectCommand(QString selectPhrase, QList<WherePhrase> &wheres, QHash<QString, QString> &orders, QString tableName, QString joinClassName) QString SqlGeneratorBase::deleteCommand(QList<WherePhrase> &wheres,
{ QString tableName)
QString orderText = "";
QStringList orderby;
QString whereText = createWhere(wheres);
if(whereText != "")
whereText.prepend(" WHERE ");
QString tableNameText = tableName;
if(!joinClassName.isNull()){
QString joinTableName = _database->tableName(joinClassName);
RelationModel *rel = _database->model().relationByTableNames(tableName, joinTableName);
if(rel){
QString pk = _database->model().model(tableName)->primaryKey();
tableNameText = QString("%1 INNER JOIN %2 ON (%1.%3 = %2.%4)")
.arg(tableName)
.arg(joinTableName)
.arg(pk)
.arg(rel->localColumn);
orderby.append(tableName + "." + pk);
}else{
qWarning("Relation between table %s and class %s (%s) not exists!",
qPrintable(tableName),
qPrintable(joinClassName),
qPrintable(joinTableName.isNull() ? "NULL" : joinTableName));
joinClassName = QString::null;
}
}
if(orders.count())
foreach (QString o, orders.keys())
// orderby.append(o + (orders.value(o) ? " ASC" : " DESC"));
orderby.append(o + " " + orders.value(o));
if(orderby.count())
orderText = " ORDER BY " + orderby.join(", ");
QString command = "SELECT "
+selectPhrase
+ " FROM "
+ tableNameText
+ whereText
+ orderText;
replaceTableNames(command);
return command;
}
QString SqlGeneratorBase::deleteCommand(QList<WherePhrase> &wheres, QString tableName)
{ {
QString command = "DELETE FROM " + tableName; QString command = "DELETE FROM " + tableName;
QString where = createWhere(wheres); QString where = createWhere(wheres);
@ -441,14 +362,17 @@ QString SqlGeneratorBase::deleteCommand(QList<WherePhrase> &wheres, QString tabl
command.append(" WHERE " + where); command.append(" WHERE " + where);
for (int i = 0; i < _database->model().count(); i++) for (int i = 0; i < _database->model().count(); i++)
command = command.replace(_database->model().at(i)->className() + "." , _database->model().at(i)->name() + "."); command = command.replace(_database->model().at(i)->className() + ".",
_database->model().at(i)->name() + ".");
replaceTableNames(command); replaceTableNames(command);
return command; return command;
} }
QString SqlGeneratorBase::updateCommand(WherePhrase &phrase, QList<WherePhrase> &wheres, QString tableName) QString SqlGeneratorBase::updateCommand(WherePhrase &phrase,
QList<WherePhrase> &wheres,
QString tableName)
{ {
QString p = this->phrase(phrase.data()); QString p = this->phrase(phrase.data());
QString where = createWhere(wheres); QString where = createWhere(wheres);
@ -459,7 +383,10 @@ QString SqlGeneratorBase::updateCommand(WherePhrase &phrase, QList<WherePhrase>
sql.append(" WHERE " + where); sql.append(" WHERE " + where);
for (int i = 0; i < _database->model().count(); i++) for (int i = 0; i < _database->model().count(); i++)
sql = sql.replace(_database->model().at(i)->className() + "." , _database->model().at(i)->name() + "."); sql = sql.replace(_database->model().at(i)->className() + ".",
_database->model().at(i)->name() + ".");
replaceTableNames(sql);
return sql; return sql;
} }
@ -513,7 +440,8 @@ QString SqlGeneratorBase::escapeValue(const QVariant &v)const
return ""; return "";
} }
QVariant SqlGeneratorBase::readValue(const QVariant::Type &type, const QVariant &dbValue) QVariant SqlGeneratorBase::readValue(const QVariant::Type &type,
const QVariant &dbValue)
{ {
return dbValue; return dbValue;
} }
@ -556,11 +484,13 @@ QString SqlGeneratorBase::phrase(const PhraseData *d) const
break; break;
case PhraseData::WithVariant: case PhraseData::WithVariant:
ret = phrase(d->left) + " " + operatorString(d->operatorCond) + " " + escapeValue(d->operand); ret = phrase(d->left) + " " + operatorString(d->operatorCond) + " "
+ escapeValue(d->operand);
break; break;
case PhraseData::WithOther: case PhraseData::WithOther:
ret = phrase(d->left) + " " + operatorString(d->operatorCond) + " " + phrase(d->right); ret = phrase(d->left) + " " + operatorString(d->operatorCond) + " "
+ phrase(d->right);
break; break;
case PhraseData::WithoutOperand: case PhraseData::WithoutOperand:
@ -581,7 +511,8 @@ QString SqlGeneratorBase::phraseUpdate(const PhraseData *d) const
{ {
QString ret = ""; QString ret = "";
if (d->operatorCond != PhraseData::And && d->operatorCond != PhraseData::Equal) if (d->operatorCond != PhraseData::And
&& d->operatorCond != PhraseData::Equal)
qFatal("Update command does not accept any phrase else &, ="); qFatal("Update command does not accept any phrase else &, =");
switch (d->type) { switch (d->type) {
@ -590,11 +521,13 @@ QString SqlGeneratorBase::phraseUpdate(const PhraseData *d) const
break; break;
case PhraseData::WithVariant: case PhraseData::WithVariant:
ret = phrase(d->left) + " " + operatorString(d->operatorCond) + " " + escapeValue(d->operand); ret = phrase(d->left) + " " + operatorString(d->operatorCond) + " "
+ escapeValue(d->operand);
break; break;
case PhraseData::WithOther: case PhraseData::WithOther:
ret = phrase(d->left) + " " + operatorString(d->operatorCond) + " " + phrase(d->right); ret = phrase(d->left) + " " + operatorString(d->operatorCond) + " "
+ phrase(d->right);
break; break;
case PhraseData::WithoutOperand: case PhraseData::WithoutOperand:
@ -611,7 +544,8 @@ QString SqlGeneratorBase::phraseUpdate(const PhraseData *d) const
return ret; return ret;
} }
QString SqlGeneratorBase::operatorString(const PhraseData::Condition &cond) const QString
SqlGeneratorBase::operatorString(const PhraseData::Condition &cond) const
{ {
switch (cond) { switch (cond) {
case PhraseData::Equal: case PhraseData::Equal:
@ -667,5 +601,4 @@ QString SqlGeneratorBase::operatorString(const PhraseData::Condition &cond) cons
return QString("<FAIL>"); return QString("<FAIL>");
} }
NUT_END_NAMESPACE NUT_END_NAMESPACE

19
src/sqlgeneratorbase_p.h
View File

@ -76,19 +76,12 @@ public:
virtual QString deleteRecords(QString tableName, QString where); virtual QString deleteRecords(QString tableName, QString where);
virtual QString selectCommand(AgregateType t, QString agregateArg, virtual QString selectCommand(AgregateType t,
QList<WherePhrase> &wheres, QList<WherePhrase> &orders, QString agregateArg,
QString tableName, QString joinClassName); QList<WherePhrase> &wheres,
QList<WherePhrase> &orders,
virtual QString selectCommand(QString selectPhrase, QString agregateArg, QString tableName,
QList<WherePhrase> &wheres, QList<WherePhrase> &orders, QString joinClassName);
QString tableName, QString joinClassName);
virtual QString selectCommand(QList<WherePhrase> &wheres, QHash<QString, QString> &orders,
QString tableName, QString joinClassName);
virtual QString selectCommand(QString selectPhrase,
QList<WherePhrase> &wheres, QHash<QString, QString> &orders,
QString tableName, QString joinClassName);
virtual QString deleteCommand(QList<WherePhrase> &wheres, QString tableName); virtual QString deleteCommand(QList<WherePhrase> &wheres, QString tableName);