update for iguana

cmake/build.cmake

@@ -16,4 +16,4 @@ if(BUILD_WITH_LIBCXX AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     message(STATUS "Build with libc++")
 else()
     message(STATUS "Build with libstdc++")
-endif()
+endif()

cmake/mariadb.cmake

@@ -20,7 +20,12 @@ ELSEIF (LINUX)
     /usr/include/mariadb)
 ELSEIF (APPLE)
   FIND_PATH(MARIADB_INCLUDE_DIR mysql.h
-  /opt/homebrew/include/mariadb)
+    /opt/homebrew/include/mariadb)
+ELSE (WIN32)
+  FIND_PATH(MARIADB_INCLUDE_DIR mysql.h
+    /opt/homebrew/include/mariadb
+    /usr/local/include/mariadb
+    /usr/include/mariadb)
 ENDIF()
 
 SET(MARIADB_NAMES mariadb)
@@ -41,6 +46,13 @@ ELSEIF (APPLE)
     NAMES ${MARIADB_NAMES}
     PATHS /opt/homebrew/lib
     PATH_SUFFIXES mariadb)
+ELSE (WIN32)
+  FIND_LIBRARY(MARIADB_LIBRARY
+    NAMES ${MARIADB_NAMES}
+    PATHS /usr/lib 
+    /usr/local/lib
+    /opt/homebrew/lib
+    PATH_SUFFIXES mariadb)
 ENDIF()
 
 IF (MARIADB_INCLUDE_DIR AND MARIADB_LIBRARY)

cmake/mysql.cmake

@@ -23,6 +23,13 @@ ELSEIF (APPLE)
   /opt/homebrew/include/mysql
   /opt/homebrew/opt/[email protected]/include
   /opt/homebrew/Cellar/[email protected]/*/include/mysql)
+ELSE (WIN32)
+  FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
+  /opt/homebrew/Cellar/[email protected]/*/include/mysql
+  /opt/homebrew/opt/[email protected]/include
+  /opt/homebrew/include/mysql
+  /usr/local/include/mysql
+  /usr/include/mysql)
 ENDIF()
 
 SET(MYSQL_NAMES mysqlclient)
@@ -45,6 +52,15 @@ ELSEIF (APPLE)
     /opt/homebrew/opt/[email protected]/lib
     /opt/homebrew/Cellar/[email protected]/*/lib
     PATH_SUFFIXES mysql)
+ELSE (WIN32)
+  FIND_LIBRARY(MYSQL_LIBRARY
+    NAMES ${MYSQL_NAMES}
+    PATHS /usr/lib 
+    /usr/local/lib
+    /opt/homebrew/lib
+    /opt/homebrew/opt/[email protected]/lib
+    /opt/homebrew/Cellar/[email protected]/*/lib
+    PATH_SUFFIXES mysql)
 ENDIF()
 
 IF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)

cmake/pgsql.cmake

@@ -21,6 +21,11 @@ ELSEIF (LINUX)
 ELSEIF (APPLE)
   FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
     /opt/homebrew/include/postgresql)
+ELSE (WIN32)
+  FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
+    /opt/homebrew/include/postgresql
+    /usr/local/include/postgresql
+    /usr/include/postgresql)
 ENDIF()
 
 IF (WIN32)
@@ -40,6 +45,13 @@ ELSEIF (APPLE)
   FIND_LIBRARY(PGSQL_LIBRARY
     NAMES ${PGSQL_NAMES}
     PATHS /opt/homebrew/lib)
+ELSE (WIN32)
+  SET(PGSQL_NAMES pq)
+  FIND_LIBRARY(PGSQL_LIBRARY
+    NAMES ${PGSQL_NAMES}
+    PATHS /usr/lib
+    /usr/local/lib
+    /opt/homebrew/lib)
 ENDIF()
 
 IF (PGSQL_INCLUDE_DIR AND PGSQL_LIBRARY)

ormpp/mysql.hpp

