last fix

Watermelon914 · Apr 12, 2020 · 1be226e · 1be226e
1 parent fbb1787
commit 1be226e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/code/datums/_ndatabase/code/bsql_adapter.dm b/code/datums/_ndatabase/code/bsql_adapter.dm
@@ -303,7 +303,10 @@
 			var/esfield = "[escape_string(field)]"
 			if(!local_first)
 				local_text+=","
-			local_text += "'[escape_string(fields[field])]' as `[esfield]`"
+			if(fields[field] != null)
+				local_text += "'[escape_string(fields[field])]' as `[esfield]`"
+			else
+				local_text += "null as `[esfield]`"
 			if(first && !is_id)
 				if(!items_first)
 					update_items+=","

diff --git a/code/datums/_ndatabase/code/bsql_persistent_query.dm b/code/datums/_ndatabase/code/bsql_persistent_query.dm
@@ -18,7 +18,6 @@
 		if(is_complete && !errored)
 			if(!query.last_result)
 				status = DB_QUERY_FINISHED
-				qdel(query)
 				query = null
 				return
 			status = DB_QUERY_READING

diff --git a/code/datums/_ndatabase/code/native_persistent_query.dm b/code/datums/_ndatabase/code/native_persistent_query.dm
@@ -24,6 +24,5 @@
 		while(query.NextRow())
 			var/list/current_row = query.GetRowData()
 			results += list(current_row)
-	affected_rows = query.RowsAffected()
-	qdel(query)
+	affected_rows = query.RowsAffected()	
 	status = DB_QUERY_FINISHED