diff --git a/src/database.cpp b/src/database.cpp index e804ef4..be77b45 100644 --- a/src/database.cpp +++ b/src/database.cpp @@ -268,7 +268,7 @@ bool DatabasePrivate::getCurrectScheema() qPrintable(f->typeName)); } - foreach (RelationModel *fk, table->foregionKeys()) + foreach (RelationModel *fk, table->foreignKeys()) fk->masterTable = currentModel.tableByClassName(fk->masterClassName); } diff --git a/src/databasemodel.cpp b/src/databasemodel.cpp index e9e3a13..c403dc4 100644 --- a/src/databasemodel.cpp +++ b/src/databasemodel.cpp @@ -146,7 +146,7 @@ RelationModel *DatabaseModel::relationByClassNames(const QString &masterClassNam if(!childTable) return nullptr; - foreach (RelationModel *rel, childTable->foregionKeys()) + foreach (RelationModel *rel, childTable->foreignKeys()) if(rel->masterClassName == masterClassName) return rel; @@ -160,7 +160,7 @@ RelationModel *DatabaseModel::relationByTableNames(const QString &masterTableNam if(!childTable) return nullptr; - foreach (RelationModel *rel, childTable->foregionKeys()) + foreach (RelationModel *rel, childTable->foreignKeys()) if(rel->masterTable->name() == masterTableName) return rel; @@ -210,7 +210,7 @@ void DatabaseModel::fixRelations() { /*TODO: fixme foreach (TableModel *table, currentModel) - foreach (RelationModel *fk, table->foregionKeys()) + foreach (RelationModel *fk, table->foreignKeys()) fk->masterTable = currentModel.tableByClassName(fk->masterClassName); */ } diff --git a/src/defines.h b/src/defines.h index 035b4a3..144ae10 100644 --- a/src/defines.h +++ b/src/defines.h @@ -82,10 +82,10 @@ public: \ propertyChanged(#name); \ } -#define NUT_FOREGION_KEY(type, keytype, name, read, write) \ +#define NUT_FOREIGN_KEY(type, keytype, name, read, write) \ Q_PROPERTY(Nut::Row name READ read WRITE write) \ NUT_DECLARE_FIELD(keytype, name##Id, read##Id, write##Id) \ - NUT_INFO(__nut_FOREGION_KEY, name, type) \ + NUT_INFO(__nut_FOREIGN_KEY, name, type) \ Nut::Row m_##name; \ public: \ Nut::Row read() const { return m_##name ; } \ diff --git a/src/defines_p.h b/src/defines_p.h index b37f715..da3c417 100644 --- a/src/defines_p.h +++ b/src/defines_p.h @@ -41,7 +41,7 @@ #define __nut_DEFAULT_VALUE "def" #define __nut_NOT_NULL "notnull" -#define __nut_FOREGION_KEY "foregion_key" +#define __nut_FOREIGN_KEY "foreign_key" #define __nut_NEW "new" #define __nut_REMOVE "remove" #define __nut_CHANGE "change" diff --git a/src/generators/sqlgeneratorbase.cpp b/src/generators/sqlgeneratorbase.cpp index 0f9590d..38300a3 100644 --- a/src/generators/sqlgeneratorbase.cpp +++ b/src/generators/sqlgeneratorbase.cpp @@ -223,7 +223,7 @@ QStringList SqlGeneratorBase::diff(TableModel *oldTable, TableModel *newTable) foreach (FieldModel *f, oldTable->fields()) if (!fieldNames.contains(f->name)) fieldNames.append(f->name); - foreach (RelationModel *r, oldTable->foregionKeys()) + foreach (RelationModel *r, oldTable->foreignKeys()) if (!relations.contains(r->localColumn)) relations.append(r->localColumn); } @@ -231,7 +231,7 @@ QStringList SqlGeneratorBase::diff(TableModel *oldTable, TableModel *newTable) foreach (FieldModel *f, newTable->fields()) if (!fieldNames.contains(f->name)) fieldNames.append(f->name); - foreach (RelationModel *r, newTable->foregionKeys()) + foreach (RelationModel *r, newTable->foreignKeys()) if (!relations.contains(r->localColumn)) relations.append(r->localColumn); @@ -291,20 +291,20 @@ QStringList SqlGeneratorBase::diffRelation(TableModel *oldTable, TableModel *new QList relations; if (oldTable) - foreach (RelationModel *r, oldTable->foregionKeys()) + foreach (RelationModel *r, oldTable->foreignKeys()) if (!relations.contains(r->localColumn)) relations.append(r->localColumn); - foreach (RelationModel *r, newTable->foregionKeys()) + foreach (RelationModel *r, newTable->foreignKeys()) if (!relations.contains(r->localColumn)) relations.append(r->localColumn); QStringList columnSql; foreach (QString fieldName, relations) { - RelationModel *newRelation = newTable->foregionKeyByField(fieldName); + RelationModel *newRelation = newTable->foreignKeyByField(fieldName); RelationModel *oldRelation = nullptr; if (oldTable) - oldRelation = oldTable->foregionKeyByField(fieldName); + oldRelation = oldTable->foreignKeyByField(fieldName); QStringList buffer = diff(oldRelation, newRelation); if (!buffer.isEmpty()) diff --git a/src/generators/sqlitegenerator.cpp b/src/generators/sqlitegenerator.cpp index e97687b..e45168f 100644 --- a/src/generators/sqlitegenerator.cpp +++ b/src/generators/sqlitegenerator.cpp @@ -135,14 +135,14 @@ QStringList SqliteGenerator::diff(TableModel *oldTable, TableModel *newTable) foreach (FieldModel *f, oldTable->fields()) if (!fieldNames.contains(f->name)) fieldNames.append(f->name); - foreach (RelationModel *r, oldTable->foregionKeys()) + foreach (RelationModel *r, oldTable->foreignKeys()) if (!relations.contains(r->localColumn)) relations.append(r->localColumn); foreach (FieldModel *f, newTable->fields()) if (!fieldNames.contains(f->name)) fieldNames.append(f->name); - foreach (RelationModel *r, newTable->foregionKeys()) + foreach (RelationModel *r, newTable->foreignKeys()) if (!relations.contains(r->localColumn)) relations.append(r->localColumn); diff --git a/src/table.cpp b/src/table.cpp index 6bcc750..f987e7a 100644 --- a/src/table.cpp +++ b/src/table.cpp @@ -131,7 +131,7 @@ bool Table::setParentTable(Table *master, TableModel *masterModel, TableModel *m // if (!d->model) // d->model = TableModel::findByClassName(metaObject()->className()); - foreach (RelationModel *r, model->foregionKeys()) + foreach (RelationModel *r, model->foreignKeys()) if(r->masterClassName == masterClassName) { setProperty(QString(r->localColumn).toLatin1().data(), diff --git a/src/tablemodel.cpp b/src/tablemodel.cpp index 22ddfeb..96dd138 100644 --- a/src/tablemodel.cpp +++ b/src/tablemodel.cpp @@ -88,7 +88,7 @@ QList TableModel::fields() const return _fields; } -QList TableModel::foregionKeys() const +QList TableModel::foreignKeys() const { return _foreignKeys; } @@ -184,7 +184,7 @@ TableModel::TableModel(int typeId, const QString &tableName) continue; } - if(type == __nut_FOREGION_KEY){ + if(type == __nut_FOREIGN_KEY){ auto *fk = new RelationModel; fk->slaveTable = this; fk->localColumn = name + "Id"; @@ -322,7 +322,7 @@ QJsonObject TableModel::toJson() const return obj; } -RelationModel *TableModel::foregionKey(const QString &otherTable) const +RelationModel *TableModel::foreignKey(const QString &otherTable) const { foreach (RelationModel *fk, _foreignKeys) if(fk->masterClassName == otherTable) @@ -331,7 +331,7 @@ RelationModel *TableModel::foregionKey(const QString &otherTable) const return nullptr; } -RelationModel *TableModel::foregionKeyByField(const QString &fieldName) const +RelationModel *TableModel::foreignKeyByField(const QString &fieldName) const { foreach (RelationModel *fk, _foreignKeys) if(fk->localColumn == fieldName) diff --git a/src/tablemodel.h b/src/tablemodel.h index 6b43071..9f90685 100644 --- a/src/tablemodel.h +++ b/src/tablemodel.h @@ -102,8 +102,8 @@ public: FieldModel *field(int n) const; FieldModel *field(const QString &name) const; - RelationModel *foregionKey(const QString &otherTable) const; - RelationModel *foregionKeyByField(const QString &fieldName) const; + RelationModel *foreignKey(const QString &otherTable) const; + RelationModel *foreignKeyByField(const QString &fieldName) const; QString toString() const; @@ -119,7 +119,7 @@ public: int typeId() const; void setTypeId(const int &typeId); QList fields() const; - QList foregionKeys() const; + QList foreignKeys() const; QStringList fieldsNames() const; bool operator ==(const TableModel &t) const;