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

Merge tag '0.60' into develop

Browse Source 
Release 0.60

* Add date as a dependency, make fetch friendly
* Update travis
* fixed #342: ambiguous comparison operators (c++20)
* Add support for parameterized_verbatim
* Add some MYSQL types to the ddl2cpp script
This commit is contained in:
Roland Bock 2020-08-23 07:49:07 +02:00
commit 54cf48b7ed
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sqlpp11/column.h
View File

@ -63,6 +63,11 @@ namespace sqlpp
template <typename T> template <typename T>
using _is_valid_assignment_operand = is_valid_assignment_operand<value_type_of<ColumnSpec>, T>; using _is_valid_assignment_operand = is_valid_assignment_operand<value_type_of<ColumnSpec>, T>;
// disambiguation for C++20 / clang
// (see https://bugs.llvm.org/show_bug.cgi?id=46508)
using expression_operators<column_t<Table, ColumnSpec>, value_type_of<ColumnSpec>>::operator==;
using expression_operators<column_t<Table, ColumnSpec>, value_type_of<ColumnSpec>>::operator!=;
column_t() = default; column_t() = default;
column_t(const column_t&) = default; column_t(const column_t&) = default;
column_t(column_t&&) = default; column_t(column_t&&) = default;

2
scripts/ddl2cpp
View File

@ -271,6 +271,7 @@ types = {
'float4': 'floating_point', # PostgreSQL 'float4': 'floating_point', # PostgreSQL
'real': 'floating_point', 'real': 'floating_point',
'numeric': 'floating_point', # PostgreSQL 'numeric': 'floating_point', # PostgreSQL
'decimal' : 'floating_point', # MYSQL
'date': 'day_point', 'date': 'day_point',
'datetime': 'time_point', 'datetime': 'time_point',
'time': 'time_of_day', 'time': 'time_of_day',
@ -282,6 +283,7 @@ types = {
'timestamptz': 'time_point', # PostgreSQL 'timestamptz': 'time_point', # PostgreSQL
'enum': 'text', # MYSQL 'enum': 'text', # MYSQL
'set': 'text', # MYSQL, 'set': 'text', # MYSQL,
'longtext' : 'text', #MYSQL
'json' : 'text', # PostgreSQL 'json' : 'text', # PostgreSQL
'jsonb' : 'text', # PostgreSQL 'jsonb' : 'text', # PostgreSQL
'tinyint unsigned': 'tinyint_unsigned', #MYSQL 'tinyint unsigned': 'tinyint_unsigned', #MYSQL