From 801fbdd187655b32bc47aa6eb794383c11ebe7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sascha=20K=C3=BChl?= <skuehl1972@gmail.com>
Date: Sat, 7 Mar 2026 16:34:48 +0100
Subject: [PATCH] fixed nextval and update tests

---
 source/orm/query/intermediates/query_select_intermediate.cpp | 1 +
 source/orm/query/query_builder.cpp                           | 2 +-
 test/backends/QueryStatementTests.cpp                        | 5 +----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/orm/query/intermediates/query_select_intermediate.cpp b/source/orm/query/intermediates/query_select_intermediate.cpp
index 2b9e986..d9f7ca7 100644
--- a/source/orm/query/intermediates/query_select_intermediate.cpp
+++ b/source/orm/query/intermediates/query_select_intermediate.cpp
@@ -12,6 +12,7 @@ query_select_intermediate::query_select_intermediate(const std::vector<table_col
 }
 
 fetchable_query query_select_intermediate::nextval(const std::string& sequence_name) {
+  context_->parts.pop_back();
   context_->parts.push_back(std::make_unique<internal::query_select_nextval_part>(sequence_name));
   return {context_};
 }
diff --git a/source/orm/query/query_builder.cpp b/source/orm/query/query_builder.cpp
index d7b83d6..605b4ca 100644
--- a/source/orm/query/query_builder.cpp
+++ b/source/orm/query/query_builder.cpp
@@ -100,7 +100,7 @@ void query_builder::visit(internal::query_select_part &part) {
 }
 
 void query_builder::visit(internal::query_select_nextval_part& part) {
-  query_.sql += dialect_->nextval() + "('" + part.sequence_name() + "')";
+  query_.sql += dialect_->select() + " " + dialect_->nextval() + "('" + part.sequence_name() + "')";
   prepare_prototype(query_.prototype, part.sequence_name());
 }
 
diff --git a/test/backends/QueryStatementTests.cpp b/test/backends/QueryStatementTests.cpp
index b5b6069..7d9aa75 100644
--- a/test/backends/QueryStatementTests.cpp
+++ b/test/backends/QueryStatementTests.cpp
@@ -110,10 +110,7 @@ TEST_CASE_METHOD(QueryFixture, "Test update statement", "[query][statement][upda
   george.age = 36;
   george.image = {5,6,7,8};
   stmt = query::update(PERSON)
-    .set(PERSON.id, _)
-    .set(PERSON.name, _)
-    .set(PERSON.age, _)
-    .set(PERSON.image, _)
+    .set<person>()
     .where(PERSON.id == _)
     .prepare(db);
   REQUIRE(stmt);