Merge pull request #818 from fnc12/dev

v1.7
fnc12 · Oct 28, 2021 · 115c6f6 · 115c6f6
2 parents 1ee0a86 + 75c5c62
commit 115c6f6
Show file tree

Hide file tree

Showing 217 changed files with 24,581 additions and 9,673 deletions.
diff --git a/.clang-format b/.clang-format
@@ -54,7 +54,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DerivePointerAlignment: false
+DerivePointerAlignment: true
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: false
@@ -94,7 +94,6 @@ PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
 ReflowComments:  false
 SortIncludes:    false
 SortUsingDeclarations: true

diff --git a/.github/workflows/clang-format-lint.yaml b/.github/workflows/clang-format-lint.yaml
@@ -9,4 +9,6 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: clang-format lint
-      uses: DoozyX/[email protected]
+      uses: DoozyX/[email protected]
+      with:
+        clangFormatVersion: 12
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 # Defaults
 os: linux
-dist: bionic
+dist: focal
 
 matrix:
   include:
@@ -38,52 +38,49 @@ matrix:
       env:
         - SQLITE_ORM_OMITS_CODECVT: ON
 
-#    - name: "[C++14] AppleClang-10.0.1"
-#      os: osx
-#      osx_image: xcode10.2
-#      language: cpp
-#      env:
-#        - SQLITE_ORM_OMITS_CODECVT: ON
-#      addons:
-#        homebrew:
-#          packages:
-#            - catch2
-#            - ninja
-#          update: true
+    - name: "[C++14] AppleClang-10.0.1"
+      os: osx
+      osx_image: xcode10.2
+      language: cpp
+      env:
+        - SQLITE_ORM_OMITS_CODECVT: ON
+      addons:
+        homebrew:
+          packages:
+            - ninja
+          update: true
 
-#    - name: "[C++14] LLVM/Clang (latest)"
-#      os: osx
-#      osx_image: xcode10.2
-#      addons:
-#        homebrew:
-#          packages:
-#            - llvm
-#            - catch2
-#            - ninja
-#          update: true
-#      env:
-#        - CPPFLAGS: "-I/usr/local/opt/llvm/include"
-#        - LDFLAGS: "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"
-#        - CPATH: /usr/local/opt/llvm/include
-#        - LIBRARY_PATH: /usr/local/opt/llvm/lib
-#        - LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
-#        - CC: /usr/local/opt/llvm/bin/clang
-#        - CXX: /usr/local/opt/llvm/bin/clang++
-#        - SQLITE_ORM_OMITS_CODECVT: ON
+    - name: "[C++14] LLVM/Clang (latest)"
+      os: osx
+      osx_image: xcode10.2
+      addons:
+        homebrew:
+          packages:
+            - llvm
+            - ninja
+          update: true
+      env:
+        - CPPFLAGS: "-I/usr/local/opt/llvm/include"
+        - LDFLAGS: "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"
+        - CPATH: /usr/local/opt/llvm/include
+        - LIBRARY_PATH: /usr/local/opt/llvm/lib
+        - LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
+        - CC: /usr/local/opt/llvm/bin/clang
+        - CXX: /usr/local/opt/llvm/bin/clang++
+        - SQLITE_ORM_OMITS_CODECVT: ON
 
-#    - name: "[C++14] GCC-6"
-#      os: osx
-#      osx_image: xcode10.2
-#      addons:
-#        homebrew:
-#          packages:
-#            - gcc@6
-#            - catch2
-#            - ninja
-#          update: true
-#      env:
-#        - CC: gcc-6
-#        - CXX: g++-6
+    - name: "[C++14] GCC-6"
+      os: osx
+      osx_image: xcode10.2
+      addons:
+        homebrew:
+          packages:
+            - gcc@6
+            - ninja
+          update: true
+      env:
+        - CC: gcc-6
+        - CXX: g++-6
 
     - name: "[C++17] GCC-9"
       addons:
@@ -111,52 +108,41 @@ matrix:
         - CXX: g++-7
         - SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
 
-#    - name: "[C++17] AppleClang-10.0.1"
-#      os: osx
-#      osx_image: xcode10.2
-#      language: cpp
-#      env:
-#        - SQLITE_ORM_OMITS_CODECVT: ON
-#        - SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
-#      addons:
-#        homebrew:
-#          packages:
-#            - catch2
-#            - ninja
-#          update: true
+    - name: "[C++17] AppleClang-10.0.1"
+      os: osx
+      osx_image: xcode10.2
+      language: cpp
+      env:
+        - SQLITE_ORM_OMITS_CODECVT: ON
+        - SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
+      addons:
+        homebrew:
+          packages:
+            - ninja
+          update: true
 
