From cb4dce40547778f84b31a782029b6485c5488aa2 Mon Sep 17 00:00:00 2001 From: Linden Date: Fri, 25 Jun 2021 17:46:28 +1000 Subject: [PATCH] fix(sql): Set `stored` value in vehicleshop; update all identifiers to VARCHAR(60) - Corrects vehicles displaying as stored regardless of set to 0. - Support for multicharacter extending identifier length --- resources/esx_addonaccount/esx_addonaccount.sql | 2 +- resources/esx_addoninventory/esx_addoninventory.sql | 2 +- resources/esx_billing/esx_billing.sql | 6 +++--- resources/esx_datastore/esx_datastore.sql | 2 +- resources/esx_license/esx_license.sql | 2 +- resources/esx_phone/esx_phone.sql | 2 +- resources/esx_vehicleshop/esx_vehicleshop.sql | 6 +++--- .../esx_vehicleshop/localization/br_esx_vehicleshop.sql | 6 +++--- .../esx_vehicleshop/localization/de_esx_vehicleshop.sql | 6 +++--- .../esx_vehicleshop/localization/en_esx_vehicleshop.sql | 6 +++--- .../esx_vehicleshop/localization/fi_esx_vehicleshop.sql | 6 +++--- .../esx_vehicleshop/localization/pl_esx_vehicleshop.sql | 6 +++--- .../esx_vehicleshop/localization/sv_esx_vehicleshop.sql | 6 +++--- resources/esx_whitelist/esx_whitelist.sql | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/resources/esx_addonaccount/esx_addonaccount.sql b/resources/esx_addonaccount/esx_addonaccount.sql index 2eb6552b..f78ed05e 100644 --- a/resources/esx_addonaccount/esx_addonaccount.sql +++ b/resources/esx_addonaccount/esx_addonaccount.sql @@ -12,7 +12,7 @@ CREATE TABLE `addon_account_data` ( `id` INT NOT NULL AUTO_INCREMENT, `account_name` VARCHAR(100) DEFAULT NULL, `money` INT NOT NULL, - `owner` VARCHAR(40) DEFAULT NULL, + `owner` VARCHAR(60) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE INDEX `index_addon_account_data_account_name_owner` (`account_name`, `owner`), diff --git a/resources/esx_addoninventory/esx_addoninventory.sql b/resources/esx_addoninventory/esx_addoninventory.sql index b1946b78..eefb1e59 100644 --- a/resources/esx_addoninventory/esx_addoninventory.sql +++ b/resources/esx_addoninventory/esx_addoninventory.sql @@ -13,7 +13,7 @@ CREATE TABLE `addon_inventory_items` ( `inventory_name` VARCHAR(100) NOT NULL, `name` VARCHAR(100) NOT NULL, `count` INT NOT NULL, - `owner` VARCHAR(40) DEFAULT NULL, + `owner` VARCHAR(60) DEFAULT NULL, PRIMARY KEY (`id`), INDEX `index_addon_inventory_items_inventory_name_name` (`inventory_name`, `name`), diff --git a/resources/esx_billing/esx_billing.sql b/resources/esx_billing/esx_billing.sql index 1f310804..8dea99a8 100644 --- a/resources/esx_billing/esx_billing.sql +++ b/resources/esx_billing/esx_billing.sql @@ -2,10 +2,10 @@ USE `es_extended`; CREATE TABLE `billing` ( `id` int NOT NULL AUTO_INCREMENT, - `identifier` varchar(40) NOT NULL, - `sender` varchar(40) NOT NULL, + `identifier` varchar(60) NOT NULL, + `sender` varchar(60) NOT NULL, `target_type` varchar(50) NOT NULL, - `target` varchar(40) NOT NULL, + `target` varchar(60) NOT NULL, `label` varchar(255) NOT NULL, `amount` int NOT NULL, diff --git a/resources/esx_datastore/esx_datastore.sql b/resources/esx_datastore/esx_datastore.sql index 162fb636..b1923b8f 100644 --- a/resources/esx_datastore/esx_datastore.sql +++ b/resources/esx_datastore/esx_datastore.sql @@ -11,7 +11,7 @@ CREATE TABLE `datastore` ( CREATE TABLE `datastore_data` ( `id` INT NOT NULL AUTO_INCREMENT, `name` VARCHAR(60) NOT NULL, - `owner` VARCHAR(40), + `owner` VARCHAR(60), `data` LONGTEXT, PRIMARY KEY (`id`), diff --git a/resources/esx_license/esx_license.sql b/resources/esx_license/esx_license.sql index 93d349cc..9cad6b08 100644 --- a/resources/esx_license/esx_license.sql +++ b/resources/esx_license/esx_license.sql @@ -10,7 +10,7 @@ CREATE TABLE `licenses` ( CREATE TABLE `user_licenses` ( `id` int NOT NULL AUTO_INCREMENT, `type` varchar(60) NOT NULL, - `owner` varchar(40) NOT NULL, + `owner` VARCHAR(60) NOT NULL, PRIMARY KEY (`id`) ); diff --git a/resources/esx_phone/esx_phone.sql b/resources/esx_phone/esx_phone.sql index f501d301..8b0df369 100644 --- a/resources/esx_phone/esx_phone.sql +++ b/resources/esx_phone/esx_phone.sql @@ -2,7 +2,7 @@ USE `es_extended`; CREATE TABLE `user_contacts` ( `id` INT(11) NOT NULL AUTO_INCREMENT, - `identifier` VARCHAR(22) NOT NULL, + `identifier` VARCHAR(60) NOT NULL, `name` VARCHAR(100) NOT NULL, `number` INT(11) NOT NULL, diff --git a/resources/esx_vehicleshop/esx_vehicleshop.sql b/resources/esx_vehicleshop/esx_vehicleshop.sql index 56bce343..e78fd9f1 100644 --- a/resources/esx_vehicleshop/esx_vehicleshop.sql +++ b/resources/esx_vehicleshop/esx_vehicleshop.sql @@ -38,12 +38,12 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(40) NOT NULL, + `owner` VARCHAR(60) NOT NULL, `plate` varchar(12) NOT NULL, `vehicle` longtext, `type` VARCHAR(20) NOT NULL DEFAULT 'car', `job` VARCHAR(20) NULL DEFAULT NULL, - `stored` TINYINT NOT NULL DEFAULT '0', + `stored` TINYINT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`plate`) ); @@ -54,7 +54,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int NOT NULL, `rent_price` int NOT NULL, - `owner` varchar(22) NOT NULL, + `owner` VARCHAR(60) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/resources/esx_vehicleshop/localization/br_esx_vehicleshop.sql b/resources/esx_vehicleshop/localization/br_esx_vehicleshop.sql index b6b02ebe..7656043e 100644 --- a/resources/esx_vehicleshop/localization/br_esx_vehicleshop.sql +++ b/resources/esx_vehicleshop/localization/br_esx_vehicleshop.sql @@ -38,12 +38,12 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(40) NOT NULL, + `owner` VARCHAR(60) NOT NULL, `plate` varchar(12) NOT NULL, `vehicle` longtext, `type` VARCHAR(20) NOT NULL DEFAULT 'car', `job` VARCHAR(20) NULL DEFAULT NULL, - `stored` TINYINT NOT NULL DEFAULT '0', + `stored` TINYINT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`plate`) ); @@ -54,7 +54,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int NOT NULL, `rent_price` int NOT NULL, - `owner` varchar(22) NOT NULL, + `owner` VARCHAR(60) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/resources/esx_vehicleshop/localization/de_esx_vehicleshop.sql b/resources/esx_vehicleshop/localization/de_esx_vehicleshop.sql index f53fece4..932eec28 100644 --- a/resources/esx_vehicleshop/localization/de_esx_vehicleshop.sql +++ b/resources/esx_vehicleshop/localization/de_esx_vehicleshop.sql @@ -38,12 +38,12 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(40) NOT NULL, + `owner` VARCHAR(60) NOT NULL, `plate` varchar(12) NOT NULL, `vehicle` longtext, `type` VARCHAR(20) NOT NULL DEFAULT 'car', `job` VARCHAR(20) NULL DEFAULT NULL, - `stored` TINYINT NOT NULL DEFAULT '0', + `stored` TINYINT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`plate`) ); @@ -54,7 +54,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int NOT NULL, `rent_price` int NOT NULL, - `owner` varchar(22) NOT NULL, + `owner` VARCHAR(60) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/resources/esx_vehicleshop/localization/en_esx_vehicleshop.sql b/resources/esx_vehicleshop/localization/en_esx_vehicleshop.sql index c06bb956..6825d9f5 100644 --- a/resources/esx_vehicleshop/localization/en_esx_vehicleshop.sql +++ b/resources/esx_vehicleshop/localization/en_esx_vehicleshop.sql @@ -38,12 +38,12 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(40) NOT NULL, + `owner` VARCHAR(60) NOT NULL, `plate` varchar(12) NOT NULL, `vehicle` longtext, `type` VARCHAR(20) NOT NULL DEFAULT 'car', `job` VARCHAR(20) NULL DEFAULT NULL, - `stored` TINYINT NOT NULL DEFAULT '0', + `stored` TINYINT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`plate`) ); @@ -54,7 +54,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int NOT NULL, `rent_price` int NOT NULL, - `owner` varchar(22) NOT NULL, + `owner` VARCHAR(60) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/resources/esx_vehicleshop/localization/fi_esx_vehicleshop.sql b/resources/esx_vehicleshop/localization/fi_esx_vehicleshop.sql index 0d6c5295..5188dc60 100644 --- a/resources/esx_vehicleshop/localization/fi_esx_vehicleshop.sql +++ b/resources/esx_vehicleshop/localization/fi_esx_vehicleshop.sql @@ -38,12 +38,12 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(40) NOT NULL, + `owner` VARCHAR(60) NOT NULL, `plate` varchar(12) NOT NULL, `vehicle` longtext, `type` VARCHAR(20) NOT NULL DEFAULT 'car', `job` VARCHAR(20) NULL DEFAULT NULL, - `stored` TINYINT NOT NULL DEFAULT '0', + `stored` TINYINT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`plate`) ); @@ -54,7 +54,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int NOT NULL, `rent_price` int NOT NULL, - `owner` varchar(22) NOT NULL, + `owner` VARCHAR(60) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/resources/esx_vehicleshop/localization/pl_esx_vehicleshop.sql b/resources/esx_vehicleshop/localization/pl_esx_vehicleshop.sql index 380c6237..05eb36e2 100644 --- a/resources/esx_vehicleshop/localization/pl_esx_vehicleshop.sql +++ b/resources/esx_vehicleshop/localization/pl_esx_vehicleshop.sql @@ -38,12 +38,12 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(40) NOT NULL, + `owner` VARCHAR(60) NOT NULL, `plate` varchar(12) NOT NULL, `vehicle` longtext, `type` VARCHAR(20) NOT NULL DEFAULT 'car', `job` VARCHAR(20) NULL DEFAULT NULL, - `stored` TINYINT NOT NULL DEFAULT '0', + `stored` TINYINT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`plate`) ); @@ -54,7 +54,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int NOT NULL, `rent_price` int NOT NULL, - `owner` varchar(22) NOT NULL, + `owner` VARCHAR(60) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/resources/esx_vehicleshop/localization/sv_esx_vehicleshop.sql b/resources/esx_vehicleshop/localization/sv_esx_vehicleshop.sql index 975db2e6..87da378a 100644 --- a/resources/esx_vehicleshop/localization/sv_esx_vehicleshop.sql +++ b/resources/esx_vehicleshop/localization/sv_esx_vehicleshop.sql @@ -38,12 +38,12 @@ CREATE TABLE `vehicle_sold` ( ); CREATE TABLE `owned_vehicles` ( - `owner` varchar(40) NOT NULL, + `owner` VARCHAR(60) NOT NULL, `plate` varchar(12) NOT NULL, `vehicle` longtext, `type` VARCHAR(20) NOT NULL DEFAULT 'car', `job` VARCHAR(20) NULL DEFAULT NULL, - `stored` TINYINT NOT NULL DEFAULT '0', + `stored` TINYINT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`plate`) ); @@ -54,7 +54,7 @@ CREATE TABLE `rented_vehicles` ( `player_name` varchar(255) NOT NULL, `base_price` int NOT NULL, `rent_price` int NOT NULL, - `owner` varchar(22) NOT NULL, + `owner` VARCHAR(60) NOT NULL, PRIMARY KEY (`plate`) ); diff --git a/resources/esx_whitelist/esx_whitelist.sql b/resources/esx_whitelist/esx_whitelist.sql index b1ecd6e5..5c8afb10 100644 --- a/resources/esx_whitelist/esx_whitelist.sql +++ b/resources/esx_whitelist/esx_whitelist.sql @@ -1,7 +1,7 @@ USE `es_extended`; CREATE TABLE `whitelist` ( - `identifier` varchar(40) NOT NULL, + `identifier` varchar(60) NOT NULL, PRIMARY KEY (`identifier`) );