query preparations for std::optional

test/CMakeLists.txt

@@ -31,7 +31,8 @@ add_executable(tests QueryBuilderTest.cpp
   models/coordinate.hpp
   models/location.hpp
   TypeTraitsTest.cpp
-  Databases.hpp)
+  Databases.hpp
+  models/optional.hpp)
 target_link_libraries(tests PRIVATE
   Catch2::Catch2WithMain
   matador

test/QueryBuilderTest.cpp

@@ -6,6 +6,7 @@
 #include <matador/sql/query_builder.hpp>
 
 using namespace matador::sql;
+using namespace matador::utils;
 
 TEST_CASE("Create table sql statement string", "[query]") {
   dialect d = dialect_builder::builder().create().build();
@@ -16,17 +17,17 @@ TEST_CASE("Create table sql statement string", "[query]") {
       make_column<unsigned short>("age")
   }).compile();
 
-  REQUIRE(q.sql == R"##(CREATE TABLE "person" ("id" BIGINT NOT NULL, "name" VARCHAR(255), "age" INTEGER, CONSTRAINT PK_person PRIMARY KEY (id)))##");
+  REQUIRE(q.sql == R"##(CREATE TABLE "person" ("id" BIGINT NOT NULL, "name" VARCHAR(255) NOT NULL, "age" INTEGER NOT NULL, CONSTRAINT PK_person PRIMARY KEY (id)))##");
   REQUIRE(q.table_name == "person");
 
   q = query.create().table("person", {
     make_pk_column<unsigned long>("id"),
-    make_column<std::string>("name", 255),
+    make_column<std::string>("name", { 255, constraints::UNIQUE | constraints::NOT_NULL }),
     make_column<unsigned short>("age"),
     make_fk_column<unsigned long>("address", "address", "id")
   }).compile();
 
-  REQUIRE(q.sql == R"##(CREATE TABLE "person" ("id" BIGINT NOT NULL, "name" VARCHAR(255), "age" INTEGER, "address" BIGINT, CONSTRAINT PK_person PRIMARY KEY (id), CONSTRAINT FK_person_address FOREIGN KEY (address) REFERENCES address(id)))##");
+  REQUIRE(q.sql == R"##(CREATE TABLE "person" ("id" BIGINT NOT NULL, "name" VARCHAR(255) NOT NULL UNIQUE, "age" INTEGER NOT NULL, "address" BIGINT, CONSTRAINT PK_person PRIMARY KEY (id), CONSTRAINT FK_person_address FOREIGN KEY (address) REFERENCES address(id)))##");
   REQUIRE(q.table_name == "person");
 }
 

test/StatementTest.cpp

@@ -48,7 +48,7 @@ private:
   };
 };
 
-TEMPLATE_TEST_CASE_METHOD(StatementTestFixture, "Create prepared statement", "[statement]", Sqlite, Postgres)
+TEMPLATE_TEST_CASE_METHOD(StatementTestFixture, "Create prepared statement", "[statement]", Sqlite, Postgres, MySql)
 {
   auto &s = StatementTestFixture<TestType>::session();
   auto &planes = StatementTestFixture<TestType>::planes();

test/models/optional.hpp

@@ -0,0 +1,30 @@
+#ifndef QUERY_OPTIONAL_HPP
+#define QUERY_OPTIONAL_HPP
+
+#include "matador/utils/access.hpp"
+#include "matador/utils/field_attributes.hpp"
+
+#include <optional>
+#include <string>
+
+namespace matador::test {
+
+struct optional
+{
+  unsigned long id{};
+  std::optional<std::string> name;
+  std::optional<unsigned int> age{};
+
+  template<class Operator>
+  void process(Operator &op) {
+    namespace field = matador::utils::access;
+    using namespace matador::utils;
+    field::primary_key(op, "id", id);
+    field::attribute(op, "name", name, 255);
+    field::attribute(op, "age", age);
+  }
+};
+
+}
+
+#endif //QUERY_OPTIONAL_HPP