From cab4bc79edaf01faba52419d300a9e774ab476bc Mon Sep 17 00:00:00 2001 From: Brett-Michael Green Date: Tue, 16 Jun 2020 17:15:47 -0400 Subject: [PATCH 1/2] Add some MYSQL types to the ddl2cpp script --- scripts/ddl2cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ddl2cpp b/scripts/ddl2cpp index 113a80a7..4e633a1a 100755 --- a/scripts/ddl2cpp +++ b/scripts/ddl2cpp @@ -271,6 +271,7 @@ types = { 'float4': 'floating_point', # PostgreSQL 'real': 'floating_point', 'numeric': 'floating_point', # PostgreSQL + 'decimal' : 'floating_point', # MYSQL 'date': 'day_point', 'datetime': 'time_point', 'time': 'time_of_day', @@ -282,6 +283,7 @@ types = { 'timestamptz': 'time_point', # PostgreSQL 'enum': 'text', # MYSQL 'set': 'text', # MYSQL, + 'longtext' : 'text', #MYSQL 'json' : 'text', # PostgreSQL 'jsonb' : 'text', # PostgreSQL 'tinyint unsigned': 'tinyint_unsigned', #MYSQL From e3ab5e5d0bfbc81c5f57826fea80abef2ab8d2e7 Mon Sep 17 00:00:00 2001 From: Daniel Evers Date: Thu, 9 Jul 2020 07:10:47 +0200 Subject: [PATCH 2/2] fixed #342: ambiguous comparison operators (c++20) (#343) * fixed #342: ambiguous comparison operators (c++20) * issue #342: added reference to clang bug ticket --- include/sqlpp11/column.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/sqlpp11/column.h b/include/sqlpp11/column.h index 7920b1f4..b22dd3b8 100644 --- a/include/sqlpp11/column.h +++ b/include/sqlpp11/column.h @@ -63,6 +63,11 @@ namespace sqlpp template using _is_valid_assignment_operand = is_valid_assignment_operand, T>; + // disambiguation for C++20 / clang + // (see https://bugs.llvm.org/show_bug.cgi?id=46508) + using expression_operators, value_type_of>::operator==; + using expression_operators, value_type_of>::operator!=; + column_t() = default; column_t(const column_t&) = default; column_t(column_t&&) = default;