-#    - name: "[C++17] LLVM/Clang (latest)"
-#      os: osx
-#      osx_image: xcode10.2
-#      addons:
-#        homebrew:
-#          packages:
-#            - llvm
-#            - catch2
-#            - ninja
-#          update: true
-#      env:
-#        - CPPFLAGS: "-I/usr/local/opt/llvm/include"
-#        - LDFLAGS: "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"
-#        - CPATH: /usr/local/opt/llvm/include
-#        - LIBRARY_PATH: /usr/local/opt/llvm/lib
-#        - LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
-#        - CC: /usr/local/opt/llvm/bin/clang
-#        - CXX: /usr/local/opt/llvm/bin/clang++
-#        - SQLITE_ORM_OMITS_CODECVT: ON
-#        - SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
+    - name: "[C++17] LLVM/Clang (latest)"
+      os: osx
+      osx_image: xcode10.2
+      addons:
+        homebrew:
+          packages:
+            - llvm
+            - ninja
+          update: true
+      env:
+        - CPPFLAGS: "-I/usr/local/opt/llvm/include"
+        - LDFLAGS: "-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"
+        - CPATH: /usr/local/opt/llvm/include
+        - LIBRARY_PATH: /usr/local/opt/llvm/lib
+        - LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
+        - CC: /usr/local/opt/llvm/bin/clang
+        - CXX: /usr/local/opt/llvm/bin/clang++
+        - SQLITE_ORM_OMITS_CODECVT: ON
+        - SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
 
 before_install:
-  - |
-    if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
-      export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" # Use coreutils from homebrew.
-    fi
-  # Add ppa repo for cmake and delete cmake 3.12.4 folder of travis
-  - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
-  - sudo apt-add-repository -y 'deb https://apt.kitware.com/ubuntu/ bionic main'
-  - sudo apt-get update -qq -y
-  - sudo apt-get install -y cmake
-  - sudo rm -r /usr/local/cmake-3.12.4/
+  - if [[ ${TRAVIS_OS_NAME} == "osx" ]]; then export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"; fi
 
 # scripts to run before build
 before_script:
@@ -168,4 +154,4 @@ before_script:
 # build examples, and run tests (ie make & make test)
 script:
   - cmake --build . --config Debug -- -k 10
-  - ctest --verbose --output-on-failure -C Debug -j $(nproc)
+  - ctest --verbose --output-on-failure -C Debug -j $(nproc)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,12 @@
-cmake_minimum_required (VERSION 3.16.0)
+cmake_minimum_required (VERSION 3.14.0)
+
+# PACKAGE_VERSION is used by cpack scripts currently
+# Both sqlite_orm_VERSION and PACKAGE_VERSION should be the same for now
+
+set(sqlite_orm_VERSION "1.6.0")
+set(PACKAGE_VERSION ${sqlite_orm_VERSION})
+
+project("sqlite_orm" VERSION ${PACKAGE_VERSION})
 
 # Handling C++ standard version to use
 option(SQLITE_ORM_ENABLE_CXX_17 "Enable C++ 17" OFF)
@@ -14,15 +22,6 @@ endif()
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 
-# PACKAGE_VERSION is used by cpack scripts currently
-# Both sqlite_orm_VERSION and PACKAGE_VERSION should be the same for now
-
-set(sqlite_orm_VERSION "1.3.0")
-set(PACKAGE_VERSION ${sqlite_orm_VERSION})
-
-project("sqlite_orm" VERSION ${PACKAGE_VERSION})
-
-
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 message(STATUS "Configuring ${CMAKE_PROJECT_NAME} ${sqlite_orm_VERSION}")
@@ -54,6 +53,7 @@ if (MSVC)
 	string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")	
 	add_compile_options(/EHsc)
 	add_compile_options(/Zc:__cplusplus)
+	add_compile_options(/MP) # Allow multi parrallel build
 
 	if ("${CMAKE_GENERATOR}" MATCHES "(Win64|x64)")
 		message(STATUS "Add /bigobj flag to compiler")

diff --git a/COMM-LICENSE b/COMM-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2012-2021 Scott Chacon and others
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ Instructions:
 
 ## If you want to build the project locally ##
 
-See our detailed instructions on the [CMake README](/build/cmake/README.md).
+See our detailed instructions on the [CMake README](https://github.com/fnc12/sqlite_orm#usage).
 
 ## If you want to review open issues... ##