@@ -341,11 +341,11 @@ class mysql {
   template <typename T, typename... Args>
   std::enable_if_t<iguana::ylt_refletable_v<T>, std::vector<T>> query_s(
       const std::string &str, Args &&...args) {
+    constexpr auto SIZE = ylt::reflection::members_count_v<T>;
     std::string sql = generate_query_sql<T>(str);
 #ifdef ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
 #endif
-    constexpr auto SIZE = iguana::get_value<T>();
 
     stmt_ = mysql_stmt_init(con_);
     if (!stmt_) {
@@ -482,7 +482,7 @@ class mysql {
             index++;
           }
         },
-        std::make_index_sequence<std::tuple_size_v<T>>{});
+        std::make_index_sequence<SIZE>{});
 
     if (index == 0) {
       return {};
@@ -506,7 +506,7 @@ class mysql {
             using U = ylt::reflection::remove_cvref_t<decltype(item)>;
             if constexpr (iguana::ylt_refletable_v<U>) {
               ylt::reflection::for_each(
-                  item, [&param_binds, &index, &mp, &t, this](
+                  item, [&param_binds, &index, &mp, this](
                             auto &field, auto /*name*/, auto /*index*/) {
                     set_value(param_binds.at(index), field, index, mp);
                     index++;
@@ -529,9 +529,9 @@ class mysql {
           [&index, nulls](auto &item, auto /*index*/) {
             using U = ylt::reflection::remove_cvref_t<decltype(item)>;
             if constexpr (iguana::ylt_refletable_v<U>) {
-              ylt::reflection::for_each(item, [&index, nulls, &t](
-                                                  auto &field, auto /*name*/,
-                                                  auto /*index*/) {
+              ylt::reflection::for_each(item, [&index, nulls](auto &field,
+                                                              auto /*name*/,
+                                                              auto /*index*/) {
                 if (nulls.at(index++)) {
                   using W = ylt::reflection::remove_cvref_t<decltype(field)>;
                   if constexpr (is_optional_v<W>::value ||
@@ -562,11 +562,11 @@ class mysql {
   template <typename T, typename... Args>
   std::enable_if_t<iguana::ylt_refletable_v<T>, std::vector<T>> query(
       Args &&...args) {
+    constexpr auto SIZE = ylt::reflection::members_count_v<T>;
     std::string sql = generate_query_sql<T>(args...);
 #ifdef ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
 #endif
-    constexpr auto SIZE = iguana::get_value<T>();
 
     stmt_ = mysql_stmt_init(con_);
     if (!stmt_) {
@@ -945,7 +945,7 @@ class mysql {
   template <auto... members, typename T, typename... Args>
   int stmt_execute(const T &t, OptType type, Args &&...args) {
     std::vector<MYSQL_BIND> param_binds;
-    constexpr auto arr = iguana::indexs_of<members...>();
+    constexpr auto arr = indexs_of<members...>();
     if constexpr (sizeof...(members) > 0) {
       (set_param_bind(
            param_binds,

ormpp/postgresql.hpp

@@ -298,7 +298,6 @@ class postgresql {
       const Arg &s, Args &&...args) {
     static_assert(iguana::is_tuple<T>::value);
     constexpr auto SIZE = std::tuple_size_v<T>;
-
     std::string sql = s;
     constexpr auto Args_Size = sizeof...(Args);
     if (Args_Size != 0) {
@@ -449,8 +448,8 @@ class postgresql {
       bool has_add_field = false;
       for_each0(
           tp,
-          [&sql, &i, &has_add_field, &unique_fields, field_name, name, this](
-              auto item, auto I) {
+          [&sql, &i, &has_add_field, &unique_fields, field_name, name,
+           this](auto item) {
             if constexpr (std::is_same_v<decltype(item), ormpp_not_null> ||
                           std::is_same_v<decltype(item), ormpp_unique>) {
               if (item.fields.find(field_name.data()) == item.fields.end())
@@ -522,8 +521,8 @@ class postgresql {
 #ifdef ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
 #endif
-    res_ =
-        PQprepare(con_, "", sql.data(), (int)iguana::get_value<T>(), nullptr);
+    res_ = PQprepare(con_, "", sql.data(), ylt::reflection::members_count_v<T>,
+                     nullptr);
     auto guard = guard_statment(res_);
     return PQresultStatus(res_) == PGRES_COMMAND_OK;
   }
@@ -532,7 +531,7 @@ class postgresql {
   std::optional<uint64_t> stmt_execute(const T &t, OptType type,
                                        Args &&...args) {
     std::vector<std::vector<char>> param_values;
-    constexpr auto arr = iguana::indexs_of<members...>();
+    constexpr auto arr = indexs_of<members...>();
     if constexpr (sizeof...(members) > 0) {
       (set_param_values(
            param_values,

ormpp/sqlite.hpp

@@ -292,7 +292,6 @@ class sqlite {
       const Arg &s, Args &&...args) {
     static_assert(iguana::is_tuple<T>::value);
     constexpr auto SIZE = std::tuple_size_v<T>;
-
     std::string sql = s;
 #ifdef ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;

ormpp/utility.hpp

@@ -16,6 +16,12 @@ namespace ormpp {
 
 //-------------------------------------------------------------------------------------------------------------//
 //-------------------------------------------------------------------------------------------------------------//
+template <auto... members>
+constexpr std::array<size_t, sizeof...(members)> indexs_of() {
+  return std::array<size_t, sizeof...(members)>{
+      ylt::reflection::index_of<members>()...};
+}
+
 template <typename... Args, typename F, std::size_t... Idx>
 constexpr void for_each(std::tuple<Args...> &t, F &&f,
                         std::index_sequence<Idx...>) {
@@ -94,6 +100,39 @@ struct is_optional_v : std::false_type {};
 template <typename T>
 struct is_optional_v<std::optional<T>> : std::true_type {};
 
+template <typename T>
+constexpr std::enable_if_t<iguana::ylt_refletable_v<T>, size_t> get_value() {
+  return ylt::reflection::members_count_v<T>;
+}
+
+template <typename T>
+constexpr std::enable_if_t<iguana::non_ylt_refletable_v<T>, size_t>
+get_value() {
+  return 1;
+}
+
+template <typename... Args>
+struct value_of;
+
+template <typename T>
+struct value_of<T> {
+  static const auto value = (get_value<T>());
+};
+
+template <typename T, typename... Rest>
+struct value_of<T, Rest...> {
+  static const auto value = (value_of<T>::value + value_of<Rest...>::value);
+};
+
+template <typename List>
+struct result_size;
+
+template <template <class...> class List, class... T>
+struct result_size<List<T...>> {
+  constexpr static const size_t value =
+      value_of<T...>::value;  // (iguana::get_value<T>() + ...);
+};
+
 template <typename T>
 inline void append_impl(std::string &sql, const T &str) {
   if constexpr (std::is_same_v<std::string, T> ||
@@ -288,12 +327,12 @@ inline std::string generate_insert_sql(bool insert, Args &&...args) {
     std::string fields = "(";
     std::string values = "values(";
     for (auto i = 0; i < Count; ++i) {
-      std::string field_name = iguana::get_name<T>(i).data();
+      std::string field_name = ylt::reflection::name_of<T>(i).data();
       std::string value = "$" + std::to_string(++index);
       append(set, field_name, "=", value);
       fields += field_name;
       values += value;
-      if (i < SIZE - 1) {
+      if (i < Count - 1) {
         fields += ",";
         values += ",";
         set += ",";