cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-07 11:16:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor code formating changes & comments

Browse Source
This commit is contained in:
Sébastien Rombauts 2023-05-24 18:31:05 +02:00
parent 4bb70c19b8
commit cf3b75063b
15 changed files with 247 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

460
CHANGELOG.md
View File

@ -1,230 +1,230 @@
2012 Mar 30 2012 Mar 30
- Start of a new thin C++ SQLite wrapper - Start of a new thin C++ SQLite wrapper
2012 Apr 2 2012 Apr 2
- The wrapper is functional - The wrapper is functional
- Added documentation and examples - Added documentation and examples
- Publication on GitHub - Publication on GitHub
Version 0.1.0 - 2012 Apr 4 Version 0.1.0 - 2012 Apr 4
- Added a Database::exec() method to execute simple SQL statement - Added a Database::exec() method to execute simple SQL statement
- Added a version number like in sqlite3.h, starting with 0.1.0 - Added a version number like in sqlite3.h, starting with 0.1.0
Version 0.2.0 - 2012 Apr 11 Version 0.2.0 - 2012 Apr 11
- Added getLastInsertId() and setBusyTimout() - Added getLastInsertId() and setBusyTimout()
- Added bind() by name methods - Added bind() by name methods
Version 0.3.0 - 2012 Apr 16 Version 0.3.0 - 2012 Apr 16
- Added an easy wrapper Database::execAngGet() - Added an easy wrapper Database::execAngGet()
Version 0.4.0 - 2012 Apr 23 Version 0.4.0 - 2012 Apr 23
- Added a Database::tableExists() easy to use function - Added a Database::tableExists() easy to use function
Dec 10 2012 Dec 10 2012
- Added a Statement::exec() method to execute a one-step query with no expected result - Added a Statement::exec() method to execute a one-step query with no expected result
Version 0.5.0 - 2013 March 9 Version 0.5.0 - 2013 March 9
- Added assert() on errors on destructors - Added assert() on errors on destructors
- Added getBytes() - Added getBytes()
- Added getBlob(), getType() and isInteger/isFloat/isText/isBlob/isNull - Added getBlob(), getType() and isInteger/isFloat/isText/isBlob/isNull
- Added bind() for binary blob data - Added bind() for binary blob data
Version 0.5.1 - 2013 April 7 Version 0.5.1 - 2013 April 7
- Added Column::getName() - Added Column::getName()
Version 0.6.0 - 2013 November 22 Version 0.6.0 - 2013 November 22
- Renamed Column::getName() to Column::getOriginName() - Renamed Column::getName() to Column::getOriginName()
- Added Column::getName() - Added Column::getName()
Version 0.7.0 - 2014 January 9 Version 0.7.0 - 2014 January 9
- Added Database::createFunction() - Added Database::createFunction()
- Added std::string version of existing APIs - Added std::string version of existing APIs
- Improved CMake with more build options and Doxygen auto-detection - Improved CMake with more build options and Doxygen auto-detection
Version 0.8.0 - 2014 February 26 Version 0.8.0 - 2014 February 26
- Database constructor support opening a database with a custom VFS (default to NULL) - Database constructor support opening a database with a custom VFS (default to NULL)
- Changed Column::getText() to return empty string "" by default instead of NULL pointer (to handle std::string conversion) - Changed Column::getText() to return empty string "" by default instead of NULL pointer (to handle std::string conversion)
Version 1.0.0 - 2015 May 3 Version 1.0.0 - 2015 May 3
- Public headers file moved to include/ dir - Public headers file moved to include/ dir
- Added support to biicode in CMakeLists.txt - Added support to biicode in CMakeLists.txt
- Added Unit Tests - Added Unit Tests
- Added aBusyTimeoutMs parameter to Database() constructors - Added aBusyTimeoutMs parameter to Database() constructors
- Added Database::getTotalChanges() - Added Database::getTotalChanges()
- Added Database::getErrorCode() - Added Database::getErrorCode()
- Added Statement::clearBindings() - Added Statement::clearBindings()
- Added Statement::getColumn(aName) - Added Statement::getColumn(aName)
- Added Statement::getErrorCode() - Added Statement::getErrorCode()
- Added Statement::getColumnName(aIndex) - Added Statement::getColumnName(aIndex)
- Added Statement::getColumnOriginName(aIndex) - Added Statement::getColumnOriginName(aIndex)
Version 1.1.0 - 2015 May 18 Version 1.1.0 - 2015 May 18
- Fixed valgrind error on Database destructor - Fixed valgrind error on Database destructor
- Added Database::loadExtension - Added Database::loadExtension
Version 1.2.0 - 2015 September 9 Version 1.2.0 - 2015 September 9
- Fixed build with GCC 5.1.0 - Fixed build with GCC 5.1.0
- Fixed MSVC release build warning - Fixed MSVC release build warning
- Fixed CppDepends warnings - Fixed CppDepends warnings
- Updated documentation on installation - Updated documentation on installation
- Added Database::getHandle() - Added Database::getHandle()
Version 1.3.0 - 2015 November 1 Version 1.3.0 - 2015 November 1
- Fixed build with Visual Studio 2015 - Fixed build with Visual Studio 2015
- Further improvements to README - Further improvements to README
- Added Backup class - Added Backup class
Version 1.3.1 - 2016 February 10 Version 1.3.1 - 2016 February 10
- Switch Linux/Mac build to the provided SQLite3 C library - Switch Linux/Mac build to the provided SQLite3 C library
- Update SQLite3 from 3.8.8.3 to latest 3.10.2 (2016-01-20) - Update SQLite3 from 3.8.8.3 to latest 3.10.2 (2016-01-20)
- Remove warnings - Remove warnings
- Remove biicode support (defunct service, servers will shutdown the 16th of February 2016) - Remove biicode support (defunct service, servers will shutdown the 16th of February 2016)
Version 2.0.0 - 2016 July 25 Version 2.0.0 - 2016 July 25
- Update SQLite3 from 3.10.2 to latest 3.13 (2016-05-18) - Update SQLite3 from 3.10.2 to latest 3.13 (2016-05-18)
- Move #include <sqlite3.h> from headers to .cpp files only using forward declarations - Move #include <sqlite3.h> from headers to .cpp files only using forward declarations
- Add Database::VERSION to reach SQLITE_VERSION without including sqlite3.h in application code - Add Database::VERSION to reach SQLITE_VERSION without including sqlite3.h in application code
- Add getLibVersion() and getLibVersionNumber() to get runtime version of the library - Add getLibVersion() and getLibVersionNumber() to get runtime version of the library
- Better exception messages when Statements fail PR #84 - Better exception messages when Statements fail PR #84
- Variadic templates for bind() (C++14) PR #85 - Variadic templates for bind() (C++14) PR #85
- Add Statement::bindNoCopy() methods for strings, using SQLITE_STATIC to avoid internal copy by SQLite3 PR #86 - Add Statement::bindNoCopy() methods for strings, using SQLITE_STATIC to avoid internal copy by SQLite3 PR #86
- Add Statement::bind() overload for uint32_t, and Column::getUint() and cast operator to uint32_t PR #86 - Add Statement::bind() overload for uint32_t, and Column::getUint() and cast operator to uint32_t PR #86
- Use the new SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION from SQLite 3.13 for security reason - Use the new SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION from SQLite 3.13 for security reason
- Rename Backup::remainingPageCount()/totalPageCount() to Backup::getRemainingPageCount()/getTotalPageCount() - Rename Backup::remainingPageCount()/totalPageCount() to Backup::getRemainingPageCount()/getTotalPageCount()
- Remove Column::errmsg() method : use Database or Statement equivalents - Remove Column::errmsg() method : use Database or Statement equivalents
- More unit tests, with code coverage status on the GitHub page - More unit tests, with code coverage status on the GitHub page
- Do not force MSVC to use static runtime if unit-tests are not build - Do not force MSVC to use static runtime if unit-tests are not build
Version 2.1.0 - 2017 July 18 Version 2.1.0 - 2017 July 18
- Update SQLite3 from 3.13 to latest 3.19.3 (2017-06-08) - Update SQLite3 from 3.13 to latest 3.19.3 (2017-06-08)
- Fixed Incompatibility in 3.19.0 (to use older SQLite version set the CMake variable SQLITE_USE_LEGACY_STRUCT) #125 - Fixed Incompatibility in 3.19.0 (to use older SQLite version set the CMake variable SQLITE_USE_LEGACY_STRUCT) #125
- Fixed link error (inline in cpp) and compiler warnings (unused variable...) #96 - Fixed link error (inline in cpp) and compiler warnings (unused variable...) #96
- Added ability to open encrypted databases (using SQLCipher, eg. libsqlcipher-dev) #107 - Added ability to open encrypted databases (using SQLCipher, eg. libsqlcipher-dev) #107
- Added convenience functions for constructing objects from a row #114 - Added convenience functions for constructing objects from a row #114
- Added CMake install step #118 - Added CMake install step #118
- Fix warnings #119 - Fix warnings #119
- Make cpplint.py Python-3 compatible #120 - Make cpplint.py Python-3 compatible #120
- Link libssp when targeted #100 - Link libssp when targeted #100
- Removed redundant const #102 - Removed redundant const #102
Version 2.2.0 - 2017 Sept 19 Version 2.2.0 - 2017 Sept 19
- Update SQLite3 from 3.19.3 to latest 3.20.1 (2017-08-24) #143 - Update SQLite3 from 3.19.3 to latest 3.20.1 (2017-08-24) #143
- Added tryExecuteStep and tryReset #142 - Added tryExecuteStep and tryReset #142
- Removed virtual keywords from destructors #140 - Removed virtual keywords from destructors #140
- Removed misplaced noexcept keyword #139 - Removed misplaced noexcept keyword #139
- Improved Exception class C++ conformance #138 - Improved Exception class C++ conformance #138
- Fix warnings #134 - Fix warnings #134
- Deprecated Statement::isOk() to Statement::hasRow() - Deprecated Statement::isOk() to Statement::hasRow()
Version 2.3.0 - 2019 March 3 Version 2.3.0 - 2019 March 3
- Update SQLite3 from 3.20.1 to latest 3.27.2 (2019-02-25) #183 #187 - Update SQLite3 from 3.20.1 to latest 3.27.2 (2019-02-25) #183 #187
- Add Statement binding for long int values #147 - Add Statement binding for long int values #147
- Allows long int for bind when used with name #148 - Allows long int for bind when used with name #148
- More cmake instructions for Linux #151 - More cmake instructions for Linux #151
- Add comparison with sqlite_orm #141 - Add comparison with sqlite_orm #141
- Fix Statement::bind truncates long integer to 32 bits on x86_64 Linux #155 - Fix Statement::bind truncates long integer to 32 bits on x86_64 Linux #155
- Add a move constructor to Database #157 - Add a move constructor to Database #157
- Added tests for all MSVC compilers available on AppVeyor (2013, 2015, 2017) #169 - Added tests for all MSVC compilers available on AppVeyor (2013, 2015, 2017) #169
- Update VariadicBind.h #172 - Update VariadicBind.h #172
- Better CMake compatibility #170 - Better CMake compatibility #170
- Add implicit cast operator to char and short types #179 #180 - Add implicit cast operator to char and short types #179 #180
Version 2.4.0 - 2019 August 25 Version 2.4.0 - 2019 August 25
- Update SQLite3 from 3.27.2 to 3.29.0 (2019-07-10) #217 - Update SQLite3 from 3.27.2 to 3.29.0 (2019-07-10) #217
- #191 CMake Warning line 299 - #191 CMake Warning line 299
- #190 Implement move constructors - #190 Implement move constructors
- #192 Add wrapper for bind parameter count - #192 Add wrapper for bind parameter count
- #197 Add tuple_bind and execute_many (requested by #24) - #197 Add tuple_bind and execute_many (requested by #24)
- #199 Fix #156 misleading error message in exception from Statement::exec - #199 Fix #156 misleading error message in exception from Statement::exec
- #201 Add Statement::getExpandedSQL() to get the SQL text of prepared statement with bound parameters expanded - #201 Add Statement::getExpandedSQL() to get the SQL text of prepared statement with bound parameters expanded
- #211 Implement Database::backup() - #211 Implement Database::backup()
- #215 Disable implicit fallthrough warning when building internal sqlite3 - #215 Disable implicit fallthrough warning when building internal sqlite3
- #216 Set PROJECT_VERSION to fix CMP0048 Policy warnings - #216 Set PROJECT_VERSION to fix CMP0048 Policy warnings
Version 2.5.0 - 2019 December 31 Version 2.5.0 - 2019 December 31
- Update SQLite3 from 3.29.0 to 3.30.1 (2019-10-10) - Update SQLite3 from 3.29.0 to 3.30.1 (2019-10-10)
- 100% Unit Test coverage - 100% Unit Test coverage
- #212 fix sqlite3 compile properties (jzt) - #212 fix sqlite3 compile properties (jzt)
- #219 Disable cast-function-type warning when building internal sqlite (zxey) - #219 Disable cast-function-type warning when building internal sqlite (zxey)
- #230 Fixed installation on other than Ubuntu GNU/Linux distributions (xvitaly) - #230 Fixed installation on other than Ubuntu GNU/Linux distributions (xvitaly)
- #228 use transitive compile definitions via cmake (BioDataAnalysis/emmenlau) - #228 use transitive compile definitions via cmake (BioDataAnalysis/emmenlau)
- #232 Added support of packaged GTest for running unit tests (xvitaly) - #232 Added support of packaged GTest for running unit tests (xvitaly)
- #231 Added SOVERSION field for shared library (xvitaly) - #231 Added SOVERSION field for shared library (xvitaly)
- #229 Explicitly find and link against system sqlite library (xvitaly) - #229 Explicitly find and link against system sqlite library (xvitaly)
- #235 Added support for cmake dependencies and version information (BioDataAnalysis/emmenlau) - #235 Added support for cmake dependencies and version information (BioDataAnalysis/emmenlau)
- #249 Added SQLite header parsing functionality and associated tests (patrick--) - #249 Added SQLite header parsing functionality and associated tests (patrick--)
- #251 Added example for getHeaderInfo() - #251 Added example for getHeaderInfo()
Version 3.0.0 - 2020 January 31 Version 3.0.0 - 2020 January 31
- C++11 is now required - C++11 is now required
- CMake 3.1 minimum - CMake 3.1 minimum
- Visual Studio 2015 minimum - Visual Studio 2015 minimum
- Update Googletest to latest release 1.10 - Update Googletest to latest release 1.10
- Add Github Actions continuous integration solution - Add Github Actions continuous integration solution
- Add Valgrind memcheck tool to Travis CI - Add Valgrind memcheck tool to Travis CI
- Remove Statement::isOk() deprecated in 2.2.0 when renamed to Statement::hasRow() - Remove Statement::isOk() deprecated in 2.2.0 when renamed to Statement::hasRow()
- Replace Database::backup() "C" implementation by calling the Backup class - Replace Database::backup() "C" implementation by calling the Backup class
- #252 Run Valgrind memcheck on Travis CI - #252 Run Valgrind memcheck on Travis CI
- #253 Keep inline functions for GCov code coverage - #253 Keep inline functions for GCov code coverage
- #254 Re-enable Coverity static analysis - #254 Re-enable Coverity static analysis
- #256 Fix linking with system library (libsqlite3) - #256 Fix linking with system library (libsqlite3)
- #242 Added a `getIndex` method and used it (KOLANICH) - #242 Added a `getIndex` method and used it (KOLANICH)
- #257 Improve Statement unit tests coverage (bind by name with a std::string) - #257 Improve Statement unit tests coverage (bind by name with a std::string)
- #234 support for external sqlite3 (BioDataAnalysis/emmenlau) - #234 support for external sqlite3 (BioDataAnalysis/emmenlau)
- #243 adding a pure attribute to getIndex() (KOLANICH) - #243 adding a pure attribute to getIndex() (KOLANICH)
Version 3.1.0 - 2020 August 11 Version 3.1.0 - 2020 August 11
- Update SQLite3 from 3.30.1 to 3.32.3 (2020-06-18) - Update SQLite3 from 3.30.1 to 3.32.3 (2020-06-18)
- #274 Install both cmake files into same lib directory from tcraigtyler - #274 Install both cmake files into same lib directory from tcraigtyler
- #275 Add a method on Statement to get the declared type of a column. from daniel-schmidt - #275 Add a method on Statement to get the declared type of a column. from daniel-schmidt
- #284 Add SQLITE_OPEN_FULLMUTEX flag from rwrx - #284 Add SQLITE_OPEN_FULLMUTEX flag from rwrx
- #286 Add CMake option to toggle stack protection from chrisdalke - #286 Add CMake option to toggle stack protection from chrisdalke
- #287 Fixed installation on other than Ubuntu distributions from xvitaly - #287 Fixed installation on other than Ubuntu distributions from xvitaly
- #288 Allow building of sqlite JSON1 extension when building internal sqlite library from zxey - #288 Allow building of sqlite JSON1 extension when building internal sqlite library from zxey
Version 3.1.1 - 2020 August 19 Version 3.1.1 - 2020 August 19
- #292 Fix compilation if using SQLITE_HAS_CODEC from sum01 - #292 Fix compilation if using SQLITE_HAS_CODEC from sum01
- #293 Remove FindSQLiteCpp.cmake from sum01 - #293 Remove FindSQLiteCpp.cmake from sum01
Version 3.2.0 - 2022 Septembre 18 Version 3.2.0 - 2022 Septembre 18
- #300 #316 #362 #368 Updated SQLite3 from 3.32.3 to 3.39.3 (2022-09-05) - #300 #316 #362 #368 Updated SQLite3 from 3.32.3 to 3.39.3 (2022-09-05)
- #236 Disable explicit setting of MSVC runtime from BioDataAnalysis/emmenlau - #236 Disable explicit setting of MSVC runtime from BioDataAnalysis/emmenlau
- #308 Fix build warning due to string truncation from stauffer-garmin - #308 Fix build warning due to string truncation from stauffer-garmin
- #311 Add Database::tryExec() from kcowolf - #311 Add Database::tryExec() from kcowolf
- #313 [CMake] Add SQLITECPP_INCLUDE_SCRIPT option from past-due - #313 [CMake] Add SQLITECPP_INCLUDE_SCRIPT option from past-due
- #314 Add Database constructor for filesystem::path (#296) from ptrks - #314 Add Database constructor for filesystem::path (#296) from ptrks
- #295 Compile internal SQLite library with -ffunction-sections from smichaku - #295 Compile internal SQLite library with -ffunction-sections from smichaku
- #299 Added Savepoint support from catalogm - #299 Added Savepoint support from catalogm
- #333 Added Database and Statement getChanges() - #333 Added Database and Statement getChanges()
- #305 Add other constants that work with sqlite3_open_v2 from LuAPi/more-flags - #305 Add other constants that work with sqlite3_open_v2 from LuAPi/more-flags
- #333 Added Database and Statement method getChanges() from SRombauts/get-changes - #333 Added Database and Statement method getChanges() from SRombauts/get-changes
- #334 fix link for HAS_CODEC from linux-fan-dave/master - #334 fix link for HAS_CODEC from linux-fan-dave/master
- #338 fix load extension from paulo-coutinho/fix-load-extension - #338 fix load extension from paulo-coutinho/fix-load-extension
- #335 from jagerman/older-macos-avoid-std-filesystem - #335 from jagerman/older-macos-avoid-std-filesystem
- #337 Add catkin configuration from ardabbour/master - #337 Add catkin configuration from ardabbour/master
- #339 Allow specifying transaction behaviors DEFERRED, IMMEDIATE, and EXCLUSIVE from jjenkins278/transaction_behavior - #339 Allow specifying transaction behaviors DEFERRED, IMMEDIATE, and EXCLUSIVE from jjenkins278/transaction_behavior
- #340 add HTML keywords and properly link up the links in docs/README.md from phoebe-leong/patch-1 - #340 add HTML keywords and properly link up the links in docs/README.md from phoebe-leong/patch-1
- #341 Install the package.xml file from ardabbour/patch-1 - #341 Install the package.xml file from ardabbour/patch-1
- #352 add basic meson support from ninjaoflight/meson-support - #352 add basic meson support from ninjaoflight/meson-support
- #349 Refactoring of Statement and Column classes from Kacperos155/refactoring-Statement&Column - #349 Refactoring of Statement and Column classes from Kacperos155/refactoring-Statement&Column
- #359 Fix compilation issues earlier than iOS 13 - #359 Fix compilation issues earlier than iOS 13
- #354 Windows improved support (meson) from ninjaoflight/windows-migration - #354 Windows improved support (meson) from ninjaoflight/windows-migration
- #361 Fix Statement unit test using long from SRombauts/fix-statement-unit-tests-long-long-type - #361 Fix Statement unit test using long from SRombauts/fix-statement-unit-tests-long-long-type
- #346 Add compatible definition for std::experimental::filesystem from guoh27/master - #346 Add compatible definition for std::experimental::filesystem from guoh27/master
- #364 Removal of remaining long APIs from SRombauts/convert-remaining-long-types - #364 Removal of remaining long APIs from SRombauts/convert-remaining-long-types
- #366 Add vcpkg installation instructions from FrankXie05/vcpkg-instructions - #366 Add vcpkg installation instructions from FrankXie05/vcpkg-instructions
- #360 Small improvements and code cleaning from Kacperos155/small_improvements - #360 Small improvements and code cleaning from Kacperos155/small_improvements
Versions 3.2.1 - 2022 Decembre 12 Versions 3.2.1 - 2022 Decembre 12
- Merge pull request #383 Update SQLite from 3.39.3 to 3.40.0 (2022-11-16) from SRombauts/update-sqlite-340 - Merge pull request #383 Update SQLite from 3.39.3 to 3.40.0 (2022-11-16) from SRombauts/update-sqlite-340
- Merge pull request #370 Don't link anymore with Visual Studio's static runtime by default from SRombauts/dont-enforce-static-linking - Merge pull request #370 Don't link anymore with Visual Studio's static runtime by default from SRombauts/dont-enforce-static-linking
- Merge pull request #371 from SRombauts/appveyor-vs-2022 - Merge pull request #371 from SRombauts/appveyor-vs-2022
- Merge pull request #277 from cuberite/cmake-scoping - Merge pull request #277 from cuberite/cmake-scoping
- Merge pull request #374 Update googletest from vuhailongkl97/master - Merge pull request #374 Update googletest from vuhailongkl97/master
- Merge pull request #377 Some documentation fixes from cbielow/fix_doc - Merge pull request #377 Some documentation fixes from cbielow/fix_doc
- Merge pull request #380 [Meson] fixes for meson project from ninjaoflight/windows-support - Merge pull request #380 [Meson] fixes for meson project from ninjaoflight/windows-support
- Merge pull request #387 Ensure that TEXT column is UTF-8 encoded before using sqlite3_column_blob() from dougnazar - Merge pull request #387 Ensure that TEXT column is UTF-8 encoded before using sqlite3_column_blob() from dougnazar
- Merge pull request #385 disable SQLITECPP_USE_STACK_PROTECTION when on MinGW from SRombauts/mingw-disable-stack-protection - Merge pull request #385 disable SQLITECPP_USE_STACK_PROTECTION when on MinGW from SRombauts/mingw-disable-stack-protection
- Merge pull request #386 [meson] Update SQLite from 3.39.3 to 3.40.0 from ninjaoflight/sqlite-meson-update - Merge pull request #386 [meson] Update SQLite from 3.39.3 to 3.40.0 from ninjaoflight/sqlite-meson-update
- Merge pull request #389 [meson] add missing compile options from ninjaoflight/meson-fixes - Merge pull request #389 [meson] add missing compile options from ninjaoflight/meson-fixes

