3party/sqlpp11
0
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-15 20:31:16 +08:00
Code Issues Projects Releases Wiki Activity

Fixed constructor of result_row.

Browse Source 
This accepted just any(!) argument.
This commit is contained in:
rbock 2016-01-23 22:04:55 +01:00
parent 6dcdc419c1
commit d3debe4229
3 changed files with 78 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
include/sqlpp11/dynamic_select_column_list.h Normal file
View File

@ -0,0 +1,75 @@
/*
* Copyright (c) 2013-2015, 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_SELECT_COLUMN_LIST_FWD_H
#define SQLPP_SELECT_COLUMN_LIST_FWD_H
#include <vector>
#include <string>
#include <sqlpp11/named_interpretable.h>
namespace sqlpp
{
template <typename Db>
struct dynamic_select_column_list
{
using _names_t = std::vector<std::string>;
std::vector<named_interpretable_t<Db>> _dynamic_columns;
_names_t _dynamic_expression_names;
template <typename Expr>
void emplace_back(Expr expr)
{
_dynamic_expression_names.push_back(name_of<Expr>::char_ptr());
_dynamic_columns.emplace_back(expr);
}
bool empty() const
{
return _dynamic_columns.empty();
}
};
template <>
struct dynamic_select_column_list<void>
{
struct _names_t
{
static constexpr size_t size()
{
return 0;
}
};
_names_t _dynamic_expression_names;
static constexpr bool empty()
{
return true;
}
};
}
#endif

5
include/sqlpp11/result_row.h
View File

@ -29,6 +29,7 @@
#include <map>
#include <sqlpp11/result_row_fwd.h>
#include <sqlpp11/dynamic_select_column_list.h>
#include <sqlpp11/field_spec.h>
#include <sqlpp11/no_name.h>
#include <sqlpp11/data_types/text.h>
@ -151,9 +152,7 @@ namespace sqlpp
{
}
template <typename DynamicNames>
result_row_t(const DynamicNames&)
: _impl(), _is_valid(false)
result_row_t(const typename dynamic_select_column_list<void>::_names_t&) : _impl(), _is_valid(false)
{
}

39
include/sqlpp11/select_column_list.h
View File

@ -29,6 +29,7 @@
#include <tuple>
#include <sqlpp11/result_row.h>
#include <sqlpp11/dynamic_select_column_list.h>
#include <sqlpp11/table.h>
#include <sqlpp11/data_types/no_value.h>
#include <sqlpp11/field_spec.h>
@ -65,44 +66,6 @@ namespace sqlpp
};
}
template <typename Db>
struct dynamic_select_column_list
{
using _names_t = std::vector<std::string>;
std::vector<named_interpretable_t<Db>> _dynamic_columns;
_names_t _dynamic_expression_names;
template <typename Expr>
void emplace_back(Expr expr)
{
_dynamic_expression_names.push_back(name_of<Expr>::char_ptr());
_dynamic_columns.emplace_back(expr);
}
bool empty() const
{
return _dynamic_columns.empty();
}
};
template <>
struct dynamic_select_column_list<void>
{
struct _names_t
{
static constexpr size_t size()
{
return 0;
}
};
_names_t _dynamic_expression_names;
static constexpr bool empty()
{
return true;
}
};
template <typename Context, typename Db>
struct serializer_t<Context, dynamic_select_column_list<Db>>
{