From af7d89316451b175b2b8ee2b3a133a0068c7bc0d Mon Sep 17 00:00:00 2001
From: Andyyy7666 <86536434+Andyyy7666@users.noreply.github.com>
Date: Wed, 12 Jul 2023 04:51:04 +0200
Subject: [PATCH] refactor: database queries

---
 database/vehicles.sql | 12 ++++++++++++
 query.sql             | 15 ---------------
 server/main.lua       | 10 ++++++++++
 3 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 database/vehicles.sql
 delete mode 100644 query.sql

diff --git a/database/vehicles.sql b/database/vehicles.sql
new file mode 100644
index 0000000..4448a8e
--- /dev/null
+++ b/database/vehicles.sql
@@ -0,0 +1,12 @@
+CREATE TABLE IF NOT EXISTS `nd_vehicles` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`owner` INT(11) DEFAULT NULL,
+	`plate` VARCHAR(255) DEFAULT NULL,
+	`glovebox` LONGTEXT DEFAULT '[]',
+	`trunk` LONGTEXT DEFAULT '[]',
+	`properties` LONGTEXT DEFAULT '[]',
+	`stored` INT(11) DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE,
+	INDEX `owner` (`owner`) USING BTREE,
+	CONSTRAINT `vehowner` FOREIGN KEY (`owner`) REFERENCES `nd_characters` (`charid`) ON UPDATE CASCADE ON DELETE CASCADE
+);
diff --git a/query.sql b/query.sql
deleted file mode 100644
index 05e16f8..0000000
--- a/query.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-CREATE TABLE IF NOT EXISTS `nd_characters` (
-	`charid` INT(10) NOT NULL AUTO_INCREMENT,
-	`license` VARCHAR(200) NOT NULL DEFAULT '0',
-	`name` VARCHAR(50) DEFAULT NULL,
-	`firstname` VARCHAR(50) DEFAULT NULL,
-	`lastname` VARCHAR(50) DEFAULT NULL,
-	`dob` VARCHAR(50) DEFAULT NULL,
-	`gender` VARCHAR(50) DEFAULT NULL,
-	`cash` INT(10) DEFAULT '0',
-	`bank` INT(10) DEFAULT '0',
-	`groups` LONGTEXT DEFAULT '[]',
-	`metadata` LONGTEXT DEFAULT '[]',
-	`inventory` LONGTEXT DEFAULT '[]',
-	PRIMARY KEY (`charid`) USING BTREE
-);
diff --git a/server/main.lua b/server/main.lua
index 629634a..ab94421 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -2,6 +2,10 @@ NDCore = {}
 ActivePlayers = {}
 PlayersInfo = {}
 local tempPlayersInfo = {}
+local databaseFiles = {
+    "database/characters.sql",
+    "database/vehicles.sql"
+}
 
 AddEventHandler("playerDropped", function()
     local src = source
@@ -99,3 +103,9 @@ AddEventHandler("playerConnecting", function(name, setKickReason, deferrals)
         Wait(0)
     end
 end)
+for i=1, #databaseFiles do
+    local file = LoadResourceFile(resourceName, databaseFiles[i])
+    if file then
+        MySQL.query(file)
+    end
+end