From 766302ddcf3403040938df3291afa99dac23ac77 Mon Sep 17 00:00:00 2001 From: lomamech Date: Tue, 15 Feb 2022 10:21:05 +0100 Subject: [PATCH] improvement(Migrate file) - Update size of inventory_type.text in schema.sql - Fix error in migrate file us reference_number instead external_reference_number - Add DROP PROCEDURE IF EXISTS for some Procedure --- server/models/admin.sql | 1 + server/models/migrations/next/migrate.sql | 5 ++--- server/models/schema.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/models/admin.sql b/server/models/admin.sql index 4e5a485775..ea437fb473 100644 --- a/server/models/admin.sql +++ b/server/models/admin.sql @@ -265,6 +265,7 @@ END$$ Removes all data from the cost_center_aggregate table and rebuilds it. */ +DROP PROCEDURE IF EXISTS zRecalculateCostCenterAggregates$$ CREATE PROCEDURE zRecalculateCostCenterAggregates() BEGIN diff --git a/server/models/migrations/next/migrate.sql b/server/models/migrations/next/migrate.sql index ec3456ee7e..dfc2089a2d 100644 --- a/server/models/migrations/next/migrate.sql +++ b/server/models/migrations/next/migrate.sql @@ -54,13 +54,12 @@ INSERT IGNORE INTO unit VALUES * @date: 2022-02-07 */ CALL add_column_if_missing('inventory', 'is_asset', 'TINYINT(1) NOT NULL DEFAULT 0 AFTER `importance`'); -CALL add_column_if_missing('inventory', 'external_reference_number', 'TEXT NULL'); +CALL add_column_if_missing('inventory', 'reference_number', 'TEXT NULL'); CALL add_column_if_missing('inventory', 'manufacturer_brand', 'TEXT NULL'); CALL add_column_if_missing('inventory', 'manufacturer_model', 'TEXT NULL'); CALL add_column_if_missing('inventory_type', 'description', 'TEXT NULL'); CALL add_column_if_missing('inventory_type', 'is_predefined', 'TINYINT(1) NOT NULL DEFAULT 0'); -ALTER TABLE `inventory_type` - CHANGE COLUMN `text` `text` VARCHAR(200) NOT NULL COLLATE AFTER `id`; +ALTER TABLE `inventory_type` CHANGE COLUMN `text` `text` VARCHAR(200) NOT NULL; diff --git a/server/models/schema.sql b/server/models/schema.sql index a996b073bb..cf9f4d9d3a 100644 --- a/server/models/schema.sql +++ b/server/models/schema.sql @@ -837,7 +837,7 @@ CREATE TABLE `inventory_group` ( DROP TABLE IF EXISTS `inventory_type`; CREATE TABLE `inventory_type` ( `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT, - `text` VARCHAR(30) NOT NULL, + `text` VARCHAR(200) NOT NULL, `description` TEXT NULL, `is_predefined` TINYINT(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`),