Skip to content

Use sqlite_prepare_v2; resolves #77; fixes #78 #81

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

Merged
liuzicheng1987 merged 1 commit into from
Oct 27, 2025
Merged

Use sqlite_prepare_v2; resolves #77; fixes #78 #81

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
1 change: 0 additions & 1 deletion include/sqlgen/internal/from_str_vec.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include <utility>
#include <vector>

#include "../Result.hpp"

Check warning on line 14 in include/sqlgen/internal/from_str_vec.hpp

View workflow job for this annotation

GitHub Actions / (windows-mysql) 

 relative include path contains '..'

Check warning on line 14 in include/sqlgen/internal/from_str_vec.hpp

View workflow job for this annotation

GitHub Actions / (windows-mysql) 

 relative include path contains '..'
#include "../parsing/Parser.hpp"

Check warning on line 15 in include/sqlgen/internal/from_str_vec.hpp

View workflow job for this annotation

GitHub Actions / (windows-mysql) 

 relative include path contains '..'

Check warning on line 15 in include/sqlgen/internal/from_str_vec.hpp

View workflow job for this annotation

GitHub Actions / (windows-mysql) 

 relative include path contains '..'
#include "call_destructors_where_necessary.hpp"

namespace sqlgen::internal {
Expand All @@ -22,7 +22,6 @@
const std::vector<std::optional<std::string>>& _row, const size_t _i,
ViewType* _view, std::optional<Error>* _err) noexcept {
using FieldType = rfl::tuple_element_t<i, typename ViewType::Fields>;
using OriginalType = typename FieldType::Type;
using T =
std::remove_cvref_t<std::remove_pointer_t<typename FieldType::Type>>;
constexpr auto name = FieldType::name();
Expand Down
20 changes: 10 additions & 10 deletions src/sqlgen/sqlite/Connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ Result<Ref<IteratorBase>> Connection::read_impl(

sqlite3_stmt* p_stmt = nullptr;

sqlite3_prepare(conn_.get(), /* Database handle */
sql.c_str(), /* SQL statement, UTF-8 encoded */
sql.size(), /* Maximum length of zSql in bytes. */
&p_stmt, /* OUT: Statement handle */
nullptr /* OUT: Pointer to unused portion of zSql */
sqlite3_prepare_v2(conn_.get(), /* Database handle */
sql.c_str(), /* SQL statement, UTF-8 encoded */
sql.size(), /* Maximum length of zSql in bytes. */
&p_stmt, /* OUT: Statement handle */
nullptr /* OUT: Pointer to unused portion of zSql */
);

if (!p_stmt) {
Expand All @@ -124,11 +124,11 @@ Result<Connection::StmtPtr> Connection::prepare_statement(
const std::string& _sql) const noexcept {
sqlite3_stmt* p_stmt = nullptr;

sqlite3_prepare(conn_.get(), /* Database handle */
_sql.c_str(), /* SQL statement, UTF-8 encoded */
_sql.size(), /* Maximum length of zSql in bytes. */
&p_stmt, /* OUT: Statement handle */
nullptr /* OUT: Pointer to unused portion of zSql */
sqlite3_prepare_v2(conn_.get(), /* Database handle */
_sql.c_str(), /* SQL statement, UTF-8 encoded */
_sql.size(), /* Maximum length of zSql in bytes. */
&p_stmt, /* OUT: Statement handle */
nullptr /* OUT: Pointer to unused portion of zSql */
);

if (!p_stmt) {
Expand Down
Loading