This commit is contained in:
blackdal 2017-07-26 20:31:35 +04:30
parent eae5d8c185
commit 7860f7a0d5
2 changed files with 237 additions and 134 deletions

View File

@ -200,4 +200,34 @@ WherePhrase WherePhrase::operator&(const WherePhrase &other)
return WherePhrase(this, PhraseData::Append, (WherePhrase *)&other);
}
WherePhrase WherePhrase::operator==(const QVariant &other)
{
return WherePhrase(this, PhraseData::Equal, other);
}
WherePhrase WherePhrase::operator!=(const QVariant &other)
{
return WherePhrase(this, PhraseData::NotEqual, other);
}
WherePhrase WherePhrase::operator<(const QVariant &other)
{
return WherePhrase(this, PhraseData::Less, other);
}
WherePhrase WherePhrase::operator>(const QVariant &other)
{
return WherePhrase(this, PhraseData::Greater, other);
}
WherePhrase WherePhrase::operator<=(const QVariant &other)
{
return WherePhrase(this, PhraseData::LessEqual, other);
}
WherePhrase WherePhrase::operator>=(const QVariant &other)
{
return WherePhrase(this, PhraseData::GreaterEqual, other);
}
NUT_END_NAMESPACE

View File

@ -32,13 +32,15 @@
#include "defines.h"
#include "dbgeography.h"
#include <initializer_list>
NUT_BEGIN_NAMESPACE
class SqlGeneratorBase;
class PhraseData{
public:
enum Condition
class PhraseData
{
public:
enum Condition {
NotAssign = 0,
Equal,
Less,
@ -58,7 +60,6 @@ public:
And = 20,
Or,
Append,
Set,
@ -71,12 +72,7 @@ public:
Distance
};
enum Type{
Field,
WithVariant,
WithOther,
WithoutOperand
};
enum Type { Field, WithVariant, WithOther, WithoutOperand };
Type type;
Condition operatorCond;
@ -94,7 +90,8 @@ public:
~PhraseData();
};
class WherePhrase{
class WherePhrase
{
protected:
PhraseData *_data;
QSharedPointer<PhraseData> _dataPointer;
@ -117,6 +114,13 @@ public:
WherePhrase operator<=(const WherePhrase &other);
WherePhrase operator>=(const WherePhrase &other);
WherePhrase operator==(const QVariant &other);
WherePhrase operator!=(const QVariant &other);
WherePhrase operator<(const QVariant &other);
WherePhrase operator>(const QVariant &other);
WherePhrase operator<=(const QVariant &other);
WherePhrase operator>=(const QVariant &other);
WherePhrase operator!();
WherePhrase operator=(const WherePhrase &other);
@ -134,7 +138,8 @@ public:
};
template <typename T>
class FieldPhrase: public WherePhrase{
class FieldPhrase : public WherePhrase
{
public:
FieldPhrase(const char *className, const char *s);
@ -156,27 +161,32 @@ public:
WherePhrase like(QString pattern);
};
template <typename T>
Q_OUTOFLINE_TEMPLATE FieldPhrase<T>::FieldPhrase(const char *className, const char *s) : WherePhrase(className, s)
Q_OUTOFLINE_TEMPLATE FieldPhrase<T>::FieldPhrase(const char *className,
const char *s)
: WherePhrase(className, s)
{
// qDebug() << "(" << this << ")" << "FieldPhrase ctor" << className << s;
// qDebug() << "(" << this << ")" << "FieldPhrase ctor" << className <<
// s;
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator =(const QVariant &other)
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::
operator=(const QVariant &other)
{
return WherePhrase(this, PhraseData::Set, other);
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator =(const WherePhrase &other)
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::
operator=(const WherePhrase &other)
{
return WherePhrase(this, PhraseData::Set, &other);
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator+(const QVariant &other)
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::
operator+(const QVariant &other)
{
return WherePhrase(this, PhraseData::Add, other);
}
@ -185,7 +195,8 @@ template<typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator!()
{
if (_data->operatorCond < 20)
_data->operatorCond = (PhraseData::Condition)((_data->operatorCond + 10) % 20);
_data->operatorCond
= (PhraseData::Condition)((_data->operatorCond + 10) % 20);
else
qFatal("Operator ! can not aplied to non condition statements");
@ -193,43 +204,50 @@ Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator !()
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator==(const QVariant &other)
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::
operator==(const QVariant &other)
{
return WherePhrase(this, PhraseData::Equal, other);
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator!=(const QVariant &other)
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::
operator!=(const QVariant &other)
{
return WherePhrase(this, PhraseData::NotEqual, other);
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator<(const QVariant &other)
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::
operator<(const QVariant &other)
{
return WherePhrase(this, PhraseData::Less, other);
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator>(const QVariant &other)
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::
operator>(const QVariant &other)
{
return WherePhrase(this, PhraseData::Greater, other);
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator<=(const QVariant &other)
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::
operator<=(const QVariant &other)
{
return WherePhrase(this, PhraseData::LessEqual, other);
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::operator>=(const QVariant &other)
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::
operator>=(const QVariant &other)
{
return WherePhrase(this, PhraseData::GreaterEqual, other);
}
template <typename T>
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::isNull(){
Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::isNull()
{
return WherePhrase(this, PhraseData::Null);
}
@ -255,57 +273,70 @@ Q_OUTOFLINE_TEMPLATE WherePhrase FieldPhrase<T>::like(QString pattern)
return WherePhrase(this, PhraseData::Like, pattern);
}
// Custom types
template <>
class FieldPhrase<DbGeography>: public WherePhrase {
class FieldPhrase<DbGeography> : public WherePhrase
{
public:
FieldPhrase(const char *className, const char* s) : WherePhrase(className, s){
FieldPhrase(const char *className, const char *s)
: WherePhrase(className, s)
{
}
WherePhrase distance(const DbGeography &geo) {
return WherePhrase(this, PhraseData::Distance, QVariant::fromValue(geo));
WherePhrase distance(const DbGeography &geo)
{
return WherePhrase(this, PhraseData::Distance,
QVariant::fromValue(geo));
}
};
// Custom types
template <>
class FieldPhrase<QPoint>: public WherePhrase {
class FieldPhrase<QPoint> : public WherePhrase
{
public:
FieldPhrase(const char *className, const char* s) : WherePhrase(className, s){
FieldPhrase(const char *className, const char *s)
: WherePhrase(className, s)
{
}
WherePhrase distance(const QPoint &geo) {
return WherePhrase(this, PhraseData::Distance, QVariant::fromValue(geo));
WherePhrase distance(const QPoint &geo)
{
return WherePhrase(this, PhraseData::Distance,
QVariant::fromValue(geo));
}
WherePhrase operator =(const QPoint &other) {
WherePhrase operator=(const QPoint &other)
{
return WherePhrase(this, PhraseData::Set, other);
}
};
// Custom types
template <>
class FieldPhrase<QPointF>: public WherePhrase {
class FieldPhrase<QPointF> : public WherePhrase
{
public:
FieldPhrase(const char *className, const char* s) : WherePhrase(className, s){
FieldPhrase(const char *className, const char *s)
: WherePhrase(className, s)
{
}
WherePhrase distance(const QPointF &geo) {
return WherePhrase(this, PhraseData::Distance, QVariant::fromValue(geo));
WherePhrase distance(const QPointF &geo)
{
return WherePhrase(this, PhraseData::Distance,
QVariant::fromValue(geo));
}
WherePhrase operator =(const QPointF &other) {
WherePhrase operator=(const QPointF &other)
{
return WherePhrase(this, PhraseData::Set, other);
}
};
// template<>
// class FieldPhrase<QString>: public WherePhrase {
// public:
// FieldPhrase(const char *className, const char* s) : WherePhrase(className, s){
// FieldPhrase(const char *className, const char* s) : WherePhrase(className,
// s){
// }
@ -315,30 +346,38 @@ public:
// }
//};
template <>
class FieldPhrase<bool>: public WherePhrase{
class FieldPhrase<bool> : public WherePhrase
{
public:
FieldPhrase(const char *className, const char* s) : WherePhrase(className, s){
FieldPhrase(const char *className, const char *s)
: WherePhrase(className, s)
{
}
WherePhrase operator ==(const bool &other) {
WherePhrase operator==(const bool &other)
{
return WherePhrase(this, PhraseData::Equal, other ? 1 : 0);
}
WherePhrase operator =(const bool &other) {
WherePhrase operator=(const bool &other)
{
return WherePhrase(this, PhraseData::Set, other ? 1 : 0);
}
WherePhrase operator !() {
WherePhrase operator!()
{
return WherePhrase(this, PhraseData::Equal, 0);
}
};
class NumericFieldPhrase: public WherePhrase{
class NumericFieldPhrase : public WherePhrase
{
public:
NumericFieldPhrase(const char *className, const char* s) : WherePhrase(className, s) { }
NumericFieldPhrase(const char *className, const char *s)
: WherePhrase(className, s)
{
}
WherePhrase operator=(const QVariant &other)
{
@ -355,6 +394,15 @@ public:
return WherePhrase(this, PhraseData::Minus, other);
}
WherePhrase operator++()
{
return WherePhrase(this, PhraseData::Add, 1);
}
WherePhrase operator--()
{
return WherePhrase(this, PhraseData::Minus, 1);
}
WherePhrase operator==(const QVariant &other)
{
@ -390,25 +438,51 @@ public:
{
return WherePhrase(this, PhraseData::Null);
}
template<typename T>
WherePhrase in(QList<T> list)
{
QVariantList vlist;
foreach (T t, list)
vlist.append(QVariant::fromValue(t));
return WherePhrase(this, PhraseData::In, vlist);
}
template<typename T>
WherePhrase in(std::initializer_list<T> list)
{
return in(QList<T>(list));
}
WherePhrase in(int count, ...)
{
QVariantList vlist;
va_list ap;
va_start(ap, count);
for (int i = 0; i < count; ++i)
vlist.append(QVariant::fromValue(va_arg(ap, int)));
va_end(ap);
return WherePhrase(this, PhraseData::In, vlist);
}
};
#define SPECIALIZATION_NUMERIC(type) \
template <> \
class FieldPhrase<type>: public NumericFieldPhrase{ \
class FieldPhrase<type> : public NumericFieldPhrase \
{ \
public: \
FieldPhrase(const char *className, const char *s) \
: NumericFieldPhrase(className, s) { } \
: NumericFieldPhrase(className, s) \
{ \
} \
WherePhrase operator=(const WherePhrase &other) \
{ \
return WherePhrase(this, PhraseData::Set, (WherePhrase *)&other); \
} \
WherePhrase in(QList<type> list) \
{ \
QVariantList vlist; \
foreach (type t, list) \
vlist.append(QVariant::fromValue(t)); \
return WherePhrase(this, PhraseData::In, vlist); \
} \
};
SPECIALIZATION_NUMERIC(qint8)
@ -423,7 +497,6 @@ SPECIALIZATION_NUMERIC(quint64)
SPECIALIZATION_NUMERIC(qreal)
NUT_END_NAMESPACE
#endif // PHRASE_H