4
build.bat
View File

@ -18,9 +18,9 @@ cmake --build .
ctest --output-on-failure ctest --output-on-failure
@if ERRORLEVEL 1 goto onError @if ERRORLEVEL 1 goto onError
goto onSuccess @goto onSuccess
:onError :onError
@echo An error occured! @echo An error occured!
:onSuccess :onSuccess
cd .. @cd ..

2
build.sh
View File

@ -10,7 +10,7 @@ set -e
mkdir -p build mkdir -p build
cd build cd build
# Generate a Makefile for GCC (or Clang, depanding on CC/CXX envvar) # Generate a Makefile for GCC (or Clang, depending on CC/CXX envvar)
cmake -DCMAKE_BUILD_TYPE=Debug -DSQLITECPP_USE_ASAN=ON -DSQLITECPP_USE_GCOV=OFF -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON .. cmake -DCMAKE_BUILD_TYPE=Debug -DSQLITECPP_USE_ASAN=ON -DSQLITECPP_USE_GCOV=OFF -DSQLITECPP_BUILD_EXAMPLES=ON -DSQLITECPP_BUILD_TESTS=ON ..
# Build (ie 'make') # Build (ie 'make')

9
include/SQLiteCpp/Assertion.h
View File

@ -12,7 +12,6 @@
#include <cassert> #include <cassert>
/** /**
* SQLITECPP_ASSERT SQLITECPP_ASSERT() is used in destructors, where exceptions shall not be thrown * SQLITECPP_ASSERT SQLITECPP_ASSERT() is used in destructors, where exceptions shall not be thrown
* *
@ -25,9 +24,10 @@
// if an assert handler is provided by user code, use it instead of assert() // if an assert handler is provided by user code, use it instead of assert()
namespace SQLite namespace SQLite
{ {
// declaration of the assert handler to define in user code
void assertion_failed(const char* apFile, const int apLine, const char* apFunc, // declaration of the assert handler to define in user code
const char* apExpr, const char* apMsg); void assertion_failed(const char* apFile, const int apLine, const char* apFunc,
const char* apExpr, const char* apMsg);
#ifdef _MSC_VER #ifdef _MSC_VER
#define __func__ __FUNCTION__ #define __func__ __FUNCTION__
@ -35,6 +35,7 @@ namespace SQLite
// call the assert handler provided by user code // call the assert handler provided by user code
#define SQLITECPP_ASSERT(expression, message) \ #define SQLITECPP_ASSERT(expression, message) \
if (!(expression)) SQLite::assertion_failed(__FILE__, __LINE__, __func__, #expression, message) if (!(expression)) SQLite::assertion_failed(__FILE__, __LINE__, __func__, #expression, message)
} // namespace SQLite } // namespace SQLite
#else #else

2
include/SQLiteCpp/Backup.h
View File

@ -125,7 +125,7 @@ private:
void operator()(sqlite3_backup* apBackup); void operator()(sqlite3_backup* apBackup);
}; };
std::unique_ptr<sqlite3_backup, Deleter> mpSQLiteBackup{}; ///< Pointer to SQLite Database Backup Handle std::unique_ptr<sqlite3_backup, Deleter> mpSQLiteBackup; ///< Pointer to SQLite Database Backup Handle
}; };
} // namespace SQLite } // namespace SQLite

4
include/SQLiteCpp/Column.h
View File

@ -228,8 +228,8 @@ public:
} }
private: private:
Statement::TStatementPtr mStmtPtr; ///< Shared Pointer to the prepared SQLite Statement Object Statement::TStatementPtr mStmtPtr; ///< Shared Pointer to the prepared SQLite Statement Object
int mIndex; ///< Index of the column in the row of result, starting at 0 int mIndex; ///< Index of the column in the row of result, starting at 0
}; };
/** /**

9
include/SQLiteCpp/Database.h
View File

@ -109,8 +109,8 @@ SQLITECPP_API extern const int OPEN_NOFOLLOW; // SQLITE_OPEN_NOFOLLOW
SQLITECPP_API extern const int OK; ///< SQLITE_OK (used by check() bellow) SQLITECPP_API extern const int OK; ///< SQLITE_OK (used by check() bellow)
SQLITECPP_API extern const char* const VERSION; ///< SQLITE_VERSION string from the sqlite3.h used at compile time SQLITECPP_API extern const char* const VERSION; ///< SQLITE_VERSION string from sqlite3.h used at compile time
SQLITECPP_API extern const int VERSION_NUMBER; ///< SQLITE_VERSION_NUMBER from the sqlite3.h used at compile time SQLITECPP_API extern const int VERSION_NUMBER; ///< SQLITE_VERSION_NUMBER from sqlite3.h used at compile time
/// Return SQLite version string using runtime call to the compiled library /// Return SQLite version string using runtime call to the compiled library
SQLITECPP_API const char* getLibVersion() noexcept; SQLITECPP_API const char* getLibVersion() noexcept;
@ -617,9 +617,8 @@ public:
private: private:
// TODO: perhaps switch to having Statement sharing a pointer to the Connexion // TODO: perhaps switch to having Statement sharing a pointer to the Connexion
std::unique_ptr<sqlite3, Deleter> mSQLitePtr; ///< Pointer to SQLite Database Connection Handle std::unique_ptr<sqlite3, Deleter> mSQLitePtr; ///< Pointer to SQLite Database Connection Handle
std::string mFilename; ///< UTF-8 filename used to open the database std::string mFilename; ///< UTF-8 filename used to open the database
}; };
} // namespace SQLite } // namespace SQLite

2
include/SQLiteCpp/Exception.h
View File

@ -20,7 +20,6 @@ struct sqlite3;
namespace SQLite namespace SQLite
{ {
/** /**
* @brief Encapsulation of the error message from SQLite3, based on std::runtime_error. * @brief Encapsulation of the error message from SQLite3, based on std::runtime_error.
*/ */
@ -89,5 +88,4 @@ private:
int mExtendedErrcode; ///< Detailed error code if any int mExtendedErrcode; ///< Detailed error code if any
}; };
} // namespace SQLite } // namespace SQLite

