Merge branch 'master' of github.com:treefrogframework/treefrog-framework

treefrogframework · treefrogframework · commit 4fe91ad1fc35 · 2015-11-23T10:46:43.000+09:00
diff --git a/include/TSqlJoin b/include/TSqlJoin
@@ -0,0 +1 @@
+#include "tsqljoin.h"
diff --git a/include/TreeFrogModel b/include/TreeFrogModel
@@ -10,6 +10,7 @@
 #include "tsqlquery.h"
 #include "tsqlqueryormapper.h"
 #include "tsqlqueryormapperiterator.h"
+#include "tsqljoin.h"
 #include "tmongoodmapper.h"
 #include "twebapplication.h"
 
diff --git a/include/headers.pri b/include/headers.pri
@@ -1,6 +1,6 @@
-HEADER_CLASSES = ../include/TAbstractModel ../include/TAbstractUser ../include/TActionContext ../include/TActionController ../include/TActionHelper ../include/TActionThread ../include/TActionView ../include/TPrototypeAjaxHelper ../include/TApplicationServerBase ../include/TThreadApplicationServer ../include/TPreforkApplicationServer ../include/TContentHeader ../include/TCookie ../include/TCookieJar ../include/TCriteria ../include/TCriteriaConverter ../include/TCryptMac ../include/TDirectView ../include/TDispatcher ../include/TGlobal ../include/THtmlAttribute ../include/THtmlParser ../include/THttpHeader ../include/THttpRequest ../include/THttpRequestHeader ../include/THttpResponse ../include/THttpResponseHeader ../include/THttpUtility ../include/TInternetMessageHeader ../include/TJavaScriptObject ../include/TLog ../include/TLogger ../include/TLoggerPlugin ../include/TMailMessage ../include/TModelUtil ../include/TMultipartFormData ../include/TOption ../include/TSession ../include/TSessionStore ../include/TSessionStorePlugin ../include/TSharedMemoryLogStream ../include/TSmtpMailer ../include/TSqlORMapper ../include/TSqlORMapperIterator ../include/TSqlObject ../include/TSqlQuery ../include/TSqlQueryORMapper ../include/TSystemGlobal ../include/TTemporaryFile ../include/TViewHelper ../include/TWebApplication ../include/TfException ../include/TfNamespace ../include/TreeFrogController ../include/TreeFrogModel ../include/TreeFrogView ../include/TAbstractController ../include/TActionMailer ../include/TFormValidator ../include/TSqlQueryORMapperIterator ../include/TAccessValidator ../include/TSqlTransaction ../include/TPaginator ../include/TKvsDatabase ../include/TKvsDriver ../include/TModelObject ../include/TPopMailer ../include/TMultiplexingServer ../include/TAccessLog ../include/TActionWorker ../include/TAtomicQueue ../include/TJsonUtil ../include/TScheduler ../include/TApplicationScheduler ../include/TCommandLineInterface ../include/TSendmailMailer ../include/TAppSettings ../include/TWebSocketEndpoint ../include/TDatabaseContext ../include/TWebSocketSession ../include/TRedis
+HEADER_CLASSES = ../include/TAbstractModel ../include/TAbstractUser ../include/TActionContext ../include/TActionController ../include/TActionHelper ../include/TActionThread ../include/TActionView ../include/TPrototypeAjaxHelper ../include/TApplicationServerBase ../include/TThreadApplicationServer ../include/TPreforkApplicationServer ../include/TContentHeader ../include/TCookie ../include/TCookieJar ../include/TCriteria ../include/TCriteriaConverter ../include/TCryptMac ../include/TDirectView ../include/TDispatcher ../include/TGlobal ../include/THtmlAttribute ../include/THtmlParser ../include/THttpHeader ../include/THttpRequest ../include/THttpRequestHeader ../include/THttpResponse ../include/THttpResponseHeader ../include/THttpUtility ../include/TInternetMessageHeader ../include/TJavaScriptObject ../include/TLog ../include/TLogger ../include/TLoggerPlugin ../include/TMailMessage ../include/TModelUtil ../include/TMultipartFormData ../include/TOption ../include/TSession ../include/TSessionStore ../include/TSessionStorePlugin ../include/TSharedMemoryLogStream ../include/TSmtpMailer ../include/TSqlORMapper ../include/TSqlORMapperIterator ../include/TSqlObject ../include/TSqlQuery ../include/TSqlQueryORMapper ../include/TSystemGlobal ../include/TTemporaryFile ../include/TViewHelper ../include/TWebApplication ../include/TfException ../include/TfNamespace ../include/TreeFrogController ../include/TreeFrogModel ../include/TreeFrogView ../include/TAbstractController ../include/TActionMailer ../include/TFormValidator ../include/TSqlQueryORMapperIterator ../include/TAccessValidator ../include/TSqlTransaction ../include/TPaginator ../include/TKvsDatabase ../include/TKvsDriver ../include/TModelObject ../include/TPopMailer ../include/TMultiplexingServer ../include/TAccessLog ../include/TActionWorker ../include/TAtomicQueue ../include/TJsonUtil ../include/TScheduler ../include/TApplicationScheduler ../include/TCommandLineInterface ../include/TSendmailMailer ../include/TAppSettings ../include/TWebSocketEndpoint ../include/TDatabaseContext ../include/TWebSocketSession ../include/TRedis ../include/TSqlJoin
 
