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

some tidy

This commit is contained in:
Hamed Masafi 2019-07-21 19:58:20 +04:30
parent 232eb12355
commit c5c9551e74
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/generators/sqlgeneratorbase.cpp
View File

@ -806,6 +806,9 @@ QString SqlGeneratorBase::dateTimePartName(const PhraseData::Condition &op) cons
case PhraseData::AddSeconds: case PhraseData::AddSeconds:
case PhraseData::AddSecondsDateTime: case PhraseData::AddSecondsDateTime:
return "SECOND"; return "SECOND";
default:
break;
} }
return QString(); return QString();
} }

4
src/generators/sqlitegenerator.cpp
View File

@ -252,6 +252,8 @@ QString SqliteGenerator::createConditionalPhrase(const PhraseData *d) const
dateTimePartName(op)); dateTimePartName(op));
break; break;
} }
default:
break;
} }
} }
if (d->type == PhraseData::WithoutOperand) { if (d->type == PhraseData::WithoutOperand) {
@ -283,6 +285,8 @@ QString SqliteGenerator::createConditionalPhrase(const PhraseData *d) const
// case PhraseData::DatePartMilisecond: // case PhraseData::DatePartMilisecond:
// return QString("CAST(strftime('%Y', %1) AS INT)") // return QString("CAST(strftime('%Y', %1) AS INT)")
// .arg(createConditionalPhrase(d->left)); // .arg(createConditionalPhrase(d->left));
default:
break;
} }
} }

4
src/table.cpp
View File

@ -44,7 +44,7 @@ NUT_BEGIN_NAMESPACE
*/ */
Table::Table(QObject *parent) : QObject(parent), Table::Table(QObject *parent) : QObject(parent),
d(new TablePrivate(this)) d(new TablePrivate)
{ } { }
Table::~Table() Table::~Table()
@ -200,7 +200,7 @@ void Table::setStatus(const Status &status)
TablePrivate::TablePrivate(Table *parent) : QSharedData(), TablePrivate::TablePrivate() : QSharedData(),
model(nullptr), status(Table::NewCreated), parentTableSet(nullptr) model(nullptr), status(Table::NewCreated), parentTableSet(nullptr)
{ {

2
src/table_p.h
View File

@ -16,7 +16,7 @@ class TablePrivate : public QSharedData {
Q_DECLARE_PUBLIC(Table) Q_DECLARE_PUBLIC(Table)
public: public:
TablePrivate(Table *parent); TablePrivate();
TableModel *model; TableModel *model;

14
src/tablemodel.cpp
View File

@ -30,12 +30,6 @@
NUT_BEGIN_NAMESPACE NUT_BEGIN_NAMESPACE
/*
* TODO: It may be good idea if we replace this QSet with two QHash!
* one for className search and another for typeId.
*/
QSet<TableModel*> TableModel::_allModels;
QString TableModel::name() const QString TableModel::name() const
{ {
return _name; return _name;
@ -269,14 +263,6 @@ TableModel::TableModel(const QJsonObject &json, const QString &tableName) : _typ
QJsonObject relObject = fields.value(key).toObject(); QJsonObject relObject = fields.value(key).toObject();
_foreignKeys.append(new RelationModel(relObject)); _foreignKeys.append(new RelationModel(relObject));
} }
// if(json.keys().contains(__nut_AUTO_INCREMENT))
// field(json.value(__nut_AUTO_INCREMENT).toString())->isAutoIncrement = true;
// if(json.keys().contains(__nut_PRIMARY_KEY))
// field(json.value(__nut_PRIMARY_KEY).toString())->isAutoIncrement = true;
_allModels.insert(this);
} }
TableModel::~TableModel() TableModel::~TableModel()

3
src/tablemodel.h
View File

@ -129,9 +129,6 @@ private:
int _typeId; int _typeId;
QList<FieldModel*> _fields; QList<FieldModel*> _fields;
QList<RelationModel*> _foreignKeys; QList<RelationModel*> _foreignKeys;
Q_DECL_DEPRECATED
static QSet<TableModel*>_allModels;
}; };
NUT_END_NAMESPACE NUT_END_NAMESPACE