From 04e7a36206444db77e472b2315afd3524ef8383c Mon Sep 17 00:00:00 2001 From: rbock Date: Mon, 7 Jul 2014 09:17:13 +0200 Subject: [PATCH] Adjusted api to recent changes. --- connector_api/bind_result.h | 2 + connector_api/char_result.h | 70 ------------------------------ connector_api/connection.h | 11 +++-- connector_api/prepared_statement.h | 2 + 4 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 connector_api/char_result.h diff --git a/connector_api/bind_result.h b/connector_api/bind_result.h index d1405e7d..c3b4e233 100644 --- a/connector_api/bind_result.h +++ b/connector_api/bind_result.h @@ -80,7 +80,9 @@ namespace sqlpp */ // These are called by the result row to bind individual result values + // More will be added over time void _bind_boolean_result(size_t index, signed char* value, bool* is_null); + void _bind_floating_point_result(size_t index, double* value, bool* is_null); void _bind_integral_result(size_t index, int64_t* value, bool* is_null); void _bind_text_result(size_t index, const char** text, size_t* len); ... diff --git a/connector_api/char_result.h b/connector_api/char_result.h deleted file mode 100644 index 02ab2014..00000000 --- a/connector_api/char_result.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2013-2014, Roland Bock - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, this - * list of conditions and the following disclaimer in the documentation and/or - * other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - - -#ifndef SQLPP_DATABASE_CHAR_RESULT_H -#define SQLPP_DATABASE_CHAR_RESULT_H - -#include - -namespace sqlpp -{ - namespace database - { - /* - * char_result_t yields results as - * sqlpp11::vendor::char_result_row_t - */ - class char_result_t - { - ::sqlpp11::vendor::char_result_row_t char_result_row; - public: - char_result_t(); // default constructor for a result that will not yield a valid row - char_result_t(...); - char_result_t(const char_result_t&) = delete; - char_result_t(char_result_t&& rhs); - char_result_t& operator=(const char_result_t&) = delete; - char_result_t& operator=(char_result_t&&); - ~char_result_t(); - - bool operator==(const char_result_t& rhs) const; - - template - void next(ResultRow& result_row); - - // Something like - /* - { - next_impl(); - if (_char_result_row.data) - result_row = _char_result_row; - else - result_row.invalidate(); - }; - */ - } -} -#endif diff --git a/connector_api/connection.h b/connector_api/connection.h index b6946324..14d22dd0 100644 --- a/connector_api/connection.h +++ b/connector_api/connection.h @@ -52,7 +52,10 @@ namespace sqlpp { public: using _prepared_statement_t = << handle to a prepared statement of the database >>; - using _context_t = << This context is used to interpret the dynamic parts of dynamic statemtents>>; + using _serializer_context_t = << This context is used to serialize a statement >> + using _interpreter_context_t = << This context is used interpret a statement >>; + // serializer and interpreter are typically the same for string based connectors + // the types are required for dynamic statement components, see sqlpp11/interpretable.h connection(...); ~connection(); @@ -63,14 +66,14 @@ namespace sqlpp //! "direct" select template - <> select(const Select& s); + <> select(const Select& s); //! prepared select template _prepared_statement_t prepare_select(Select& s); template - <> run_prepared_select(const PreparedSelect& s); // call s._bind_params() + <> run_prepared_select(const PreparedSelect& s); // call s._bind_params() //! "direct insert template @@ -107,7 +110,7 @@ namespace sqlpp //! call run on the argument template - auto run(const T& t) -> decltype(t._run(*this)) + auto operator() (const T& t) -> decltype(t._run(*this)) { return t._run(*this); } diff --git a/connector_api/prepared_statement.h b/connector_api/prepared_statement.h index 5a3dc94a..bcd67293 100644 --- a/connector_api/prepared_statement.h +++ b/connector_api/prepared_statement.h @@ -49,7 +49,9 @@ namespace sqlpp bool operator==(const prepared_statement_t& rhs) const; // These are called by the sqlpp11::prepared_*_t to bind the individual parameters + // More will be added over time void _bind_boolean_parameter(size_t index, const signed char* value, bool is_null); + void _bind_floating_point_parameter(size_t index, const double* value, bool is_null); void _bind_integral_parameter(size_t index, const int64_t* value, bool is_null); void _bind_text_parameter(size_t index, const std::string* value, bool is_null); };