From 9e93b4426adf53b3f56b5940d981610cc5d4ae43 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Wed, 11 Dec 2024 15:04:23 +0100
Subject: [PATCH] Added get_next_cell*() helper methods to QueryBuilder.

---
 modules/database/query_result.cpp             | 40 +++++++++++++++++++
 modules/database/query_result.h               | 12 ++++++
 .../database_sqlite/sqlite3_query_result.cpp  |  2 +
 3 files changed, 54 insertions(+)

diff --git a/modules/database/query_result.cpp b/modules/database/query_result.cpp
index a56d366cb..f47a4670d 100644
--- a/modules/database/query_result.cpp
+++ b/modules/database/query_result.cpp
@@ -32,6 +32,8 @@
 #include "query_result.h"
 
 bool QueryResult::next_row() {
+	_current_cell_index = 0;
+
 	return false;
 }
 
@@ -70,6 +72,32 @@ bool QueryResult::is_cell_null(const int index) {
 	return true;
 }
 
+int QueryResult::get_current_cell_index() const {
+	return  _current_cell_index;
+}
+void QueryResult::set_current_cell_index(const int p_index) {
+	_current_cell_index = p_index;
+}
+
+String QueryResult::get_next_cell() {
+	return get_cell(_current_cell_index++);
+}
+bool QueryResult::get_next_cell_bool() {
+	return get_cell_bool(_current_cell_index++);
+}
+int QueryResult::get_next_cell_int() {
+	return get_cell_int(_current_cell_index++);
+}
+float QueryResult::get_next_cell_float() {
+	return get_cell_float(_current_cell_index++);
+}
+double QueryResult::get_next_cell_double() {
+	return get_cell_double(_current_cell_index++);
+}
+bool QueryResult::is_next_cell_null() {
+	return is_cell_null(_current_cell_index++);
+}
+
 int QueryResult::get_last_insert_rowid() {
 	return 0;
 }
@@ -79,6 +107,7 @@ String QueryResult::get_error_message() {
 }
 
 QueryResult::QueryResult() {
+	_current_cell_index = 0;
 }
 
 QueryResult::~QueryResult() {
@@ -95,6 +124,17 @@ void QueryResult::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("is_cell_null", "index"), &QueryResult::is_cell_null);
 
+	ClassDB::bind_method(D_METHOD("get_current_cell_index"), &QueryResult::get_current_cell_index);
+	ClassDB::bind_method(D_METHOD("set_current_cell_index", "index"), &QueryResult::set_current_cell_index);
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "current_cell_index"), "set_current_cell_index", "get_current_cell_index");
+
+	ClassDB::bind_method(D_METHOD("get_next_cell"), &QueryResult::get_next_cell);
+	ClassDB::bind_method(D_METHOD("get_next_cell_bool"), &QueryResult::get_next_cell_bool);
+	ClassDB::bind_method(D_METHOD("get_next_cell_int"), &QueryResult::get_next_cell_int);
+	ClassDB::bind_method(D_METHOD("get_next_cell_float"), &QueryResult::get_next_cell_float);
+	ClassDB::bind_method(D_METHOD("get_next_cell_double"), &QueryResult::get_next_cell_double);
+	ClassDB::bind_method(D_METHOD("is_next_cell_null"), &QueryResult::is_next_cell_null);
+
 	ClassDB::bind_method(D_METHOD("get_last_insert_rowid"), &QueryResult::get_last_insert_rowid);
 
 	ClassDB::bind_method(D_METHOD("get_error_message"), &QueryResult::get_error_message);
diff --git a/modules/database/query_result.h b/modules/database/query_result.h
index 53abb2837..bf1df3795 100644
--- a/modules/database/query_result.h
+++ b/modules/database/query_result.h
@@ -50,6 +50,16 @@ public:
 
 	virtual bool is_cell_null(const int index);
 
+	int get_current_cell_index() const;
+	void set_current_cell_index(const int p_index);
+
+	String get_next_cell();
+	bool get_next_cell_bool();
+	int get_next_cell_int();
+	float get_next_cell_float();
+	double get_next_cell_double();
+	bool is_next_cell_null();
+
 	virtual int get_last_insert_rowid();
 
 	virtual String get_error_message();
@@ -59,6 +69,8 @@ public:
 
 protected:
 	static void _bind_methods();
+
+	int _current_cell_index;
 };
 
 #endif
diff --git a/modules/database_sqlite/sqlite3_query_result.cpp b/modules/database_sqlite/sqlite3_query_result.cpp
index 0024c6486..625c4cfaf 100644
--- a/modules/database_sqlite/sqlite3_query_result.cpp
+++ b/modules/database_sqlite/sqlite3_query_result.cpp
@@ -6,6 +6,8 @@
 #include <cstdio>
 
 bool Sqlite3QueryResult::next_row() {
+	_current_cell_index = 0;
+
 	return ++current_row < rows.size();
 }