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

polish FieldPhrase<QDate/QTime/QDateTime>

This commit is contained in:
Hamed Masafi 2019-07-07 19:42:37 +04:30
parent e539a1da75
commit 1c196fe3ef
2 changed files with 203 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/phrases/datephrase.cpp
View File

@ -20,3 +20,128 @@
#include "datephrase.h" #include "datephrase.h"
NUT_BEGIN_NAMESPACE
FieldPhrase<QDate>::FieldPhrase(const char *className, const char *s) :
AbstractFieldPhrase(className, s)
{}
ConditionalPhrase FieldPhrase<QDate>::addYears(int years) {
return ConditionalPhrase(this, PhraseData::AddYears, years);
}
ConditionalPhrase FieldPhrase<QDate>::addMonths(int months) {
return ConditionalPhrase(this, PhraseData::AddMonths, months);
}
ConditionalPhrase FieldPhrase<QDate>::addDays(int days) {
return ConditionalPhrase(this, PhraseData::AddDays, days);
}
ConditionalPhrase FieldPhrase<QDate>::year() {
return ConditionalPhrase(this, PhraseData::DatePartYear);
}
ConditionalPhrase FieldPhrase<QDate>::month() {
return ConditionalPhrase(this, PhraseData::DatePartMonth);
}
ConditionalPhrase FieldPhrase<QDate>::day() {
return ConditionalPhrase(this, PhraseData::DatePartDay);
}
FieldPhrase<QTime>::FieldPhrase(const char *className, const char *s) :
AbstractFieldPhrase(className, s)
{}
ConditionalPhrase FieldPhrase<QTime>::addHours(int hours) {
return ConditionalPhrase(this, PhraseData::AddHours, hours);
}
ConditionalPhrase FieldPhrase<QTime>::addMinutes(int minutes) {
return ConditionalPhrase(this, PhraseData::AddMinutes, minutes);
}
ConditionalPhrase FieldPhrase<QTime>::addSeconds(int seconds) {
return ConditionalPhrase(this, PhraseData::AddSeconds, seconds);
}
ConditionalPhrase FieldPhrase<QTime>::hour() {
return ConditionalPhrase(this, PhraseData::DatePartHour);
}
ConditionalPhrase FieldPhrase<QTime>::minute() {
return ConditionalPhrase(this, PhraseData::DatePartMinute);
}
ConditionalPhrase FieldPhrase<QTime>::second() {
return ConditionalPhrase(this, PhraseData::DatePartSecond);
}
ConditionalPhrase FieldPhrase<QTime>::msec() {
return ConditionalPhrase(this, PhraseData::DatePartMilisecond);
}
FieldPhrase<QDateTime>::FieldPhrase(const char *className, const char *s) :
AbstractFieldPhrase(className, s)
{}
ConditionalPhrase FieldPhrase<QDateTime>::addYears(int years) {
return ConditionalPhrase(this, PhraseData::AddYearsDateTime, years);
}
ConditionalPhrase FieldPhrase<QDateTime>::addMonths(int months) {
return ConditionalPhrase(this, PhraseData::AddMonthsDateTime, months);
}
ConditionalPhrase FieldPhrase<QDateTime>::addDays(int days) {
return ConditionalPhrase(this, PhraseData::AddDaysDateTime, days);
}
ConditionalPhrase FieldPhrase<QDateTime>::addHours(int hours) {
return ConditionalPhrase(this, PhraseData::AddHoursDateTime, hours);
}
ConditionalPhrase FieldPhrase<QDateTime>::addMinutes(int minutes) {
return ConditionalPhrase(this, PhraseData::AddMinutesDateTime, minutes);
}
ConditionalPhrase FieldPhrase<QDateTime>::addSeconds(int seconds) {
return ConditionalPhrase(this, PhraseData::AddSecondsDateTime, seconds);
}
ConditionalPhrase FieldPhrase<QDateTime>::year() {
return ConditionalPhrase(this, PhraseData::DatePartYear);
}
ConditionalPhrase FieldPhrase<QDateTime>::month() {
return ConditionalPhrase(this, PhraseData::DatePartMonth);
}
ConditionalPhrase FieldPhrase<QDateTime>::day() {
return ConditionalPhrase(this, PhraseData::DatePartDay);
}
ConditionalPhrase FieldPhrase<QDateTime>::hour() {
return ConditionalPhrase(this, PhraseData::DatePartHour);
}
ConditionalPhrase FieldPhrase<QDateTime>::minute() {
return ConditionalPhrase(this, PhraseData::DatePartMinute);
}
ConditionalPhrase FieldPhrase<QDateTime>::second() {
return ConditionalPhrase(this, PhraseData::DatePartSecond);
}
ConditionalPhrase FieldPhrase<QDateTime>::msec() {
return ConditionalPhrase(this, PhraseData::DatePartMilisecond);
}
COMMON_OPERATORS_IMPL(QDate)
COMMON_OPERATORS_IMPL(QTime)
COMMON_OPERATORS_IMPL(QDateTime)
NUT_END_NAMESPACE

