Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solved conversion warnings #236

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Solved conversion warnings #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions hdr/sqlite_modern_cpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,10 @@ namespace sqlite {
int hresult;
sqlite3_stmt* tmp = nullptr;
const char *remaining;
hresult = sqlite3_prepare_v2(_db.get(), sql.data(), sql.length(), &tmp, &remaining);
if(hresult != SQLITE_OK) errors::throw_sqlite_error(hresult, sql, sqlite3_errmsg(_db.get()));
if(!std::all_of(remaining, sql.data() + sql.size(), [](char ch) {return std::isspace(ch);}))
hresult = sqlite3_prepare_v2(_db.get(), sql.data(), static_cast<int>(sql.length()), &tmp, &remaining);
if (hresult != SQLITE_OK)
errors::throw_sqlite_error(hresult, sql, sqlite3_errmsg(_db.get()));
if (!std::all_of(remaining, sql.data() + sql.size(), [](char ch) {return std::isspace(ch); }))
throw errors::more_statements("Multiple semicolon separated statements are unsupported", sql);
return tmp;
}
Expand Down
20 changes: 10 additions & 10 deletions hdr/sqlite_modern_cpp/type_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,13 @@ namespace sqlite {
inline void store_result_in_db(sqlite3_context* db, const float& val) {
sqlite3_result_double(db, val);
}
inline float get_col_from_db(sqlite3_stmt* stmt, int inx, result_type<float>) {
return sqlite3_column_type(stmt, inx) == SQLITE_NULL ? 0 :
sqlite3_column_double(stmt, inx);
inline float get_col_from_db(sqlite3_stmt* stmt, int inx, result_type<float>)
{
return static_cast<float>(sqlite3_column_type(stmt, inx) == SQLITE_NULL ? 0 : sqlite3_column_double(stmt, inx));
}
inline float get_val_from_db(sqlite3_value *value, result_type<float>) {
return sqlite3_value_type(value) == SQLITE_NULL ? 0 :
sqlite3_value_double(value);
inline float get_val_from_db(sqlite3_value *value, result_type<float>)
{
return static_cast<float>(sqlite3_value_type(value) == SQLITE_NULL ? 0 : sqlite3_value_double(value));
}

// double
Expand Down Expand Up @@ -189,7 +189,7 @@ namespace sqlite {
template<>
struct has_sqlite_type<std::string, SQLITE3_TEXT, void> : std::true_type {};
inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, str_ref val) {
return sqlite3_bind_text(stmt, inx, val.data(), val.length(), SQLITE_TRANSIENT);
return sqlite3_bind_text(stmt, inx, val.data(), static_cast<int>(val.length()), SQLITE_TRANSIENT);
}

// Convert char* to string_view to trigger op<<(..., const str_ref )
Expand All @@ -215,13 +215,13 @@ namespace sqlite {
}

inline void store_result_in_db(sqlite3_context* db, str_ref val) {
sqlite3_result_text(db, val.data(), val.length(), SQLITE_TRANSIENT);
sqlite3_result_text(db, val.data(), static_cast<int>(val.length()), SQLITE_TRANSIENT);
}
// u16str_ref
template<>
struct has_sqlite_type<std::u16string, SQLITE3_TEXT, void> : std::true_type {};
inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, u16str_ref val) {
return sqlite3_bind_text16(stmt, inx, val.data(), sizeof(char16_t) * val.length(), SQLITE_TRANSIENT);
return sqlite3_bind_text16(stmt, inx, val.data(), sizeof(char16_t) * static_cast<int>(val.length()), SQLITE_TRANSIENT);
}

// Convert char* to string_view to trigger op<<(..., const str_ref )
Expand All @@ -246,7 +246,7 @@ namespace sqlite {
}

inline void store_result_in_db(sqlite3_context* db, u16str_ref val) {
sqlite3_result_text16(db, val.data(), sizeof(char16_t) * val.length(), SQLITE_TRANSIENT);
sqlite3_result_text16(db, val.data(), sizeof(char16_t) * static_cast<int>(val.length()), SQLITE_TRANSIENT);
}

// Other integer types
Expand Down