-HEADER_FILES = tabstractmodel.h tabstractuser.h tactioncontext.h tactioncontroller.h tactionhelper.h tactionthread.h tactionview.h tprototypeajaxhelper.h tapplicationserverbase.h tthreadapplicationserver.h tpreforkapplicationserver.h tcontentheader.h tcookie.h tcookiejar.h tcriteria.h tcriteriaconverter.h tcryptmac.h tdirectview.h tdispatcher.h tfcore.h tfexception.h tfnamespace.h tglobal.h thtmlattribute.h thtmlparser.h thttpheader.h thttprequest.h thttprequestheader.h thttpresponse.h thttpresponseheader.h thttputility.h tinternetmessageheader.h tjavascriptobject.h tlog.h tlogger.h tloggerplugin.h tmailmessage.h tmodelutil.h tmultipartformdata.h toption.h tsession.h tsessionstore.h tsessionstoreplugin.h tsharedmemorylogstream.h tsmtpmailer.h tsqlobject.h tsqlormapper.h tsqlormapperiterator.h tsqlquery.h tsqlqueryormapper.h tsystemglobal.h ttemporaryfile.h tviewhelper.h twebapplication.h tabstractcontroller.h tactionmailer.h tformvalidator.h tsqlqueryormapperiterator.h taccessvalidator.h tsqltransaction.h tpaginator.h tkvsdatabase.h tkvsdriver.h tmodelobject.h tpopmailer.h tmultiplexingserver.h taccesslog.h tactionworker.h tatomicqueue.h tjsonutil.h tscheduler.h tapplicationscheduler.h tcommandlineinterface.h tsendmailmailer.h tappsettings.h twebsocketendpoint.h tdatabasecontext.h tsystembus.h tprocessinfo.h twebsocketsession.h tredis.h
+HEADER_FILES = tabstractmodel.h tabstractuser.h tactioncontext.h tactioncontroller.h tactionhelper.h tactionthread.h tactionview.h tprototypeajaxhelper.h tapplicationserverbase.h tthreadapplicationserver.h tpreforkapplicationserver.h tcontentheader.h tcookie.h tcookiejar.h tcriteria.h tcriteriaconverter.h tcryptmac.h tdirectview.h tdispatcher.h tfcore.h tfexception.h tfnamespace.h tglobal.h thtmlattribute.h thtmlparser.h thttpheader.h thttprequest.h thttprequestheader.h thttpresponse.h thttpresponseheader.h thttputility.h tinternetmessageheader.h tjavascriptobject.h tlog.h tlogger.h tloggerplugin.h tmailmessage.h tmodelutil.h tmultipartformdata.h toption.h tsession.h tsessionstore.h tsessionstoreplugin.h tsharedmemorylogstream.h tsmtpmailer.h tsqlobject.h tsqlormapper.h tsqlormapperiterator.h tsqlquery.h tsqlqueryormapper.h tsystemglobal.h ttemporaryfile.h tviewhelper.h twebapplication.h tabstractcontroller.h tactionmailer.h tformvalidator.h tsqlqueryormapperiterator.h taccessvalidator.h tsqltransaction.h tpaginator.h tkvsdatabase.h tkvsdriver.h tmodelobject.h tpopmailer.h tmultiplexingserver.h taccesslog.h tactionworker.h tatomicqueue.h tjsonutil.h tscheduler.h tapplicationscheduler.h tcommandlineinterface.h tsendmailmailer.h tappsettings.h twebsocketendpoint.h tdatabasecontext.h tsystembus.h tprocessinfo.h twebsocketsession.h tredis.h tsqljoin.h
 
 unix {
   HEADER_FILES += tfcore_unix.h
diff --git a/include/tsqljoin.h b/include/tsqljoin.h
@@ -0,0 +1 @@
+#include "../src/tsqljoin.h"
diff --git a/src/corelib.pro b/src/corelib.pro
@@ -94,6 +94,8 @@ SOURCES += tactionthread.cpp
 #SOURCES += tactionforkprocess.cpp
 HEADERS += thttpsocket.h
 SOURCES += thttpsocket.cpp
+#HEADERS += thttp2socket.h
+#SOURCES += thttp2socket.cpp
 #HEADERS += thttpbuffer.h
 #SOURCES += thttpbuffer.cpp
 HEADERS += tsendbuffer.h
@@ -281,6 +283,7 @@ HEADERS += \
            tsessionstoreplugin.h \
            tjavascriptobject.h \
            tsqlormapper.h \
+           tsqljoin.h \
            thttprequestheader.h \
            thttpresponseheader.h \
            tcommandlineinterface.h
diff --git a/src/tcriteriaconverter.h b/src/tcriteriaconverter.h
@@ -79,31 +79,33 @@ template <class T>
 class TCriteriaConverter
 {
 public:
-    TCriteriaConverter(const TCriteria &cri, const QSqlDatabase &db) : criteria(cri), database(db) { }
+    TCriteriaConverter(const TCriteria &cri, const QSqlDatabase &db, const QString &aliasTableName = QString()) : criteria(cri), database(db), tableAlias(aliasTableName) { }
     QString toString() const;
-    static QString propertyName(int property);
+    static QString propertyName(int property, const QSqlDriver *driver, const QString &aliasTableName = QString());
+
 
 protected:
-    static QString criteriaToString(const QVariant &cri, const QSqlDatabase &database);
+    QString criteriaToString(const QVariant &cri) const;
     static QString criteriaToString(const QString &propertyName, TSql::ComparisonOperator op, const QVariant &val1, const QVariant &val2, const QSqlDatabase &database);
     static QString criteriaToString(const QString &propertyName, TSql::ComparisonOperator op1, TSql::ComparisonOperator op2, const QVariant &val, const QSqlDatabase &database);
-    static QString join(const QString &s1, TCriteria::LogicalOperator op, const QString &s2);
+    static QString concat(const QString &s1, TCriteria::LogicalOperator op, const QString &s2);
 
 private:
     TCriteria criteria;
     QSqlDatabase database;
+    QString tableAlias;
 };
 
 
 template <class T>
 inline QString TCriteriaConverter<T>::toString() const
 {
-    return criteriaToString(QVariant::fromValue(criteria), database);
+    return criteriaToString(QVariant::fromValue(criteria));
 }
 
 
 template <class T>
-inline QString TCriteriaConverter<T>::criteriaToString(const QVariant &var, const QSqlDatabase &database)
+inline QString TCriteriaConverter<T>::criteriaToString(const QVariant &var) const
 {
     QString sqlString;
     if (var.isNull()) {
@@ -115,16 +117,16 @@ inline QString TCriteriaConverter<T>::criteriaToString(const QVariant &var, cons
         if (cri.isEmpty()) {
             return QString();
         }
-        sqlString = join(criteriaToString(cri.first(), database), cri.logicalOperator(),
-                         criteriaToString(cri.second(), database));
+        sqlString = concat(criteriaToString(cri.first()), cri.logicalOperator(),
+                           criteriaToString(cri.second()));
 
     } else if (var.canConvert<TCriteriaData>()) {
         TCriteriaData cri = var.value<TCriteriaData>();
         if (cri.isEmpty()) {
             return QString();
         }
 
-        QString name = propertyName(cri.property);
+        QString name = propertyName(cri.property, database.driver(), tableAlias);
         if (name.isEmpty()) {
             return QString();
         }
@@ -207,10 +209,19 @@ inline QString TCriteriaConverter<T>::criteriaToString(const QVariant &var, cons
 
 
 template <class T>
-inline QString TCriteriaConverter<T>::propertyName(int property)
+inline QString TCriteriaConverter<T>::propertyName(int property, const QSqlDriver *driver, const QString &aliasTableName)
 {
     const QMetaObject *metaObject = T().metaObject();
-    return (metaObject) ? metaObject->property(metaObject->propertyOffset() + property).name() : QString();
+    QString name = (metaObject) ? metaObject->property(metaObject->propertyOffset() + property).name() : QString();
+    if (name.isEmpty()) {
+        return name;
+    }
+
+    name = TSqlQuery::escapeIdentifier(name, QSqlDriver::FieldName, driver);
+    if (!aliasTableName.isEmpty()) {
+        name = aliasTableName + QLatin1Char('.') + name;
+    }
+    return name;
 }
 
 
@@ -277,7 +288,7 @@ inline QString TCriteriaConverter<T>::criteriaToString(const QString &propertyNa
 
 
 template <class T>
-inline QString TCriteriaConverter<T>::join(const QString &s1, TCriteria::LogicalOperator op, const QString &s2)
+inline QString TCriteriaConverter<T>::concat(const QString &s1, TCriteria::LogicalOperator op, const QString &s2)
 {
     if (op == TCriteria::None || (s2.isEmpty() && op != TCriteria::Not)) {
         return s1;
diff --git a/src/test/buildtest/main.cpp b/src/test/buildtest/main.cpp
@@ -2,6 +2,7 @@
 #include <TSqlORMapperIterator>
 #include <TSqlQueryORMapper>
 #include <TSqlQueryORMapperIterator>
+#include <TSqlJoin>
 #include <TMongoODMapper>
 #include <TModelUtil>
 #include <TAtomicQueue>
@@ -46,6 +47,8 @@ void build_check_TSqlORMapper()
     mapper.removeAll(crt && crt);
     mapper.removeAll(crt || crt);
     mapper.removeAll(!crt);
+    auto joinCri = TCriteria(BlogObject::Title, "hoge");
+    mapper.setJoin(BlogObject::Id, TSqlJoin<BlogObject>(BlogObject::Title, joinCri));
 }
 
 void build_check_TSqlORMapperIterator()
diff --git a/src/tfnamespace.h b/src/tfnamespace.h
@@ -250,6 +250,12 @@ namespace TSql
         Any,           // ANY (val1, ...)
         All,           // ALL (val1, ...)
     };
+
+    enum JoinMode {
+        InnerJoin = 0,
+        LeftJoin,
+        RightJoin,
+    };
 }
 
 /*!
diff --git a/src/tglobal.h b/src/tglobal.h
@@ -6,9 +6,9 @@
 #include <TfNamespace>
 #include <cstdint>
 
-#define TF_VERSION_STR "1.9.2"
-#define TF_VERSION_NUMBER 0x010902
-#define TF_SRC_REVISION 954
+#define TF_VERSION_STR "1.10.0"
+#define TF_VERSION_NUMBER 0x0101000
+#define TF_SRC_REVISION 984
 
 
 #define T_DECLARE_CONTROLLER(TYPE, NAME)  \
diff --git a/src/tmongoodmapper.h b/src/tmongoodmapper.h
@@ -131,7 +131,7 @@ inline int TMongoODMapper<T>::find(const TCriteria &criteria)
 {
     QVariantMap order;
     if (sortColumn >= 0) {
-        QString name = TCriteriaConverter<T>::propertyName(sortColumn);
+        QString name = TCriteriaMongoConverter<T>::propertyName(sortColumn);
         if (!name.isEmpty()) {
             order.insert(name, (sortOrder == Tf::AscendingOrder) ? 1 : -1);
         }
@@ -221,7 +221,7 @@ inline QList<T> TMongoODMapper<T>::findAllIn(int column, const QVariantList &val
 template <class T>
 inline int TMongoODMapper<T>::updateAll(const TCriteria &cri, int column, QVariant value)
 {
-    QString s = TCriteriaConverter<T>::propertyName(column);
+    QString s = TCriteriaMongoConverter<T>::propertyName(column);
     if (s.isEmpty())
         return -1;
 
@@ -239,7 +239,7 @@ inline int TMongoODMapper<T>::updateAll(const TCriteria &cri, const QMap<int, QV
 
     for (QMapIterator<int, QVariant> it(values); it.hasNext(); ) {
         it.next();
-        QString s = TCriteriaConverter<T>::propertyName(it.key());
+        QString s = TCriteriaMongoConverter<T>::propertyName(it.key());
         if (!s.isEmpty()) {
             doc.insert(s, it.value());
         }
diff --git a/src/tsqljoin.h b/src/tsqljoin.h
@@ -0,0 +1,61 @@
+#ifndef TSQLJOIN_H
+#define TSQLJOIN_H
+
+#include <TGlobal>
+#include <TCriteria>
+
+/*!
+  \class TSqlJoin
+*/
+
+
+template <class T>
+class TSqlJoin
+{
+public:
+    TSqlJoin();
+    TSqlJoin(int joinColumn, const TCriteria &criteria);
+    TSqlJoin(TSql::JoinMode joinMode, int joinColumn, const TCriteria &criteria);
+    TSqlJoin(const TSqlJoin &other);
+
+    TSqlJoin &operator=(const TSqlJoin &other);
+    TSql::JoinMode joinMode() const { return _mode; }
+    int joinColumn() const { return _joinColumn; }
+    TCriteria criteria() const { return _criteria; }
+
+private:
+    TSql::JoinMode _mode;
+    int _joinColumn;
+    TCriteria _criteria;
+};
+
+
+template <class T>
+inline TSqlJoin<T>::TSqlJoin()
+    : _mode(TSql::InnerJoin), _joinColumn(-1), _criteria()
+{ }
+
+template <class T>
+inline TSqlJoin<T>::TSqlJoin(int joinColumn, const TCriteria &criteria)
+    : _mode(TSql::InnerJoin), _joinColumn(joinColumn), _criteria(criteria)
+{ }
+
+template <class T>
+inline TSqlJoin<T>::TSqlJoin(TSql::JoinMode joinMode, int joinColumn, const TCriteria &criteria)
+    : _mode(joinMode), _joinColumn(joinColumn), _criteria(criteria)
+{ }
+
+template<class T>
+inline TSqlJoin<T>::TSqlJoin(const TSqlJoin &other)
+    : _mode(other.mode), _joinColumn(other._joinColumn), _criteria(other._criteria)
+{ }
+
+template<class T>
+inline TSqlJoin<T> &TSqlJoin<T>::operator=(const TSqlJoin &other)
+{
+    _mode = other._mode;
+    _joinColumn = other._joinColumn;
+    _criteria = other._criteria;
+}
+
+#endif // TSQLJOIN_H
diff --git a/src/tsqlormapper.h b/src/tsqlormapper.h
diff --git a/src/tsqlquery.cpp b/src/tsqlquery.cpp
diff --git a/src/tsqlquery.h b/src/tsqlquery.h
diff --git a/src/tsqlqueryormapper.h b/src/tsqlqueryormapper.h
diff --git a/tools/tfmanager/main.cpp b/tools/tfmanager/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ inline int TMongoODMapper<T>::find(const TCriteria &criteria)`
`131`	`131`	`{`
`132`	`132`	`QVariantMap order;`
`133`	`133`	`if (sortColumn >= 0) {`
`134`		`- QString name = TCriteriaConverter<T>::propertyName(sortColumn);`
	`134`	`+ QString name = TCriteriaMongoConverter<T>::propertyName(sortColumn);`
`135`	`135`	`if (!name.isEmpty()) {`
`136`	`136`	`order.insert(name, (sortOrder == Tf::AscendingOrder) ? 1 : -1);`
`137`	`137`	`}`
`@@ -221,7 +221,7 @@ inline QList<T> TMongoODMapper<T>::findAllIn(int column, const QVariantList &val`
`221`	`221`	`template <class T>`
`222`	`222`	`inline int TMongoODMapper<T>::updateAll(const TCriteria &cri, int column, QVariant value)`
`223`	`223`	`{`
`224`		`- QString s = TCriteriaConverter<T>::propertyName(column);`
	`224`	`+ QString s = TCriteriaMongoConverter<T>::propertyName(column);`
`225`	`225`	`if (s.isEmpty())`
`226`	`226`	`return -1;`
`227`	`227`
`@@ -239,7 +239,7 @@ inline int TMongoODMapper<T>::updateAll(const TCriteria &cri, const QMap<int, QV`
`239`	`239`
`240`	`240`	`for (QMapIterator<int, QVariant> it(values); it.hasNext(); ) {`
`241`	`241`	`it.next();`
`242`		`- QString s = TCriteriaConverter<T>::propertyName(it.key());`
	`242`	`+ QString s = TCriteriaMongoConverter<T>::propertyName(it.key());`
`243`	`243`	`if (!s.isEmpty()) {`
`244`	`244`	`doc.insert(s, it.value());`
`245`	`245`	`}`