From ee4808dd5a7f43740e5496db887216bf5e0c92d6 Mon Sep 17 00:00:00 2001
From: Kenzzer <14257866+kenzzer@users.noreply.github.com>
Date: Sun, 17 Aug 2025 22:09:11 +0000
Subject: [PATCH] Strip sourcehook from SQLite

---
 AMBuildScript                          | 2 +-
 extensions/sqlite/driver/SqDatabase.h  | 2 +-
 extensions/sqlite/driver/SqDriver.cpp  | 9 +++------
 extensions/sqlite/driver/SqDriver.h    | 9 ++++-----
 extensions/sqlite/driver/SqQuery.h     | 2 +-
 extensions/sqlite/driver/SqResults.cpp | 2 +-
 extensions/sqlite/driver/SqResults.h   | 2 +-
 7 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/AMBuildScript b/AMBuildScript
index 6c9d25813..5bcaf992d 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -674,7 +674,7 @@ else:
     #'extensions/regex/AMBuilder',
     #'extensions/sdkhooks/AMBuilder',
     #'extensions/sdktools/AMBuilder',
-    #'extensions/sqlite/AMBuilder',
+    'extensions/sqlite/AMBuilder',
     #'extensions/tf2/AMBuilder',
     #'extensions/topmenus/AMBuilder',
     #'extensions/updater/AMBuilder',
diff --git a/extensions/sqlite/driver/SqDatabase.h b/extensions/sqlite/driver/SqDatabase.h
index ee4d49ac2..dab02ba81 100644
--- a/extensions/sqlite/driver/SqDatabase.h
+++ b/extensions/sqlite/driver/SqDatabase.h
@@ -72,7 +72,7 @@ private:
 	sqlite3 *m_sq3;
 	std::recursive_mutex m_FullLock;
 	bool m_Persistent;
-	String m_LastError;
+	std::string m_LastError;
 	int m_LastErrorCode;
 };
 
diff --git a/extensions/sqlite/driver/SqDriver.cpp b/extensions/sqlite/driver/SqDriver.cpp
index 3b4ffbaff..9b72e1ef3 100644
--- a/extensions/sqlite/driver/SqDriver.cpp
+++ b/extensions/sqlite/driver/SqDriver.cpp
@@ -77,9 +77,8 @@ SqDriver::~SqDriver()
 {
 	std::lock_guard<std::mutex> lock(m_OpenLock);
 
-	List<SqDbInfo>::iterator iter;
 	SqDatabase *sqdb;
-	for (iter = m_Cache.begin(); iter != m_Cache.end(); iter++)
+	for (auto iter = m_Cache.begin(); iter != m_Cache.end(); iter++)
 	{
 		// Don't let SqDatabase try to remove itself from m_Cache
 		// now that we're gone.
@@ -258,8 +257,7 @@ IDatabase *SqDriver::Connect(const DatabaseInfo *info, bool persistent, char *er
 	if (persistent)
 	{
 		/* See if anything in the cache matches */
-		List<SqDbInfo>::iterator iter;
-		for (iter = m_Cache.begin(); iter != m_Cache.end(); iter++)
+		for (auto iter = m_Cache.begin(); iter != m_Cache.end(); iter++)
 		{
 			if ((*iter).path.compare(fullpath) == 0)
 			{
@@ -298,8 +296,7 @@ void SqDriver::RemovePersistent(IDatabase *pdb)
 {
 	std::lock_guard<std::mutex> lock(m_OpenLock);
 
-	List<SqDbInfo>::iterator iter;
-	for (iter = m_Cache.begin(); iter != m_Cache.end(); iter++)
+	for (auto iter = m_Cache.begin(); iter != m_Cache.end(); iter++)
 	{
 		if ((*iter).db == pdb)
 		{
diff --git a/extensions/sqlite/driver/SqDriver.h b/extensions/sqlite/driver/SqDriver.h
index e41c9e702..6d2f0e48c 100644
--- a/extensions/sqlite/driver/SqDriver.h
+++ b/extensions/sqlite/driver/SqDriver.h
@@ -34,17 +34,16 @@
 
 #define SOURCEMOD_SQL_DRIVER_CODE
 #include <IDBDriver.h>
-#include <sh_list.h>
-#include <sh_string.h>
+#include <list>
+#include <string>
 #include <mutex>
 #include "sqlite-source/sqlite3.h"
 
 using namespace SourceMod;
-using namespace SourceHook;
 
 struct SqDbInfo
 {
-	String path;
+	std::string path;
 	IDatabase *db;
 };
 
@@ -73,7 +72,7 @@ public:
 private:
 	Handle_t m_Handle;
 	std::mutex m_OpenLock;
-	List<SqDbInfo> m_Cache;
+	std::list<SqDbInfo> m_Cache;
 	bool m_bThreadSafe;
 	bool m_bShutdown;
 };
diff --git a/extensions/sqlite/driver/SqQuery.h b/extensions/sqlite/driver/SqQuery.h
index 2881d2d61..cc20993c2 100644
--- a/extensions/sqlite/driver/SqQuery.h
+++ b/extensions/sqlite/driver/SqQuery.h
@@ -86,7 +86,7 @@ private:
 	sqlite3_stmt *m_pStmt;
 	SqResults *m_pResults;
 	unsigned int m_ParamCount;
-	String m_LastError;
+	std::string m_LastError;
 	int m_LastErrorCode;
 	unsigned int m_AffectedRows;
 	unsigned int m_InsertID;
diff --git a/extensions/sqlite/driver/SqResults.cpp b/extensions/sqlite/driver/SqResults.cpp
index 3bd0be388..75a40b3c8 100644
--- a/extensions/sqlite/driver/SqResults.cpp
+++ b/extensions/sqlite/driver/SqResults.cpp
@@ -42,7 +42,7 @@ SqResults::SqResults(SqQuery *query) :
 	m_ColCount = sqlite3_column_count(m_pStmt);
 	if (m_ColCount)
 	{
-		m_ColNames = new String[m_ColCount];
+		m_ColNames = new std::string[m_ColCount];
 		for (unsigned int i=0; i<m_ColCount; i++)
 		{
 			m_ColNames[i].assign(sqlite3_column_name(m_pStmt, i));
diff --git a/extensions/sqlite/driver/SqResults.h b/extensions/sqlite/driver/SqResults.h
index 1491fb2e3..a29767731 100644
--- a/extensions/sqlite/driver/SqResults.h
+++ b/extensions/sqlite/driver/SqResults.h
@@ -86,7 +86,7 @@ private:
 	SqField *GetField(unsigned int col);
 private:
 	sqlite3_stmt *m_pStmt;		/** DOES NOT CHANGE */
-	String *m_ColNames;			/** DOES NOT CHANGE */
+	std::string *m_ColNames;	/** DOES NOT CHANGE */
 	unsigned int m_ColCount;	/** DOES NOT CHANGE */
 	BaseStringTable m_Strings;	/** DOES NOT CHANGE */
 	BaseMemTable *m_pMemory;	/** DOES NOT CHANGE */