Merge remote-tracking branch 'upstream/master' into multidatabasecapabilitySecondtry

Author: wehnersteffensielaff

.appveyor.yml

@@ -98,3 +98,8 @@ build_script:
   - cd RESTWebService
   - qmake RESTWebService.pro
   - mingw32-make -j 8
+
+  - cd ..
+  - cd ORM
+  - qmake ORM.pro
+  - mingw32-make -j 8

.travis.yml

@@ -41,7 +41,7 @@ script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then rm *tst_*; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then rm main*; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then rm moc*; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then coveralls --exclude lib --exclude tests --exclude *Qt* --exclude */usr/* --gcov-options '\-lp'; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then coveralls --exclude lib --exclude tests --exclude *Qt* --exclude */usr/* --gcov-options '\-lp'; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make clean; fi
 
   - cd cwf
@@ -130,3 +130,7 @@ script:
   - qmake RESTWebService.pro
   - make -j 8
 
+  - cd ..
+  - cd ORM
+  - qmake ORM.pro
+  - make -j 8

CPPWebFramework/CMakeLists.txt

@@ -32,8 +32,12 @@ set(CPP_WebFrameWork_SRCS
     cwf/session.cpp
     cwf/cppwebcontroller.cpp
     cwf/sslloader.cpp
+    cwf/model.cpp
+    cwf/modelbasicoperation.cpp
+    cwf/sqlquerymanager.cpp
     cwf/cstlcompilerobject.h
     cwf/variant.h
+    cwf/dbstorage.h
     )
 
 add_library(CPPWebFramework SHARED ${CPP_WebFrameWork_SRCS} )

CPPWebFramework/CPPWebFramework.pro

@@ -7,7 +7,6 @@
 QT       += network xml sql
 QT       -= gui
 
-TARGET = CPPWebFramework
 TEMPLATE = lib
 
 DEFINES += CPPWEBFRAMEWORK_LIBRARY
@@ -48,10 +47,13 @@ SOURCES += \
     cwf/session.cpp \
     cwf/cppwebcontroller.cpp \
     cwf/sslloader.cpp \
-    cwf/filter.cpp
+    cwf/filter.cpp \
+    cwf/model.cpp \
+    cwf/modelbasicoperation.cpp \
+    cwf/sqlquerymanager.cpp
 
 HEADERS += \
-        cwf/cppwebframework_global.h \
+    cwf/cppwebframework_global.h \
     cwf/configuration.h \
     cwf/constants.h \
     cwf/cppwebapplication.h \
@@ -82,7 +84,10 @@ HEADERS += \
     cwf/response.h \
     cwf/session.h \
     cwf/cppwebcontroller.h \
-    cwf/sslloader.h
+    cwf/sslloader.h \
+    cwf/model.h \
+    cwf/modelbasicoperation.h \
+    cwf/sqlquerymanager.h
 
 DISTFILES += \
     server/config/ssl/my.key \
@@ -120,14 +125,22 @@ win32 {
     config.files   = server/*
 }
 
+CONFIG += debug_and_release
+CONFIG += build_all
+
+CONFIG(debug, debug|release) {
+    TARGET = CPPWebFrameworkd
+} else {
+    TARGET = CPPWebFramework
+    QMAKE_CXXFLAGS_RELEASE -= -O1
+    QMAKE_CXXFLAGS_RELEASE -= -O2
+    QMAKE_CXXFLAGS_RELEASE += -O3
+}
+
 INSTALLS += target
 INSTALLS += headers
 INSTALLS += config
 
-QMAKE_CXXFLAGS_RELEASE -= -O1
-QMAKE_CXXFLAGS_RELEASE -= -O2
-QMAKE_CXXFLAGS_RELEASE += -O3
-
 QMAKE_CXXFLAGS += -std=c++11
 
 #Strongly recommended

CPPWebFramework/cwf/constants.h

@@ -126,8 +126,8 @@ namespace HTTP
     const QByteArray END_LINE                         = "\r\n";
     const QByteArray SEPARATOR                        = ": ";
     const QByteArray HTTP_1_1                         = "HTTP/1.1 ";
-    const QByteArray END_OF_MENSAGE                   = "\r\n\r\n";
-    const QByteArray END_OF_MENSAGE_WITH_ZERO         = "0\r\n\r\n";
+    const QByteArray END_OF_MESSAGE                   = "\r\n\r\n";
+    const QByteArray END_OF_MESSAGE_WITH_ZERO         = "0\r\n\r\n";
     const QByteArray CONTENT_TYPE                     = "Content-Type";
     const QByteArray CONTENT_LENGTH                   = "Content-Length";
     const QByteArray CONTENT_DISPOSITION              = "Content-Disposition";

CPPWebFramework/cwf/controller.cpp

@@ -20,10 +20,6 @@ void Controller::doMessage(Request &req, Response &resp, const QString &method)
         resp.sendError(Response::SC_BAD_REQUEST, msg.toLatin1());
 }
 
-Controller::~Controller()
-{
-}
-
 void Controller::doDelete(Request &req, Response &resp) const
 {
     doMessage(req, resp, HTTP::METHOD::DELETE);

CPPWebFramework/cwf/controller.h

@@ -38,7 +38,7 @@ class CPPWEBFRAMEWORKSHARED_EXPORT Controller
     /**
      * @brief Destructor.
      */
-    virtual ~Controller();
+    virtual ~Controller() = default;
     /**
      * @brief This is an virtual method that can be overloaded to attend the delete request method.
      * @param req    : This is a reference to the Request.

CPPWebFramework/cwf/filter.cpp

@@ -2,10 +2,6 @@
 
 CWF_BEGIN_NAMESPACE
 
-Filter::~Filter()
-{
-}
-
 void Filter::doFilter(Request &request, Response &response, FilterChain &chain)
 {
     chain.doFilter(request, response);

CPPWebFramework/cwf/filter.h

@@ -26,7 +26,7 @@ class CPPWEBFRAMEWORKSHARED_EXPORT Filter
     /**
      * @brief Virtual destructor.
      */
-    virtual ~Filter();
+    virtual ~Filter() = default;
     /**
      * @brief This method will be called always that the CppWebServer receives a requisition.
      * @param request  : This is a reference to the Request.

CPPWebFramework/cwf/httpparser.cpp

@@ -15,7 +15,7 @@ CWF_BEGIN_NAMESPACE
 
 bool HttpParser::extractHeaderAndBody(QByteArray &httpMessage)
 {
-    int index = httpMessage.indexOf(HTTP::END_OF_MENSAGE);
+    int index = httpMessage.indexOf(HTTP::END_OF_MESSAGE);
     if(index != -1)
     {
         index += 4;