add api to get insert id

qicosmos · Aug 7, 2023 · e7bb8fd · e7bb8fd
1 parent 2a78b02
commit e7bb8fd
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 24 deletions.
diff --git a/include/dbng.hpp b/include/dbng.hpp
@@ -34,13 +34,14 @@ class dbng {
   }
 
   template <typename T, typename... Args>
-  int insert(const T &t, Args &&...args) {
-    return db_.insert(t, std::forward<Args>(args)...);
+  int insert(const T &t, bool get_insert_id = false, Args &&...args) {
+    return db_.insert(t, get_insert_id, std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
-  int insert(const std::vector<T> &t, Args &&...args) {
-    return db_.insert(t, std::forward<Args>(args)...);
+  int insert(const std::vector<T> &t, bool get_insert_id = false,
+             Args &&...args) {
+    return db_.insert(t, get_insert_id, std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>

diff --git a/include/mysql.hpp b/include/mysql.hpp
@@ -94,41 +94,42 @@ class mysql {
   }
 
   template <typename T, typename... Args>
-  int insert(const std::vector<T> &t, Args &&...args) {
+  int insert(const std::vector<T> &t, bool get_insert_id = false,
+             Args &&...args) {
     reset_error();
     auto name = get_name<T>();
     std::string sql = auto_key_map_[name].empty()
                           ? generate_insert_sql<T>(false)
                           : generate_auto_insert_sql<T>(auto_key_map_, false);
 
-    return insert_impl(sql, t, std::forward<Args>(args)...);
+    return insert_impl(sql, t, get_insert_id, std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
   int update(const std::vector<T> &t, Args &&...args) {
     reset_error();
     std::string sql = generate_insert_sql<T>(true);
 
-    return insert_impl(sql, t, std::forward<Args>(args)...);
+    return insert_impl(sql, t, false, std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
-  int insert(const T &t, Args &&...args) {
+  int insert(const T &t, bool get_insert_id = false, Args &&...args) {
     reset_error();
     // insert into person values(?, ?, ?);
     auto name = get_name<T>();
     std::string sql = auto_key_map_[name].empty()
                           ? generate_insert_sql<T>(false)
                           : generate_auto_insert_sql<T>(auto_key_map_, false);
 
-    return insert_impl(sql, t, std::forward<Args>(args)...);
+    return insert_impl(sql, t, get_insert_id, std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
   int update(const T &t, Args &&...args) {
     reset_error();
     std::string sql = generate_insert_sql<T>(true);
-    return insert_impl(sql, t, std::forward<Args>(args)...);
+    return insert_impl(sql, t, false, std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
@@ -460,10 +461,14 @@ class mysql {
       return {};
     }
 
+    auto vv1 = mysql_stmt_affected_rows(stmt_);
+    auto vv2 = stmt_->affected_rows;
+
     while (mysql_stmt_fetch(stmt_) == 0) {
       iguana::for_each(t, [&mp, &param_binds, &t, this](auto item, auto i) {
         constexpr auto Idx = decltype(i)::value;
         set_value(param_binds.at(Idx), t.*item, Idx, mp);
+        auto res = mysql_stmt_result_metadata(stmt_);
       });
 
       for (auto &p : mp) {
@@ -479,6 +484,9 @@ class mysql {
       });
     }
 
+    auto vv3 = mysql_stmt_affected_rows(stmt_);
+    auto vv4 = stmt_->affected_rows;
+
     return v;
   }
 
@@ -722,7 +730,8 @@ class mysql {
   };
 
   template <typename T, typename... Args>
-  int insert_impl(const std::string &sql, const T &t, Args &&...args) {
+  int insert_impl(const std::string &sql, const T &t,
+                  bool get_insert_id = false, Args &&...args) {
 #if ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
 #endif
@@ -739,12 +748,12 @@ class mysql {
     if (stmt_execute(t) < 0)
       return INT_MIN;
 
-    return 1;
+    return get_insert_id ? stmt_->insert_id : 1;
   }
 
   template <typename T, typename... Args>
   int insert_impl(const std::string &sql, const std::vector<T> &t,
-                  Args &&...args) {
+                  bool get_insert_id = false, Args &&...args) {
 #if ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
 #endif
@@ -772,7 +781,7 @@ class mysql {
     }
     b = commit();
 
-    return b ? (int)t.size() : INT_MIN;
+    return b ? (get_insert_id ? stmt_->insert_id : (int)t.size()) : INT_MIN;
   }
 
   template <typename... Args>

diff --git a/include/sqlite.hpp b/include/sqlite.hpp
@@ -71,35 +71,38 @@ class sqlite {
   }
 
   template <typename T, typename... Args>
-  int insert(const T &t, Args &&...args) {
+  int insert(const T &t, bool get_insert_id = false, Args &&...args) {
     std::string sql = auto_key_map_.empty()
                           ? generate_insert_sql<T>(false)
                           : generate_auto_insert_sql0<T>(auto_key_map_, false);
 
-    return insert_impl(false, sql, t, std::forward<Args>(args)...);
+    return insert_impl(false, sql, t, get_insert_id,
+                       std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
-  int insert(const std::vector<T> &t, Args &&...args) {
+  int insert(const std::vector<T> &t, bool get_insert_id = false,
+             Args &&...args) {
     std::string sql = auto_key_map_.empty()
                           ? generate_insert_sql<T>(false)
                           : generate_auto_insert_sql0<T>(auto_key_map_, false);
 
-    return insert_impl(false, sql, t, std::forward<Args>(args)...);
+    return insert_impl(false, sql, t, get_insert_id,
+                       std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
   int update(const T &t, Args &&...args) {
     std::string sql = generate_insert_sql<T>(true);
 
-    return insert_impl(true, sql, t, std::forward<Args>(args)...);
+    return insert_impl(true, sql, t, false, std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
   int update(const std::vector<T> &t, Args &&...args) {
     std::string sql = generate_insert_sql<T>(true);
 
-    return insert_impl(true, sql, t, std::forward<Args>(args)...);
+    return insert_impl(true, sql, t, false, std::forward<Args>(args)...);
   }
 
   template <typename T, typename... Args>
@@ -437,7 +440,7 @@ class sqlite {
 
   template <typename T, typename... Args>
   int insert_impl(bool is_update, const std::string &sql, const T &t,
-                  Args &&...args) {
+                  bool get_insert_id = false, Args &&...args) {
 #if ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
 #endif
@@ -480,12 +483,13 @@ class sqlite {
       return INT_MIN;
     }
 
-    return 1;
+    return get_insert_id ? sqlite3_last_insert_rowid(handle_) : 1;
   }
 
   template <typename T, typename... Args>
   int insert_impl(bool is_update, const std::string &sql,
-                  const std::vector<T> &v, Args &&...args) {
+                  const std::vector<T> &v, bool get_insert_id = false,
+                  Args &&...args) {
 #if ORMPP_ENABLE_LOG
     std::cout << sql << std::endl;
 #endif
@@ -548,7 +552,9 @@ class sqlite {
 
     b = commit();
 
-    return b ? (int)v.size() : INT_MIN;
+    return b ? (get_insert_id ? sqlite3_last_insert_rowid(handle_)
+                              : (int)v.size())
+             : INT_MIN;
   }
 
   template <typename T>

diff --git a/tests/test_ormpp.cpp b/tests/test_ormpp.cpp
@@ -979,4 +979,29 @@ TEST_CASE("test create table with unique and test query") {
     CHECK(v2.size() == 1);
   }
 #endif
+}
+
+TEST_CASE("get_insert_id") {
+#ifdef ORMPP_ENABLE_MYSQL
+  dbng<mysql> mysql;
+  if (mysql.connect(ip, "root", password, db)) {
+    mysql.execute("drop table if exists person");
+    mysql.create_datatable<person>(ormpp_auto_key{"id"});
+    mysql.insert<person>({0, "purecpp", 200});
+    mysql.insert<person>({0, "purecpp", 200});
+    int id = mysql.insert<person>({0, "purecpp", 200}, true);
+    CHECK(id == 3);
+  }
+#endif
+#ifdef ORMPP_ENABLE_SQLITE3
+  dbng<sqlite> sqlite;
+  if (sqlite.connect(db)) {
+    sqlite.execute("drop table if exists person");
+    sqlite.create_datatable<person>(ormpp_auto_key{"id"});
+    sqlite.insert<person>({0, "purecpp", 200});
+    sqlite.insert<person>({0, "purecpp", 200});
+    int id = sqlite.insert<person>({0, "purecpp", 200}, true);
+    CHECK(id == 3);
+  }
+#endif
 }