Skip to content

Commit

Permalink
Merge pull request #1331 from fnc12/release-v1.9
Browse files Browse the repository at this point in the history
Release v1.9
  • Loading branch information
fnc12 authored Aug 24, 2024
2 parents ff7c878 + 64342a0 commit 6630268
Show file tree
Hide file tree
Showing 249 changed files with 24,427 additions and 9,399 deletions.
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
AttributeMacros: [SQLITE_ORM_CPP_LIKELY, SQLITE_ORM_CPP_UNLIKELY]
StatementMacros:
- __pragma
- _Pragma
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
TabWidth: 4
UseTab: Never
...

4 changes: 2 additions & 2 deletions .github/workflows/clang-format-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: clang-format lint
uses: DoozyX/clang-format-lint-action@v0.15
uses: DoozyX/clang-format-lint-action@v0.16.2
with:
clangFormatVersion: 15
clangFormatVersion: 16
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ cmake-build-debug/
.idea/

/compile
build
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SQLite ORM light header only library for modern C++. Please read the license pre
* **No raw string queries**
* **Intuitive syntax**
* **Comfortable interface - one code line per single query**
* **Built with modern C++14 features (no macros and external scripts)**
* **Built with modern C++14/C++17/C++20 features (no macros and external scripts)**
* **CRUD support**
* **Pure select query support**
* **Prepared statements support**
Expand Down Expand Up @@ -95,7 +95,7 @@ auto storage = make_storage("db.sqlite",
make_column("name", &UserType::name, default_value("name_placeholder"))));
```

Too easy isn't it? You do not have to specify mapped type explicitly - it is deduced from your member pointers you pass during making a column (for example: `&User::id`). To create a column you have to pass two arguments at least: its name in the table and your mapped class member pointer. You can also add extra arguments to tell your storage about column's constraints like `primary_key`, `autoincrement`, `default_value`, `unique` or `generated_always_as` (order isn't important; `not_null` is deduced from type automatically).
Too easy isn't it? You do not have to specify mapped type explicitly - it is deduced from your member pointers you pass during making a column (for example: `&User::id`). To create a column you have to pass two arguments at least: its name in the table and your mapped class member pointer. You can also add extra arguments to tell your storage about column's constraints like `primary_key`, `autoincrement`, `default_value`, `unique` or `generated_always_as` (order isn't important; `not_null`/`null` are deduced from type automatically but can be added manually if you wish with `null()` and `not_null()`).

More details about making storage can be found in [tutorial](https://github.com/fnc12/sqlite_orm/wiki/Making-a-storage).

Expand Down Expand Up @@ -686,7 +686,7 @@ storage.transaction([&] () mutable { // mutable keyword allows make non-cons

The second way guarantees that `commit` or `rollback` will be called. You can use either way.

Trancations are useful with `changes` sqlite function that returns number of rows modified.
Transactions are useful with `changes` sqlite function that returns number of rows modified.

```c++
storage.transaction([&] () mutable {
Expand Down
15 changes: 8 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ environment:
CC: clang
CXX: clang++
SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
cmake_build_parallel: --parallel
# clang was stuck with a parallel build
cmake_build_parallel: ""

- job_name: gcc, C++17
appveyor_build_worker_image: Ubuntu
Expand Down Expand Up @@ -107,12 +108,12 @@ for:
install:
- |-
cd C:\Tools\vcpkg
git fetch --tags && git checkout 2023.01.09
git fetch --tags && git checkout 2024.06.15
cd %APPVEYOR_BUILD_FOLDER%
C:\Tools\vcpkg\bootstrap-vcpkg.bat -disableMetrics
C:\Tools\vcpkg\vcpkg integrate install
set VCPKG_DEFAULT_TRIPLET=%platform%-windows
vcpkg install sqlite3
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex]
rem The Visual Studio 2017 build worker image comes with CMake 3.16 only, and sqlite_orm will build the Catch2 dependency from source
if not "%appveyor_build_worker_image%"=="Visual Studio 2017" (vcpkg install catch2)
before_build:
Expand Down Expand Up @@ -140,11 +141,11 @@ for:
install:
- |-
pushd $HOME/vcpkg
git fetch --tags && git checkout 2023.01.09
git fetch --tags && git checkout 2024.06.15
popd
$HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
$HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
vcpkg install sqlite3 catch2 --overlay-triplets=vcpkg/triplets
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] catch2 --overlay-triplets=vcpkg/triplets
before_build:
- |-
mkdir compile
Expand All @@ -168,10 +169,10 @@ for:
# using custom vcpkg triplets for building and linking dynamic dependent libraries
install:
- |-
git clone --depth 1 --branch 2023.01.09 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
git clone --depth 1 --branch 2024.06.15 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
$HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
$HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
vcpkg install sqlite3 catch2 --overlay-triplets=vcpkg/triplets
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] catch2 --overlay-triplets=vcpkg/triplets
before_build:
- |-
mkdir compile
Expand Down
Loading

0 comments on commit 6630268

Please sign in to comment.