Fixed item expiration SQL queries

Thanks to #146 for reporting an SQL error
nuclearsilo583 · Feb 18, 2023 · 4a3364e · 4a3364e
1 parent 64955fa
commit 4a3364e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/addons/sourcemod/scripting/store/db.sp b/addons/sourcemod/scripting/store/db.sp
@@ -38,10 +38,15 @@ public void Store_DB_HouseKeeping(Handle db)
 {
 	// Do some housekeeping
 	char m_szQuery[256], m_szLogCleaningQuery[256];
-	Format(STRING(m_szQuery), "delete `store_items`, `store_equipment`"
-							... "from  `store_items`, `store_equipment` "
-							... "where (store_items.unique_id = store_equipment.unique_id) "
-							... "and store_items.date_of_expiration<>0 and store_items.date_of_expiration<%d", GetTime());
+	// Remove expired and equipped items
+	Format(STRING(m_szQuery), "DELETE FROM store_items, store_equipment "
+							... "WHERE (store_items.unique_id = store_equipment.unique_id) "
+								... "AND store_items.date_of_expiration != 0 "
+								... "AND store_items.date_of_expiration < %d", GetTime());
+	SQL_TVoid(db, m_szQuery);
+
+	// Remove expired and unequipped items
+	Format(STRING(m_szQuery), "DELETE FROM store_items WHERE date_of_expiration != 0 AND date_of_expiration < %d", GetTime());
 	SQL_TVoid(db, m_szQuery);
 
 	char m_szDriver[2];

diff --git a/addons/sourcemod/scripting/store/sql.sp b/addons/sourcemod/scripting/store/sql.sp
@@ -131,7 +131,15 @@ public void SQLCallback_Connect(Handle owner, Handle hndl, const char[] error, a
 
 		// Do some housekeeping
 		char m_szQuery[256], m_szLogCleaningQuery[256];
-		Format(STRING(m_szQuery), "DELETE FROM store_items WHERE `date_of_expiration` <> 0 AND `date_of_expiration` < %d", GetTime());
+		// Remove expired and equipped items
+		Format(STRING(m_szQuery), "DELETE FROM store_items, store_equipment "
+								... "WHERE (store_items.unique_id = store_equipment.unique_id) "
+									... "AND store_items.date_of_expiration != 0 "
+									... "AND store_items.date_of_expiration < %d", GetTime());
+		SQL_TVoid(g_hDatabase, m_szQuery);
+
+		// Remove expired and unequipped items
+		Format(STRING(m_szQuery), "DELETE FROM store_items WHERE date_of_expiration != 0 AND date_of_expiration < %d", GetTime());
 		SQL_TVoid(g_hDatabase, m_szQuery);
 
 

diff --git a/addons/sourcemod/scripting/store_combine.sp b/addons/sourcemod/scripting/store_combine.sp
@@ -826,10 +826,15 @@ public void OnConfigsExecuted()
 	else
 	{
 		char m_szQuery[256], m_szLogCleaningQuery[256];
-		Format(STRING(m_szQuery), "delete `store_items`, `store_equipment`"
-								... "from  `store_items`, `store_equipment` "
-								... "where (store_items.unique_id = store_equipment.unique_id) "
-								... "and store_items.date_of_expiration<>0 and store_items.date_of_expiration<%d", GetTime());
+		// Remove expired and equipped items
+		Format(STRING(m_szQuery), "DELETE FROM store_items, store_equipment "
+								... "WHERE (store_items.unique_id = store_equipment.unique_id) "
+									... "AND store_items.date_of_expiration != 0 "
+									... "AND store_items.date_of_expiration < %d", GetTime());
+		SQL_TVoid(g_hDatabase, m_szQuery);
+
+		// Remove expired and unequipped items
+		Format(STRING(m_szQuery), "DELETE FROM store_items WHERE date_of_expiration != 0 AND date_of_expiration < %d", GetTime());
 		SQL_TVoid(g_hDatabase, m_szQuery);
 
 		char m_szDriver[2];
@@ -3552,7 +3557,15 @@ public void SQLCallback_Connect(Handle owner, Handle hndl, const char[] error, a
 
 		// Do some housekeeping
 		char m_szQuery[256], m_szLogCleaningQuery[256];
-		Format(STRING(m_szQuery), "DELETE FROM store_items WHERE `date_of_expiration` <> 0 AND `date_of_expiration` < %d", GetTime());
+		// Remove expired and equipped items
+		Format(STRING(m_szQuery), "DELETE FROM store_items, store_equipment "
+								... "WHERE (store_items.unique_id = store_equipment.unique_id) "
+									... "AND store_items.date_of_expiration != 0 "
+									... "AND store_items.date_of_expiration < %d", GetTime());
+		SQL_TVoid(g_hDatabase, m_szQuery);
+
+		// Remove expired and unequipped items
+		Format(STRING(m_szQuery), "DELETE FROM store_items WHERE date_of_expiration != 0 AND date_of_expiration < %d", GetTime());
 		SQL_TVoid(g_hDatabase, m_szQuery);
 
 		/*Format(STRING(m_szVoucherQuery), "UPDATE store_voucher SET"