218
src/phrases/datephrase.h
View File

@ -27,158 +27,96 @@
NUT_BEGIN_NAMESPACE NUT_BEGIN_NAMESPACE
#define COMMON_OPERATORS_DECL(T) \
AssignmentPhrase operator =(const T &other); \
ConditionalPhrase operator <(const QVariant &other); \
ConditionalPhrase operator <=(const QVariant &other); \
ConditionalPhrase operator >(const QVariant &other); \
ConditionalPhrase operator >=(const QVariant &other); \
ConditionalPhrase between(const QVariant &min, const QVariant &max);
template<typename> #define COMMON_OPERATORS_IMPL(T) \
struct __is_date_helper AssignmentPhrase FieldPhrase<T>::operator =(const T &other) { \
: public std::false_type { }; return AssignmentPhrase(this, other); \
} \
ConditionalPhrase FieldPhrase<T>::operator <(const QVariant &other) { \
return ConditionalPhrase(this, PhraseData::Less, other); \
} \
ConditionalPhrase FieldPhrase<T>::operator <=(const QVariant &other) { \
return ConditionalPhrase(this, PhraseData::LessEqual, other); \
} \
ConditionalPhrase FieldPhrase<T>::operator >(const QVariant &other) { \
return ConditionalPhrase(this, PhraseData::Greater, other); \
} \
ConditionalPhrase FieldPhrase<T>::operator >=(const QVariant &other) { \
return ConditionalPhrase(this, PhraseData::GreaterEqual, other); \
} \
ConditionalPhrase FieldPhrase<T>::between(const QVariant &min, const QVariant &max) \
{ \
return ConditionalPhrase(this, PhraseData::Between, \
QVariantList() << min << max); \
}
template<> template<>
struct __is_date_helper<QTime> class NUT_EXPORT FieldPhrase<QDate> : public AbstractFieldPhrase
: public std::true_type { };
template<>
struct __is_date_helper<QDate>
: public std::true_type { };
template<>
struct __is_date_helper<QDateTime>
: public std::true_type { };
template<typename _Tp>
struct is_date
: public __is_date_helper<typename std::remove_cv<_Tp>::type>::type
{ };
template <class T, class P>
inline bool is_valid_template() {return false;}
template <>
inline bool is_valid_template<QDateTime, QTime>() {return true;}
template <>
inline bool is_valid_template<QDateTime, QDate>() {return true;}
template <>
inline bool is_valid_template<QDate, QDate>() {return true;}
template <>
inline bool is_valid_template<QTime, QTime>() {return true;}
template <typename T>
class NUT_EXPORT FieldPhrase<T, typename std::enable_if<is_date<T>::value>::type>
: public AbstractFieldPhrase
{ {
public: public:
FieldPhrase(const char *className, const char *s) : FieldPhrase(const char *className, const char *s);
AbstractFieldPhrase(className, s)
{}
AssignmentPhrase operator =(const T &other) { COMMON_OPERATORS_DECL(QDate)
return AssignmentPhrase(this, other);
}
ConditionalPhrase operator <(const QVariant &other) { ConditionalPhrase addYears(int years);
return ConditionalPhrase(this, PhraseData::Less, other); ConditionalPhrase addMonths(int months);
} ConditionalPhrase addDays(int days);
ConditionalPhrase operator <=(const QVariant &other) {
return ConditionalPhrase(this, PhraseData::LessEqual, other);
}
ConditionalPhrase operator >(const QVariant &other) {
return ConditionalPhrase(this, PhraseData::Greater, other);
}
ConditionalPhrase operator >=(const QVariant &other) {
return ConditionalPhrase(this, PhraseData::GreaterEqual, other);
}
ConditionalPhrase between(const QVariant &min, const QVariant &max) ConditionalPhrase year();
{ ConditionalPhrase month();
return ConditionalPhrase(this, PhraseData::Between, ConditionalPhrase day();
QVariantList() << min << max); };
}
// template<class P = T, template<>
// class std::enable_if<std::is_same<P, QDateTime>::value, int>::type = 0> class NUT_EXPORT FieldPhrase<QTime> : public AbstractFieldPhrase
ConditionalPhrase addYears(int val) { {
if (!is_valid_template<T, QDate>()) public:
return ConditionalPhrase(); FieldPhrase(const char *className, const char *s);
if (std::is_same<T, QDateTime>::value)
return ConditionalPhrase(this, PhraseData::AddYearsDateTime, val);
return ConditionalPhrase(this, PhraseData::AddYears, val); COMMON_OPERATORS_DECL(QTime)
}
ConditionalPhrase addMonths(int val) {
if (!is_valid_template<T, QDate>())
return ConditionalPhrase();
if (std::is_same<T, QDateTime>::value)
return ConditionalPhrase(this, PhraseData::AddMonthsDateTime, val);
return ConditionalPhrase(this, PhraseData::AddMonths, val);
}
ConditionalPhrase addDays(int val) {
if (!is_valid_template<T, QDate>())
return ConditionalPhrase();
if (std::is_same<T, QDateTime>::value)
return ConditionalPhrase(this, PhraseData::AddDaysDateTime, val);
return ConditionalPhrase(this, PhraseData::AddDays, val);
}
ConditionalPhrase addHours(int val) { ConditionalPhrase addHours(int hours);
if (!is_valid_template<T, QTime>()) ConditionalPhrase addMinutes(int minutes);
return ConditionalPhrase(); ConditionalPhrase addSeconds(int seconds);
if (std::is_same<T, QDateTime>::value)
return ConditionalPhrase(this, PhraseData::AddHoursDateTime, val);
return ConditionalPhrase(this, PhraseData::AddHours, val);
}
ConditionalPhrase addMinutes(int val) {
if (!is_valid_template<T, QTime>())
return ConditionalPhrase();
if (std::is_same<T, QDateTime>::value)
return ConditionalPhrase(this, PhraseData::AddMinutesDateTime, val);
return ConditionalPhrase(this, PhraseData::AddMinutes, val);
}
ConditionalPhrase addSeconds(int val) {
if (!is_valid_template<T, QTime>())
return ConditionalPhrase();
if (std::is_same<T, QDateTime>::value)
return ConditionalPhrase(this, PhraseData::AddSecondsDateTime, val);
return ConditionalPhrase(this, PhraseData::AddSeconds, val);
}
ConditionalPhrase year() { ConditionalPhrase hour();
if (!is_valid_template<T, QDate>()) ConditionalPhrase minute();
return ConditionalPhrase(); ConditionalPhrase second();
return ConditionalPhrase(this, PhraseData::DatePartYear); ConditionalPhrase msec();
} };
ConditionalPhrase month() {
if (!is_valid_template<T, QDate>()) template<>
return ConditionalPhrase(); class NUT_EXPORT FieldPhrase<QDateTime> : public AbstractFieldPhrase
return ConditionalPhrase(this, PhraseData::DatePartMonth); {
} public:
ConditionalPhrase day() { FieldPhrase(const char *className, const char *s);
if (!is_valid_template<T, QDate>())
return ConditionalPhrase(); COMMON_OPERATORS_DECL(QDateTime)
return ConditionalPhrase(this, PhraseData::DatePartDay);
} ConditionalPhrase addYears(int year);
ConditionalPhrase hour() { ConditionalPhrase addMonths(int months);
if (!is_valid_template<T, QTime>()) ConditionalPhrase addDays(int days);
return ConditionalPhrase();
return ConditionalPhrase(this, PhraseData::DatePartHour);
} ConditionalPhrase addHours(int hours);
ConditionalPhrase minute() { ConditionalPhrase addMinutes(int minutes);
if (!is_valid_template<T, QTime>()) ConditionalPhrase addSeconds(int seconds);
return ConditionalPhrase();
return ConditionalPhrase(this, PhraseData::DatePartMinute); ConditionalPhrase year();
} ConditionalPhrase month();
ConditionalPhrase second() { ConditionalPhrase day();
if (!is_valid_template<T, QTime>())
return ConditionalPhrase(); ConditionalPhrase hour();
return ConditionalPhrase(this, PhraseData::DatePartSecond); ConditionalPhrase minute();
} ConditionalPhrase second();
ConditionalPhrase msec() { ConditionalPhrase msec();
if (!is_valid_template<T, QTime>())
return ConditionalPhrase();
return ConditionalPhrase(this, PhraseData::DatePartMilisecond);
}
}; };
NUT_END_NAMESPACE NUT_END_NAMESPACE