Renamed result_field_methods result_field_base

This commit is contained in:
rbock
2015-10-31 19:38:12 +01:00
parent 00fb11b2d4
commit 76af86a572
7 changed files with 18 additions and 19 deletions
@@ -30,7 +30,7 @@
#include <sqlpp11/basic_expression_operators.h>
#include <sqlpp11/exception.h>
#include <sqlpp11/result_field.h>
#include <sqlpp11/result_field_methods.h>
#include <sqlpp11/result_field_base.h>
#include <sqlpp11/type_traits.h>
#include <sqlpp11/data_types/boolean/data_type.h>
#include <ostream>
@@ -38,7 +38,7 @@
namespace sqlpp
{
template <typename Db, typename FieldSpec>
struct result_field_t<boolean, Db, FieldSpec> : public result_field_methods_t<result_field_t<boolean, Db, FieldSpec>>
struct result_field_t<boolean, Db, FieldSpec> : public result_field_base_t<result_field_t<boolean, Db, FieldSpec>>
{
static_assert(std::is_same<value_type_of<FieldSpec>, boolean>::value, "field type mismatch");
using _cpp_value_type = typename boolean::_cpp_value_type;
@@ -30,7 +30,7 @@
#include <sqlpp11/basic_expression_operators.h>
#include <sqlpp11/exception.h>
#include <sqlpp11/result_field.h>
#include <sqlpp11/result_field_methods.h>
#include <sqlpp11/result_field_base.h>
#include <sqlpp11/type_traits.h>
#include <sqlpp11/data_types/day_point/data_type.h>
#include <ostream>
@@ -38,8 +38,7 @@
namespace sqlpp
{
template <typename Db, typename FieldSpec>
struct result_field_t<day_point, Db, FieldSpec>
: public result_field_methods_t<result_field_t<day_point, Db, FieldSpec>>
struct result_field_t<day_point, Db, FieldSpec> : public result_field_base_t<result_field_t<day_point, Db, FieldSpec>>
{
static_assert(std::is_same<value_type_of<FieldSpec>, day_point>::value, "field type mismatch");
using _cpp_value_type = typename sqlpp::day_point::_cpp_value_type;
@@ -30,7 +30,7 @@
#include <sqlpp11/basic_expression_operators.h>
#include <sqlpp11/exception.h>
#include <sqlpp11/result_field.h>
#include <sqlpp11/result_field_methods.h>
#include <sqlpp11/result_field_base.h>
#include <sqlpp11/type_traits.h>
#include <sqlpp11/data_types/floating_point/data_type.h>
#include <ostream>
@@ -39,7 +39,7 @@ namespace sqlpp
{
template <typename Db, typename FieldSpec>
struct result_field_t<floating_point, Db, FieldSpec>
: public result_field_methods_t<result_field_t<floating_point, Db, FieldSpec>>
: public result_field_base_t<result_field_t<floating_point, Db, FieldSpec>>
{
static_assert(std::is_same<value_type_of<FieldSpec>, floating_point>::value, "field type mismatch");
using _cpp_value_type = typename floating_point::_cpp_value_type;
@@ -30,7 +30,7 @@
#include <sqlpp11/basic_expression_operators.h>
#include <sqlpp11/exception.h>
#include <sqlpp11/result_field.h>
#include <sqlpp11/result_field_methods.h>
#include <sqlpp11/result_field_base.h>
#include <sqlpp11/type_traits.h>
#include <sqlpp11/data_types/integral/data_type.h>
#include <ostream>
@@ -38,8 +38,7 @@
namespace sqlpp
{
template <typename Db, typename FieldSpec>
struct result_field_t<integral, Db, FieldSpec>
: public result_field_methods_t<result_field_t<integral, Db, FieldSpec>>
struct result_field_t<integral, Db, FieldSpec> : public result_field_base_t<result_field_t<integral, Db, FieldSpec>>
{
static_assert(std::is_same<value_type_of<FieldSpec>, integral>::value, "field type mismatch");
using _cpp_value_type = typename integral::_cpp_value_type;
@@ -30,7 +30,7 @@
#include <sqlpp11/basic_expression_operators.h>
#include <sqlpp11/exception.h>
#include <sqlpp11/result_field.h>
#include <sqlpp11/result_field_methods.h>
#include <sqlpp11/result_field_base.h>
#include <sqlpp11/type_traits.h>
#include <sqlpp11/data_types/text/data_type.h>
#include <ostream>
@@ -38,7 +38,7 @@
namespace sqlpp
{
template <typename Db, typename FieldSpec>
struct result_field_t<text, Db, FieldSpec> : public result_field_methods_t<result_field_t<text, Db, FieldSpec>>
struct result_field_t<text, Db, FieldSpec> : public result_field_base_t<result_field_t<text, Db, FieldSpec>>
{
static_assert(std::is_same<value_type_of<FieldSpec>, text>::value, "field type mismatch");
using _cpp_value_type = typename text::_cpp_value_type;
@@ -30,7 +30,7 @@
#include <sqlpp11/basic_expression_operators.h>
#include <sqlpp11/exception.h>
#include <sqlpp11/result_field.h>
#include <sqlpp11/result_field_methods.h>
#include <sqlpp11/result_field_base.h>
#include <sqlpp11/type_traits.h>
#include <sqlpp11/data_types/time_point/data_type.h>
#include <ostream>
@@ -40,7 +40,7 @@ namespace sqlpp
// time_point result field
template <typename Db, typename FieldSpec>
struct result_field_t<time_point, Db, FieldSpec>
: public result_field_methods_t<result_field_t<time_point, Db, FieldSpec>>
: public result_field_base_t<result_field_t<time_point, Db, FieldSpec>>
{
static_assert(std::is_same<value_type_of<FieldSpec>, time_point>::value, "field type mismatch");
using _cpp_value_type = typename time_point::_cpp_value_type;
@@ -24,23 +24,24 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef SQLPP_RESULT_FIELD_METHODS_H
#define SQLPP_RESULT_FIELD_METHODS_H
#ifndef SQLPP_RESULT_FIELD_BASE_H
#define SQLPP_RESULT_FIELD_BASE_H
#include <utility>
#include <sqlpp11/basic_expression_operators.h>
#include <sqlpp11/alias_operators.h>
#include <sqlpp11/result_field.h>
namespace sqlpp
{
template <typename Field>
struct result_field_methods_t
struct result_field_base_t
{
static_assert(wrong_t<result_field_methods_t>::value, "Invalid argument for result_field_base");
static_assert(wrong_t<result_field_base_t>::value, "Invalid argument for result_field_base");
};
template <typename ValueType, typename Db, typename FieldSpec>
struct result_field_methods_t<result_field_t<ValueType, Db, FieldSpec>>
struct result_field_base_t<result_field_t<ValueType, Db, FieldSpec>>
{
using _derived_t = result_field_t<ValueType, Db, FieldSpec>;
using _field_spec_t = FieldSpec;