some tidy
This commit is contained in:
parent
232eb12355
commit
c5c9551e74
|
|
@ -806,6 +806,9 @@ QString SqlGeneratorBase::dateTimePartName(const PhraseData::Condition &op) cons
|
|||
case PhraseData::AddSeconds:
|
||||
case PhraseData::AddSecondsDateTime:
|
||||
return "SECOND";
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return QString();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -252,6 +252,8 @@ QString SqliteGenerator::createConditionalPhrase(const PhraseData *d) const
|
|||
dateTimePartName(op));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (d->type == PhraseData::WithoutOperand) {
|
||||
|
|
@ -283,6 +285,8 @@ QString SqliteGenerator::createConditionalPhrase(const PhraseData *d) const
|
|||
// case PhraseData::DatePartMilisecond:
|
||||
// return QString("CAST(strftime('%Y', %1) AS INT)")
|
||||
// .arg(createConditionalPhrase(d->left));
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ NUT_BEGIN_NAMESPACE
|
|||
*/
|
||||
|
||||
Table::Table(QObject *parent) : QObject(parent),
|
||||
d(new TablePrivate(this))
|
||||
d(new TablePrivate)
|
||||
{ }
|
||||
|
||||
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)
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class TablePrivate : public QSharedData {
|
|||
Q_DECLARE_PUBLIC(Table)
|
||||
|
||||
public:
|
||||
TablePrivate(Table *parent);
|
||||
TablePrivate();
|
||||
|
||||
|
||||
TableModel *model;
|
||||
|
|
|
|||
|
|
@ -30,12 +30,6 @@
|
|||
|
||||
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
|
||||
{
|
||||
return _name;
|
||||
|
|
@ -269,14 +263,6 @@ TableModel::TableModel(const QJsonObject &json, const QString &tableName) : _typ
|
|||
QJsonObject relObject = fields.value(key).toObject();
|
||||
_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()
|
||||
|
|
|
|||
|
|
@ -129,9 +129,6 @@ private:
|
|||
int _typeId;
|
||||
QList<FieldModel*> _fields;
|
||||
QList<RelationModel*> _foreignKeys;
|
||||
|
||||
Q_DECL_DEPRECATED
|
||||
static QSet<TableModel*>_allModels;
|
||||
};
|
||||
|
||||
NUT_END_NAMESPACE
|
||||
|
|
|
|||
Loading…
Reference in New Issue