From d0c6cc103af03d34b5dcbcff87f7f08d25d998e6 Mon Sep 17 00:00:00 2001 From: rbock Date: Wed, 10 May 2017 07:44:05 +0200 Subject: [PATCH 1/3] Re-insert accidentally removed test for ppgen --- tests/CMakeLists.txt | 7 ++++ tests/Ppgen.cpp | 87 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 tests/Ppgen.cpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 359b38f3..08bb2e9e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -47,6 +47,13 @@ set(test_names With ) +find_package(Boost 1.50) +if(Boost_FOUND) + include_directories(${Boost_INCLUDE_DIRS}) + list(APPEND test_names Ppgen) +endif() + + create_test_sourcelist(test_sources test_main.cpp ${test_names}) add_executable(sqlpp11_tests ${test_sources}) target_link_libraries(sqlpp11_tests PRIVATE sqlpp11 sqlpp11_testing) diff --git a/tests/Ppgen.cpp b/tests/Ppgen.cpp new file mode 100644 index 00000000..3fa5d3eb --- /dev/null +++ b/tests/Ppgen.cpp @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2014-2015, niXman (i dot nixman dog gmail dot com) + * 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. + */ + +#if 0 // syntax example +SQLPP_DECLARE_TABLE( + (table, \ + SQLPP_DROP_IF_EXISTS \ + ,SQLPP_CREATE_IF_NOT_EXISTS \ + ,SQLPP_ENGINE("InnoDB") \ + ,SQLPP_CHARACTER_SET("utf-8") \ + ,SQLPP_COMMENT("table comments") \ + ) + , + (id, int, SQLPP_NOT_NULL, SQLPP_PRIMARY_KEY, SQLPP_AUTO_INCREMENT) + (name, varchar(64), SQLPP_NOT_NULL, SQLPP_INDEX("name_index"), SQLPP_DEFAULT("any name")) + (age, int, SQLPP_NOT_NULL, SQLPP_INDEX("age_index"), SQLPP_UNIQUE, SQLPP_COMMENT("some comments")) +) +#endif + +#include +#include + +#include "MockDb.h" + +// clang-format off +SQLPP_DECLARE_TABLE( + (tab_person) + , + (id , int , SQLPP_PRIMARY_KEY) + (name , varchar(255), SQLPP_NOT_NULL ) + (feature, int , SQLPP_NOT_NULL ) +) + +SQLPP_DECLARE_TABLE( + (tab_feature) + , + (id , int , SQLPP_PRIMARY_KEY) + (name , varchar(255), SQLPP_NULL ) + (fatal, bool , SQLPP_NOT_NULL ) +) +// clang-format on + +int Ppgen(int, char* []) +{ + MockDb db{}; + const auto p = tab_person::tab_person{}; + const auto f = tab_feature::tab_feature{}; + + db(insert_into(f).set(f.name = "loves c++", f.fatal = false)); + + db(insert_into(f).default_values()); + + auto i = insert_into(p).columns(p.name, p.feature); + i.values.add(p.name = "Roland", p.feature = 1); + i.values.add(p.name = "Zaphod", p.feature = sqlpp::default_value); + db(i); + + auto pi = db.prepare(insert_into(p).set(p.name = parameter(f.name), p.feature = parameter(p.feature))); + pi.params.name = "likes java"; + pi.params.feature = true; + + db(pi); + return 0; +} From e77639033ab918ce3c29a9f646662112575d1709 Mon Sep 17 00:00:00 2001 From: Andreas Sommer Date: Sat, 3 Jun 2017 00:41:44 +0200 Subject: [PATCH 2/3] Support implicitly treating id column as auto-incrementing (e.g. for SQLite) --- scripts/ddl2cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ddl2cpp b/scripts/ddl2cpp index 603080bf..d0406c15 100755 --- a/scripts/ddl2cpp +++ b/scripts/ddl2cpp @@ -112,6 +112,7 @@ optionalArgs = { # '-no-time-stamp-warning' # timeStampWarning = False '-fail-on-parse': "abort instead of silent genereation of unusable headers", # failOnParse = True '-warn-on-parse': "warn about unusable headers, but continue", # warnOnParse = True + '-auto-id': "Assume column 'id' to have an automatic value as if AUTO_INCREMENT was specified (e.g. implicit for SQLite ROWID)", # autoId = True '-help': "show this help" } @@ -127,6 +128,7 @@ timestampWarning = True failOnParse = False warnOnParse = False parseError = "Parsing error, possible reason: can't parse default value for a field" +autoId = False if len(sys.argv) >= 4: @@ -301,6 +303,7 @@ for create in tableCreations: print ('Error: datatype "' + sqlColumnType + '"" is not supported.') DataTypeError = True requireInsert = True + column.hasAutoValue = column.hasAutoValue or (autoId and sqlColumnName == 'id') if column.hasAutoValue: traitslist.append(NAMESPACE + '::tag::must_not_insert') traitslist.append(NAMESPACE + '::tag::must_not_update') From f70eebc6bee45c9325c39f6173d3f3e8b8e15497 Mon Sep 17 00:00:00 2001 From: rbock Date: Sun, 4 Jun 2017 15:56:32 +0200 Subject: [PATCH 3/3] Remove outdated CppCon2016 link --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 81eb96a8..d06ae11e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ Documentation is found in the [wiki](https://github.com/rbock/sqlpp11/wiki) Contact: -------- - * Meet me at [CppCon 2016](https://cppcon2016.sched.org/event/7nKk) * Issues at https://github.com/rbock/sqlpp11/issues * email at rbock at eudoxos dot de * [![Join the chat at https://gitter.im/sqlpp11/Lobby](https://badges.gitter.im/sqlpp11/Lobby.svg)](https://gitter.im/sqlpp11/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)