1
include/SQLiteCpp/ExecuteMany.h
View File

@ -23,6 +23,7 @@
namespace SQLite namespace SQLite
{ {
/// @endcond /// @endcond
/** /**

3
include/SQLiteCpp/Statement.h
View File

@ -22,11 +22,9 @@
struct sqlite3; struct sqlite3;
struct sqlite3_stmt; struct sqlite3_stmt;
namespace SQLite namespace SQLite
{ {
// Forward declaration // Forward declaration
class Database; class Database;
class Column; class Column;
@ -710,5 +708,4 @@ private:
mutable std::map<std::string, int> mColumnNames; mutable std::map<std::string, int> mColumnNames;
}; };
} // namespace SQLite } // namespace SQLite

5
include/SQLiteCpp/Transaction.h
View File

@ -13,11 +13,9 @@
#include <SQLiteCpp/SQLiteCppExport.h> #include <SQLiteCpp/SQLiteCppExport.h>
#include <SQLiteCpp/Exception.h> #include <SQLiteCpp/Exception.h>
namespace SQLite namespace SQLite
{ {
// Forward declaration // Forward declaration
class Database; class Database;
@ -39,7 +37,7 @@ enum class TransactionBehavior {
* or if it fails, all the changes are rolled back to the initial state. * or if it fails, all the changes are rolled back to the initial state.
* *
* Resource Acquisition Is Initialization (RAII) means that the Transaction * Resource Acquisition Is Initialization (RAII) means that the Transaction
* begins in the constructor and is rolled back in the destructor (unless comitted before), so that there is * begins in the constructor and is rolled back in the destructor (unless committed before), so that there is
* no need to worry about memory management or the validity of the underlying SQLite Connection. * no need to worry about memory management or the validity of the underlying SQLite Connection.
* *
* This method also offers big performances improvements compared to individually executed statements. * This method also offers big performances improvements compared to individually executed statements.
@ -97,5 +95,4 @@ private:
bool mbCommited = false; ///< True when commit has been called bool mbCommited = false; ///< True when commit has been called
}; };
} // namespace SQLite } // namespace SQLite

1
src/Backup.cpp
View File

@ -80,5 +80,4 @@ void SQLite::Backup::Deleter::operator()(sqlite3_backup* apBackup)
} }
} }
} // namespace SQLite } // namespace SQLite

2
src/Column.cpp
View File

@ -14,7 +14,6 @@
#include <iostream> #include <iostream>
namespace SQLite namespace SQLite
{ {
@ -121,5 +120,4 @@ std::ostream& operator<<(std::ostream& aStream, const Column& aColumn)
return aStream; return aStream;
} }
} // namespace SQLite } // namespace SQLite

2
src/Exception.cpp
View File

@ -12,7 +12,6 @@
#include <sqlite3.h> #include <sqlite3.h>
namespace SQLite namespace SQLite
{ {
@ -43,5 +42,4 @@ const char* Exception::getErrorStr() const noexcept
return sqlite3_errstr(mErrcode); return sqlite3_errstr(mErrcode);
} }
} // namespace SQLite } // namespace SQLite

1
src/Transaction.cpp
View File

@ -18,7 +18,6 @@
namespace SQLite namespace SQLite
{ {
// Begins the SQLite transaction // Begins the SQLite transaction
Transaction::Transaction(Database& aDatabase, TransactionBehavior behavior) : Transaction::Transaction(Database& aDatabase, TransactionBehavior behavior) :
mDatabase(aDatabase) mDatabase(aDatabase)