commit 274b34e43dfa8854fe060de5820a3214912b5ff6 Author: Christian Ehringfeld Date: Sun Aug 9 00:54:59 2015 +0200 constness diff --git a/samples/example/main.cpp b/samples/example/main.cpp index 565caa1..5618b8d 100644 --- a/samples/example/main.cpp +++ b/samples/example/main.cpp @@ -97,12 +97,16 @@ int main(int argc, char *argv[]) { qWarning() << "-----------------------------"; Query q = Query(); - q.appendWhere(e->getQueryBuilder()->like(QString("firstname"), QString("Tim"))); - q.appendJoin(Join("person", "pupil.id = person.id")); + q.appendWhere(e->getQueryBuilder()->like(QString("firstname"), QString("Tim"), + JokerPosition::BEHIND)); + q.appendWhere(e->getQueryBuilder()->andOperator()); + q.appendWhere(e->getQueryBuilder()->arbitraryOperator("<", "birthday", + QDate(2000, 10, 10))); + //q.appendJoin(Join("person", "pupil.id = person.id")); q.setDistinct(true); q.appendOrderBy(OrderBy(QString("birthday"), Direction::SORT_DESC)); q.setLimit(10); - QList> list = e->find(q); + QList> list = e->find(q, true); for (int i = 0; i < list.size(); ++i) { qWarning() << list.at(i)->toString(); } diff --git a/src/querybuilder.cpp b/src/querybuilder.cpp index 9e44a05..4993728 100644 --- a/src/querybuilder.cpp +++ b/src/querybuilder.cpp @@ -819,7 +819,7 @@ QString QueryBuilder::countKeyword() const { } Expression QueryBuilder::inFunction(QString column, - QList values, bool notOp) { + QList values, bool notOp) const { QString condition = ""; Expression exp = Expression(); if (!values.isEmpty()) { @@ -844,7 +844,7 @@ Expression QueryBuilder::inFunction(QString column, } QString QueryBuilder::between(QString colName, QString valName1, - QString valName2, bool notOp) { + QString valName2, bool notOp) const { return "(" + this->schema->quoteColumnName(colName) + (notOp ? (" " + this->notKeyword() + " ") : " ") + this->between() + " " + this->placeHolder(valName1) + " " + this->andKeyword() + " " + @@ -863,7 +863,7 @@ QString QueryBuilder::offsetKeyword() const { return "OFFSET"; } -QString QueryBuilder::appendNot(bool notOp) { +QString QueryBuilder::appendNot(bool notOp) const { return (notOp ? (this->notKeyword() + " ") : ""); } @@ -1144,7 +1144,8 @@ void QueryBuilder::ClassAttributes::setPk(const QString &value) { pk = value; } -Expression QueryBuilder::andOperator(QHash conditions) { +Expression QueryBuilder::andOperator(QHash conditions) +const { bool first = true; Expression exp = Expression(); QString condition = ""; @@ -1162,8 +1163,16 @@ Expression QueryBuilder::andOperator(QHash conditions) { return exp; } +Expression QueryBuilder::andOperator() const { + return this->plainAnd(); +} + +Expression QueryBuilder::nandOperator() const { + return this->plainNand(); +} + Expression QueryBuilder::arbitraryOperator(QString op, QString column, - QVariant value) { + QVariant value) const { Expression exp = Expression(this->schema->quoteColumnName( column) + " " + op + " " + this->placeHolder(column)); @@ -1171,28 +1180,28 @@ Expression QueryBuilder::arbitraryOperator(QString op, QString column, return exp; } -Expression QueryBuilder::isNull(QString column) { +Expression QueryBuilder::isNull(QString column) const { return Expression(this->schema->quoteColumnName(column) + " IS NULL"); } -Expression QueryBuilder::isNotNull(QString column) { +Expression QueryBuilder::isNotNull(QString column) const { return Expression(this->schema->quoteColumnName(column) + " IS " + this->notKeyword() + " NULL"); } -Expression QueryBuilder::plainOr() { +Expression QueryBuilder::plainOr() const { return Expression(this->orKeyword()); } -Expression QueryBuilder::plainNor() { +Expression QueryBuilder::plainNor() const { return Expression(this->notKeyword() + " " + this->orKeyword()); } -Expression QueryBuilder::plainAnd() { +Expression QueryBuilder::plainAnd() const { return Expression(this->andKeyword()); } -Expression QueryBuilder::plainNand() { +Expression QueryBuilder::plainNand() const { return Expression(this->notKeyword() + " " + this->andKeyword()); } @@ -1279,7 +1288,7 @@ const { } Expression QueryBuilder::where(QHash conditions, - QString conjunction) { + QString conjunction) const { Expression exp = Expression(this->where(conditions, conjunction, false, "id", false)); for (auto i = conditions.constBegin(); i != conditions.constEnd(); ++i) { @@ -1289,7 +1298,7 @@ Expression QueryBuilder::where(QHash conditions, } Expression QueryBuilder::where(QString condition, - QHash values) { + QHash values) const { Expression exp = Expression(condition); for (auto i = values.constBegin(); i != values.constEnd(); ++i) { exp.appendParam(i.key(), i.value()); @@ -1298,7 +1307,7 @@ Expression QueryBuilder::where(QString condition, } Expression QueryBuilder::between(QString column, QVariant firstValue, - QVariant secondValue) { + QVariant secondValue) const { QString firstPh = column + "_bet1"; QString secondPh = column + "_bet2"; return this->appendCondition(firstPh, secondPh, firstValue, secondValue, @@ -1306,7 +1315,7 @@ Expression QueryBuilder::between(QString column, QVariant firstValue, } Expression QueryBuilder::notBetween(QString column, QVariant firstValue, - QVariant secondValue) { + QVariant secondValue) const { QString firstPh = column + "_nbet1"; QString secondPh = column + "_nbet2"; return this->appendCondition(firstPh, secondPh, firstValue, secondValue, @@ -1315,23 +1324,30 @@ Expression QueryBuilder::notBetween(QString column, QVariant firstValue, Expression QueryBuilder::appendCondition(QString ph1, QString ph2, - QVariant val1, QVariant val2, QString condition) { + QVariant val1, QVariant val2, QString condition) const { Expression exp = Expression(condition); exp.appendParam(ph1, val1); exp.appendParam(ph2, val2); return exp; } -Expression QueryBuilder::in(QString column, QList values) { +Expression QueryBuilder::in(QString column, QList values) const { return this->inFunction(column, values); } -Expression QueryBuilder::notIn(QString column, QList values) { +Expression QueryBuilder::notIn(QString column, QList values) const { return this->inFunction(column, values, true); } +Expression QueryBuilder::notOperator(QString op, QString column, + QVariant value) const { + Expression e = this->arbitraryOperator(op, column, value); + e.setExpression(this->notKeyword() + " " + e.getExpression()); + return e; +} + Expression QueryBuilder::orOperator( - QHash conditions, bool like) { + QHash conditions, bool like) const { Expression exp = Expression(); if (!conditions.isEmpty()) { QString condition = "("; @@ -1353,6 +1369,14 @@ Expression QueryBuilder::orOperator( return exp; } +Expression QueryBuilder::orOperator() const { + return this->plainOr(); +} + +Expression QueryBuilder::norOperator() const { + return this->plainNor(); +} + QString QueryBuilder::where(const QSharedPointer &entity, QString conjunction, bool ignoreID) const { diff --git a/src/querybuilder.h b/src/querybuilder.h index 0ea23b5..bd4c135 100644 --- a/src/querybuilder.h +++ b/src/querybuilder.h @@ -105,7 +105,9 @@ class QueryBuilder { bool ignoreID = false, const QString &primaryKey = QStringLiteral("id")) const; void bindValue(const QString &key, const QVariant &value, QSqlQuery &q) const; Expression where(QString column, QVariant value); - Join joinClasses(const QSharedPointer &mainEntity, const QSharedPointer &foreignEntity, const QString &joinType=QStringLiteral("LEFT JOIN"))const; + Join joinClasses(const QSharedPointer &mainEntity, + const QSharedPointer &foreignEntity, + const QString &joinType = QStringLiteral("LEFT JOIN"))const; QList joinBaseClasses(const QSharedPointer &entity); /** * @brief where @@ -114,20 +116,25 @@ class QueryBuilder { * @param conjunction its AND or OR */ Expression where(QHash conditions, - QString conjunction = QStringLiteral("AND")); + QString conjunction = QStringLiteral("AND")) const; Expression where(QString condition, - QHash values = QHash()); + QHash values = QHash()) const; //void where(Query &query,QHash> conditions, QString concat="AND"); Expression between(QString column, QVariant firstValue, - QVariant secondValue); + QVariant secondValue) const; Expression notBetween(QString column, QVariant firstValue, - QVariant secondValue); - Expression in(QString column, QList values); - Expression notIn(QString column, QList values); - Expression notOperator(QString column, QVariant value); + QVariant secondValue) const; + Expression in(QString column, QList values) const; + Expression notIn(QString column, QList values) const; + Expression notOperator(QString op, QString column, + QVariant value) const; Expression orOperator(QHash conditions, - bool like = false); - Expression andOperator(QHash conditions); + bool like = false) const; + Expression orOperator() const; + Expression norOperator() const; + Expression andOperator(QHash conditions) const; + Expression andOperator() const; + Expression nandOperator() const; /** * @brief arbitraryOperator * @param query @@ -136,14 +143,14 @@ class QueryBuilder { * @param value */ Expression arbitraryOperator(QString op, QString column, - QVariant value); - Expression isNull(QString column); - Expression isNotNull(QString column); + QVariant value) const; + Expression isNull(QString column) const; + Expression isNotNull(QString column) const; - Expression plainOr(); //adds a simple OR to condition - Expression plainNor(); - Expression plainAnd(); //add a simple AND to condition - Expression plainNand(); + Expression plainOr() const; //adds a simple OR to condition + Expression plainNor() const; + Expression plainAnd() const; //add a simple AND to condition + Expression plainNand() const; /** * Generates 'foo' LIKE "%bar%" * @brief like @@ -254,7 +261,7 @@ class QueryBuilder { QString where(const QSharedPointer &entity, QString conjunction = ",", bool ignoreID = false) const; QString where(const QHash &m, - const QString &conjunction = ",", + const QString &conjunction, bool ignoreID = false, const QString &primaryKey = "id", bool withKeyword = true) const; QString attributes(const QHash &m, @@ -272,7 +279,8 @@ class QueryBuilder { const QSharedPointer &entity) const; QString leftJoin(const QString &foreignTable, const QString &tableName, - const QString &foreignKey = "id", const QString &primaryKey = "id", bool onlyCondition=false) const; + const QString &foreignKey = "id", const QString &primaryKey = "id", + bool onlyCondition = false) const; QString superClassColumnName(const QMetaObject *&superMeta) const; QString addWildcard(QVariant var, JokerPosition jp, QChar jokerChar = '%') const; @@ -290,15 +298,15 @@ class QueryBuilder { virtual QString whereKeyword() const; virtual QString countKeyword() const; virtual Expression inFunction(QString column, QList values, - bool notOp = false); + bool notOp = false) const; virtual QString between(QString colName, QString valName1, QString valName2, - bool notOp = false); + bool notOp = false) const; virtual QString likeKeyword() const; virtual QString limitKeyword() const; virtual QString offsetKeyword() const; - QString appendNot(bool notOp); + QString appendNot(bool notOp) const; virtual Expression appendCondition(QString ph1, QString ph2, QVariant val1, - QVariant val2, QString condition); + QVariant val2, QString condition) const; QString entityClassname() const; QString separator; QSharedPointer schema;