commit 3eae124b49334acf5068038e40189b33a343ca56
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Mon Sep 28 19:44:52 2015 +0200

    ci

diff --git a/.travis.yml b/.travis.yml
index 9fe926a..0c707dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,25 +9,25 @@ env:
 
 install:
   - lsb_release -a
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-         sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
+    #  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+    sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
       && sudo apt-add-repository -y ppa:beineri/opt-qt541
       && sudo apt-get -qq update
-      && sudo apt-get -qq install g++-4.8 libc6-i386 qt54tools qt54svg qt54webkit qt54script
-      && export CXX="g++-4.8"
-      && export CC="gcc-4.8"
+      && sudo apt-get -qq install g++-4.9 libc6-i386 qt54base qt54tools qt54svg qt54webkit qt54script
+      && export CXX="g++-4.9"
+      && export CC="gcc-4.9"
       ;
-    else
-         brew update
-      && brew install qt5
-      && brew install qt5-qmake
-      && chmod -R 755 /usr/local/opt/qt5/*
-      ;
-    fi
+      #    else
+      #   brew update
+      #&& brew install qt5
+      #&& brew install qt5-qmake
+      #&& chmod -R 755 /usr/local/opt/qt5/*
+      #;
+      #fi
 
 script:
   - /opt/qt54/bin/qt54-env.sh 
-  - echo "#define BUILD ""$TRAVIS_BUILD_NUMBER" > build_number.h
+    #  - echo "#define BUILD ""$TRAVIS_BUILD_NUMBER" > build_number.h
   - /opt/qt54/bin/qmake EntityManager.pro -r "CONFIG+=release"
   - make
   - make check
diff --git a/appveyor.yml b/appveyor.yml
index 7bd94b5..2407033 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,15 +5,15 @@ os: unstable
 install:
   - set QTDIR=C:\Qt\5.4\mingw491_32
   - set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin
-  - set RELEASE_PATH=appveyor\release
+    #  - set RELEASE_PATH=appveyor\release
 
 build_script:
   # using a header file without MemoryBarrier, that causes the build to fail
-  - qmake EntityManager.pro -r -spec win32-g++
+  - qmake EntityManager.pro "CONFIG+=release"
 #  - qmake QOwnNotes.pro -r -spec win32-g++ "CONFIG+=debug"
-  - mingw32-make
+  - mingw32-make -j8
   # creating the release path
-  - md ..\%RELEASE_PATH%
+  #  - md ..\%RELEASE_PATH%
   # copy the binary to our release path
   #- copy release\CuteEntityManager.dll ..\%RELEASE_PATH%
   #- cd ..\%RELEASE_PATH%
diff --git a/src/relation.h b/src/relation.h
index 886adfe..6a88317 100644
--- a/src/relation.h
+++ b/src/relation.h
@@ -23,12 +23,12 @@ enum class RelationType {
     ONE_TO_MANY = 1, //@OneToMany(cascade=ALL, mappedBy="customer") e.g. QList<QSharedPointer<Person>>
     MANY_TO_ONE = 2, //e.g. QSharedPointer<Person>
     //1-n  Entity foreign key in same table
-    MANY_TO_MANY = 3, //e.g. QList<QSharedPointer<Person>> - realized with seperated database table
+    MANY_TO_MANY = 3 //e.g. QList<QSharedPointer<Person>> - realized with seperated database table
 };
 
 enum class InheritanceStrategy {
     PER_CLASS_TABLE,
-    JOINED_TABLE,
+    JOINED_TABLE
 };
 
 enum class CascadeType {
@@ -36,7 +36,7 @@ enum class CascadeType {
     MERGE,
     PERSIST,
     REFRESH,
-    REMOVE,
+    REMOVE
 };
 
 class Relation {