cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-06 10:46:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

add disable option for sqlite3_expanded_sql

Browse Source 
make sqlite3_expanded_sql use optional and give a warning at compile time
along with a exception at runtime when used in an application
This commit is contained in:
Jonathan Guzmán 2022-12-19 19:18:31 -06:00
parent 0d2550bc9a
commit 1841e6b66f
No known key found for this signature in database
GPG Key ID: C2956F1668BA042A
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -304,6 +304,13 @@ if (SQLITECPP_DISABLE_STD_FILESYSTEM)
add_definitions(-DSQLITECPP_DISABLE_STD_FILESYSTEM) add_definitions(-DSQLITECPP_DISABLE_STD_FILESYSTEM)
endif (SQLITECPP_DISABLE_STD_FILESYSTEM) endif (SQLITECPP_DISABLE_STD_FILESYSTEM)
## disable the optional support for sqlite3_expanded_sql (from sqlite3 3.14.0)
option(SQLITECPP_DISABLE_EXPANDED_SQL "Disable the use of sqlite3_expanded_sql in SQLiteCpp." OFF)
if (SQLITECPP_DISABLE_EXPANDED_SQL)
message (STATUS "Disabling sqlite3_expanded_sql support")
add_definitions(-DSQLITECPP_DISABLE_EXPANDED_SQL)
endif (SQLITECPP_DISABLE_EXPANDED_SQL)
# Link target with pthread and dl for Unix # Link target with pthread and dl for Unix
if (UNIX) if (UNIX)
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)

8
meson.build
View File

@ -134,6 +134,14 @@ if get_option('SQLITECPP_DISABLE_STD_FILESYSTEM')
sqlitecpp_cxx_flags += ['-DSQLITECPP_DISABLE_STD_FILESYSTEM'] sqlitecpp_cxx_flags += ['-DSQLITECPP_DISABLE_STD_FILESYSTEM']
endif endif
## get the user option for the SQLITECPP_DISABLE_SQLITE3_EXPANDED_SQL
disable_sqlitecpp_expanded_sql = get_option('SQLITECPP_DISABLE_SQLITE3_EXPANDED_SQL')
## Disable the use of sqlite3_expanded_sql (from sqlite3 3.14.0)
if disable_sqlitecpp_expanded_sql
sqlitecpp_args += ['-DSQLITECPP_DISABLE_SQLITE3_EXPANDED_SQL']
endif
## stack protection hardening ## stack protection hardening
if get_option('SQLITECPP_USE_STACK_PROTECTION') if get_option('SQLITECPP_USE_STACK_PROTECTION')
## if is on MinGW-W64 give a warning that is not supported ## if is on MinGW-W64 give a warning that is not supported

2
meson_options.txt
View File

@ -13,6 +13,8 @@ option('SQLITE_USE_LEGACY_STRUCT', type: 'boolean', value: false, description: '
option('SQLITE_OMIT_LOAD_EXTENSION', type: 'boolean', value: false, description: 'Enable ommit load extension.') option('SQLITE_OMIT_LOAD_EXTENSION', type: 'boolean', value: false, description: 'Enable ommit load extension.')
## Disable the support for std::filesystem (C++17) ## Disable the support for std::filesystem (C++17)
option('SQLITECPP_DISABLE_STD_FILESYSTEM', type: 'boolean', value: false, description: 'Disable the support for std::filesystem (C++17)') option('SQLITECPP_DISABLE_STD_FILESYSTEM', type: 'boolean', value: false, description: 'Disable the support for std::filesystem (C++17)')
## Disable the support for sqlite3_expanded_sql (since SQLite 3.14.0)
option('SQLITECPP_DISABLE_SQLITE3_EXPANDED_SQL', type: 'boolean', value: false, description: 'Disable the support for sqlite3_expanded_sql (since SQLite 3.14.0)')
## Stack protection is not supported on MinGW-W64 on Windows, allow this flag to be turned off. ## Stack protection is not supported on MinGW-W64 on Windows, allow this flag to be turned off.
option('SQLITECPP_USE_STACK_PROTECTION', type: 'boolean', value: true, description: 'Enable stack protection for MySQL.') option('SQLITECPP_USE_STACK_PROTECTION', type: 'boolean', value: true, description: 'Enable stack protection for MySQL.')
## Enable build for the tests of SQLiteC++ ## Enable build for the tests of SQLiteC++

17
src/Statement.cpp
View File

@ -17,6 +17,17 @@
#include <sqlite3.h> #include <sqlite3.h>
// check for if SQLite3 version >= 3.14.0
#if SQLITE_VERSION_NUMBER < 3014000
#warning "SQLite3 version is less than 3.14.0, so expanded SQL is not available"
#warning "To use expanded SQL, please upgrade to SQLite3 version 3.14.0 or later"
#warning "If you want to disable this warning, define SQLITECPP_DISABLE_SQLITE3_EXPANDED_SQL"
#warning "or use the specific project option in your build system"
#warning "disabling expanded SQL support"
#define SQLITECPP_DISABLE_SQLITE3_EXPANDED_SQL
#endif
namespace SQLite namespace SQLite
{ {
@ -331,14 +342,20 @@ const char* Statement::getErrorMsg() const noexcept
return sqlite3_errmsg(mpSQLite); return sqlite3_errmsg(mpSQLite);
} }
// Return a UTF-8 string containing the SQL text of prepared statement with bound parameters expanded. // Return a UTF-8 string containing the SQL text of prepared statement with bound parameters expanded.
std::string Statement::getExpandedSQL() const { std::string Statement::getExpandedSQL() const {
#ifdef SQLITECPP_DISABLE_SQLITE3_EXPANDED_SQL
throw SQLite::Exception("this version of SQLiteCpp does not support expanded SQL");
#else
char* expanded = sqlite3_expanded_sql(getPreparedStatement()); char* expanded = sqlite3_expanded_sql(getPreparedStatement());
std::string expandedString(expanded); std::string expandedString(expanded);
sqlite3_free(expanded); sqlite3_free(expanded);
return expandedString; return expandedString;
#endif
} }
// Prepare SQLite statement object and return shared pointer to this object // Prepare SQLite statement object and return shared pointer to this object
Statement::TStatementPtr Statement::prepareStatement() Statement::TStatementPtr Statement::prepareStatement()
{ {