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

Merge pull request #45 from HamedMasafi/dev 

#36 misspelling of "foreign" [skip ci]
This commit is contained in:
Hamed Masafi 2019-06-19 14:10:54 +04:30 committed by GitHub
parent cc6ed112b6 136c393f6e
commit aeeab4c3cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/database.cpp
View File

@ -268,7 +268,7 @@ bool DatabasePrivate::getCurrectScheema()
qPrintable(f->typeName)); qPrintable(f->typeName));
} }
foreach (RelationModel *fk, table->foregionKeys()) foreach (RelationModel *fk, table->foreignKeys())
fk->masterTable = currentModel.tableByClassName(fk->masterClassName); fk->masterTable = currentModel.tableByClassName(fk->masterClassName);
} }

6
src/databasemodel.cpp
View File

@ -146,7 +146,7 @@ RelationModel *DatabaseModel::relationByClassNames(const QString &masterClassNam
if(!childTable) if(!childTable)
return nullptr; return nullptr;
foreach (RelationModel *rel, childTable->foregionKeys()) foreach (RelationModel *rel, childTable->foreignKeys())
if(rel->masterClassName == masterClassName) if(rel->masterClassName == masterClassName)
return rel; return rel;
@ -160,7 +160,7 @@ RelationModel *DatabaseModel::relationByTableNames(const QString &masterTableNam
if(!childTable) if(!childTable)
return nullptr; return nullptr;
foreach (RelationModel *rel, childTable->foregionKeys()) foreach (RelationModel *rel, childTable->foreignKeys())
if(rel->masterTable->name() == masterTableName) if(rel->masterTable->name() == masterTableName)
return rel; return rel;
@ -210,7 +210,7 @@ void DatabaseModel::fixRelations()
{ {
/*TODO: fixme /*TODO: fixme
foreach (TableModel *table, currentModel) foreach (TableModel *table, currentModel)
foreach (RelationModel *fk, table->foregionKeys()) foreach (RelationModel *fk, table->foreignKeys())
fk->masterTable = currentModel.tableByClassName(fk->masterClassName); fk->masterTable = currentModel.tableByClassName(fk->masterClassName);
*/ */
} }

4
src/defines.h
View File

@ -82,10 +82,10 @@ public: \
propertyChanged(#name); \ propertyChanged(#name); \
} }
#define NUT_FOREGION_KEY(type, keytype, name, read, write) \ #define NUT_FOREIGN_KEY(type, keytype, name, read, write) \
Q_PROPERTY(Nut::Row<type> name READ read WRITE write) \ Q_PROPERTY(Nut::Row<type> name READ read WRITE write) \
NUT_DECLARE_FIELD(keytype, name##Id, read##Id, write##Id) \ 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<type> m_##name; \ Nut::Row<type> m_##name; \
public: \ public: \
Nut::Row<type> read() const { return m_##name ; } \ Nut::Row<type> read() const { return m_##name ; } \

2
src/defines_p.h
View File

@ -41,7 +41,7 @@
#define __nut_DEFAULT_VALUE "def" #define __nut_DEFAULT_VALUE "def"
#define __nut_NOT_NULL "notnull" #define __nut_NOT_NULL "notnull"
#define __nut_FOREGION_KEY "foregion_key" #define __nut_FOREIGN_KEY "foreign_key"
#define __nut_NEW "new" #define __nut_NEW "new"
#define __nut_REMOVE "remove" #define __nut_REMOVE "remove"
#define __nut_CHANGE "change" #define __nut_CHANGE "change"

12
src/generators/sqlgeneratorbase.cpp
View File

@ -223,7 +223,7 @@ QStringList SqlGeneratorBase::diff(TableModel *oldTable, TableModel *newTable)
foreach (FieldModel *f, oldTable->fields()) foreach (FieldModel *f, oldTable->fields())
if (!fieldNames.contains(f->name)) if (!fieldNames.contains(f->name))
fieldNames.append(f->name); fieldNames.append(f->name);
foreach (RelationModel *r, oldTable->foregionKeys()) foreach (RelationModel *r, oldTable->foreignKeys())
if (!relations.contains(r->localColumn)) if (!relations.contains(r->localColumn))
relations.append(r->localColumn); relations.append(r->localColumn);
} }
@ -231,7 +231,7 @@ QStringList SqlGeneratorBase::diff(TableModel *oldTable, TableModel *newTable)
foreach (FieldModel *f, newTable->fields()) foreach (FieldModel *f, newTable->fields())
if (!fieldNames.contains(f->name)) if (!fieldNames.contains(f->name))
fieldNames.append(f->name); fieldNames.append(f->name);
foreach (RelationModel *r, newTable->foregionKeys()) foreach (RelationModel *r, newTable->foreignKeys())
if (!relations.contains(r->localColumn)) if (!relations.contains(r->localColumn))
relations.append(r->localColumn); relations.append(r->localColumn);
@ -291,20 +291,20 @@ QStringList SqlGeneratorBase::diffRelation(TableModel *oldTable, TableModel *new
QList<QString> relations; QList<QString> relations;
if (oldTable) if (oldTable)
foreach (RelationModel *r, oldTable->foregionKeys()) foreach (RelationModel *r, oldTable->foreignKeys())
if (!relations.contains(r->localColumn)) if (!relations.contains(r->localColumn))
relations.append(r->localColumn); relations.append(r->localColumn);
foreach (RelationModel *r, newTable->foregionKeys()) foreach (RelationModel *r, newTable->foreignKeys())
if (!relations.contains(r->localColumn)) if (!relations.contains(r->localColumn))
relations.append(r->localColumn); relations.append(r->localColumn);
QStringList columnSql; QStringList columnSql;
foreach (QString fieldName, relations) { foreach (QString fieldName, relations) {
RelationModel *newRelation = newTable->foregionKeyByField(fieldName); RelationModel *newRelation = newTable->foreignKeyByField(fieldName);
RelationModel *oldRelation = nullptr; RelationModel *oldRelation = nullptr;
if (oldTable) if (oldTable)
oldRelation = oldTable->foregionKeyByField(fieldName); oldRelation = oldTable->foreignKeyByField(fieldName);
QStringList buffer = diff(oldRelation, newRelation); QStringList buffer = diff(oldRelation, newRelation);
if (!buffer.isEmpty()) if (!buffer.isEmpty())

4
src/generators/sqlitegenerator.cpp
View File

@ -135,14 +135,14 @@ QStringList SqliteGenerator::diff(TableModel *oldTable, TableModel *newTable)
foreach (FieldModel *f, oldTable->fields()) foreach (FieldModel *f, oldTable->fields())
if (!fieldNames.contains(f->name)) if (!fieldNames.contains(f->name))
fieldNames.append(f->name); fieldNames.append(f->name);
foreach (RelationModel *r, oldTable->foregionKeys()) foreach (RelationModel *r, oldTable->foreignKeys())
if (!relations.contains(r->localColumn)) if (!relations.contains(r->localColumn))
relations.append(r->localColumn); relations.append(r->localColumn);
foreach (FieldModel *f, newTable->fields()) foreach (FieldModel *f, newTable->fields())
if (!fieldNames.contains(f->name)) if (!fieldNames.contains(f->name))
fieldNames.append(f->name); fieldNames.append(f->name);
foreach (RelationModel *r, newTable->foregionKeys()) foreach (RelationModel *r, newTable->foreignKeys())
if (!relations.contains(r->localColumn)) if (!relations.contains(r->localColumn))
relations.append(r->localColumn); relations.append(r->localColumn);

2
src/table.cpp
View File

@ -131,7 +131,7 @@ bool Table::setParentTable(Table *master, TableModel *masterModel, TableModel *m
// if (!d->model) // if (!d->model)
// d->model = TableModel::findByClassName(metaObject()->className()); // d->model = TableModel::findByClassName(metaObject()->className());
foreach (RelationModel *r, model->foregionKeys()) foreach (RelationModel *r, model->foreignKeys())
if(r->masterClassName == masterClassName) if(r->masterClassName == masterClassName)
{ {
setProperty(QString(r->localColumn).toLatin1().data(), setProperty(QString(r->localColumn).toLatin1().data(),

8
src/tablemodel.cpp
View File

@ -88,7 +88,7 @@ QList<FieldModel *> TableModel::fields() const
return _fields; return _fields;
} }
QList<RelationModel *> TableModel::foregionKeys() const QList<RelationModel *> TableModel::foreignKeys() const
{ {
return _foreignKeys; return _foreignKeys;
} }
@ -184,7 +184,7 @@ TableModel::TableModel(int typeId, const QString &tableName)
continue; continue;
} }
if(type == __nut_FOREGION_KEY){ if(type == __nut_FOREIGN_KEY){
auto *fk = new RelationModel; auto *fk = new RelationModel;
fk->slaveTable = this; fk->slaveTable = this;
fk->localColumn = name + "Id"; fk->localColumn = name + "Id";
@ -322,7 +322,7 @@ QJsonObject TableModel::toJson() const
return obj; return obj;
} }
RelationModel *TableModel::foregionKey(const QString &otherTable) const RelationModel *TableModel::foreignKey(const QString &otherTable) const
{ {
foreach (RelationModel *fk, _foreignKeys) foreach (RelationModel *fk, _foreignKeys)
if(fk->masterClassName == otherTable) if(fk->masterClassName == otherTable)
@ -331,7 +331,7 @@ RelationModel *TableModel::foregionKey(const QString &otherTable) const
return nullptr; return nullptr;
} }
RelationModel *TableModel::foregionKeyByField(const QString &fieldName) const RelationModel *TableModel::foreignKeyByField(const QString &fieldName) const
{ {
foreach (RelationModel *fk, _foreignKeys) foreach (RelationModel *fk, _foreignKeys)
if(fk->localColumn == fieldName) if(fk->localColumn == fieldName)

6
src/tablemodel.h
View File

@ -102,8 +102,8 @@ public:
FieldModel *field(int n) const; FieldModel *field(int n) const;
FieldModel *field(const QString &name) const; FieldModel *field(const QString &name) const;
RelationModel *foregionKey(const QString &otherTable) const; RelationModel *foreignKey(const QString &otherTable) const;
RelationModel *foregionKeyByField(const QString &fieldName) const; RelationModel *foreignKeyByField(const QString &fieldName) const;
QString toString() const; QString toString() const;
@ -119,7 +119,7 @@ public:
int typeId() const; int typeId() const;
void setTypeId(const int &typeId); void setTypeId(const int &typeId);
QList<FieldModel *> fields() const; QList<FieldModel *> fields() const;
QList<RelationModel *> foregionKeys() const; QList<RelationModel *> foreignKeys() const;
QStringList fieldsNames() const; QStringList fieldsNames() const;
bool operator ==(const TableModel &t) const; bool operator ==(const TableModel &t) const;