From 07f252634f36f686e05d597d5eea2a2f84e0a2e0 Mon Sep 17 00:00:00 2001 From: nowhere Date: Wed, 28 Aug 2024 19:27:06 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ ormpp/utility.hpp | 2 +- tests/test_ormpp.cpp | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 39821c17..f821c6ce 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ *build* .vscode .cache +/.vs +/CMakeSettings.json diff --git a/ormpp/utility.hpp b/ormpp/utility.hpp index 88aea59b..dd09e3ea 100644 --- a/ormpp/utility.hpp +++ b/ormpp/utility.hpp @@ -451,7 +451,7 @@ inline void get_sql_conditions(std::string &sql, const std::string &arg, auto pos = sql.find("where"); sql = sql.substr(0, pos); } - if (arg.find("limit") != std::string::npos) { + if (temp.find("limit") != std::string::npos) { auto pos = sql.find("where"); sql = sql.substr(0, pos); } diff --git a/tests/test_ormpp.cpp b/tests/test_ormpp.cpp index db31d9a2..d99f66ab 100644 --- a/tests/test_ormpp.cpp +++ b/tests/test_ormpp.cpp @@ -1392,6 +1392,8 @@ TEST_CASE("query_s delete_records_s") { auto vec5 = sqlite.query_s("name=? and age=?", "purecpp", 200); auto vec6 = sqlite.query_s("select * from person where name=?", "purecpp"); + auto vec11 = + sqlite.query_s("SELECT * FROM PERSON WHERE NAME=?", "purecpp"); auto vec7 = sqlite.query_s("name=?", "purecpp' or '1=1"); sqlite.delete_records_s("name=?", "purecpp' or '1=1"); auto vec8 = sqlite.query_s(); @@ -1415,6 +1417,7 @@ TEST_CASE("query_s delete_records_s") { CHECK(vec8.size() == 2); CHECK(vec9.size() == 1); CHECK(vec10.size() == 0); + CHECK(vec11.front().age == 200); } #endif }