Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-03 17:39:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

DatabaseConnection::database_connect() now returns Error.

Browse Source
This commit is contained in:
Relintai 2024-04-27 14:41:42 +02:00
parent 06e0be8d04
commit add7fff92b
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/database/database_connection.cpp
View File

@ -36,7 +36,8 @@
#include "query_result.h" #include "query_result.h"
#include "table_builder.h" #include "table_builder.h"
void DatabaseConnection::database_connect(const String &connection_str) { Error DatabaseConnection::database_connect(const String &connection_str) {
return ERR_PRINTER_ON_FIRE;
} }
Ref<QueryResult> DatabaseConnection::query(const String &query) { Ref<QueryResult> DatabaseConnection::query(const String &query) {

2
modules/database/database_connection.h
View File

@ -45,7 +45,7 @@ class DatabaseConnection : public Reference {
GDCLASS(DatabaseConnection, Reference); GDCLASS(DatabaseConnection, Reference);
public: public:
virtual void database_connect(const String &connection_str); virtual Error database_connect(const String &connection_str);
virtual Ref<QueryResult> query(const String &query); virtual Ref<QueryResult> query(const String &query);
virtual void query_run(const String &query); virtual void query_run(const String &query);

5
modules/database_sqlite/sqlite3_connection.cpp
View File

@ -26,7 +26,7 @@ Ref<TableBuilder> SQLite3DatabaseConnection::get_table_builder() {
return b; return b;
} }
void SQLite3DatabaseConnection::database_connect(const String &connection_str) { Error SQLite3DatabaseConnection::database_connect(const String &connection_str) {
int ret = sqlite3_config(SQLITE_CONFIG_SERIALIZED); int ret = sqlite3_config(SQLITE_CONFIG_SERIALIZED);
//if (ret != SQLITE_OK) { //if (ret != SQLITE_OK) {
//ERR_PRINT("SQLITE3 multithreading is not supported!\n"); //ERR_PRINT("SQLITE3 multithreading is not supported!\n");
@ -39,7 +39,10 @@ void SQLite3DatabaseConnection::database_connect(const String &connection_str) {
if (ret != SQLITE_OK) { if (ret != SQLITE_OK) {
ERR_PRINT(vformat("SQLITE3 database_connect failed! code: %d !", ret)); ERR_PRINT(vformat("SQLITE3 database_connect failed! code: %d !", ret));
return FAILED;
} }
return OK;
} }
Ref<QueryResult> SQLite3DatabaseConnection::query(const String &query) { Ref<QueryResult> SQLite3DatabaseConnection::query(const String &query) {

2
modules/database_sqlite/sqlite3_connection.h
View File

@ -13,7 +13,7 @@ struct sqlite3;
class SQLite3DatabaseConnection : public DatabaseConnection { class SQLite3DatabaseConnection : public DatabaseConnection {
public: public:
void database_connect(const String &connection_str); Error database_connect(const String &connection_str);
Ref<QueryResult> query(const String &query); Ref<QueryResult> query(const String &query);
void query_run(const String &query); void query_run(const String &query);