From 20f35517a6c8e4db51e335387fc44d73699c6c37 Mon Sep 17 00:00:00 2001 From: Andrii Shukalo Date: Sun, 29 Mar 2026 01:34:01 +0200 Subject: [PATCH 1/3] Normalize the database ShopDB --- task.sql | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/task.sql b/task.sql index cc65344..b32fae7 100644 --- a/task.sql +++ b/task.sql @@ -9,14 +9,20 @@ CREATE TABLE Countries ( PRIMARY KEY (ID) ); +CREATE TABLE Warehouses ( + ID INT, + Name VARCHAR(50), + Address VARCHAR(100), + CountryID INT, + FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION, + PRIMARY KEY (ID) +); CREATE TABLE ProductInventory ( ID INT, ProductName VARCHAR(50), WarehouseAmount INT, - WarehouseName VARCHAR(50), - WarehouseAddress VARCHAR(50), - CountryID INT, - FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION, + WarehouseID INT, + FOREIGN KEY (WarehouseID) REFERENCES Warehouses(ID) ON DELETE CASCADE, PRIMARY KEY (ID) ); @@ -26,8 +32,11 @@ INSERT INTO Countries (ID,Name) VALUES (1, 'Country1'); INSERT INTO Countries (ID,Name) VALUES (2, 'Country2'); - -INSERT INTO ProductInventory (ID,ProductName,WarehouseAmount,WarehouseName,WarehouseAddress,CountryID) - VALUES (1, 'AwersomeProduct', 2, 'Warehouse-1', 'City-1, Street-1',1); -INSERT INTO ProductInventory (ID,ProductName,WarehouseAmount,WarehouseName,WarehouseAddress,CountryID) - VALUES (2, 'AwersomeProduct', 5, 'Warehouse-2', 'City-2, Street-2',2); +INSERT INTO Warehouses(ID, Name, Address, CountryID) + VALUES (1,'Warehouse-1', 'City-1, Street-1', 1); +INSERT INTO Warehouses(ID, Name, Address, CountryID) + VALUES (2, 'Warehouse-2', 'City-2, Street-2', 2); +INSERT INTO ProductInventory(ID,ProductName,WarehouseAmount,WarehouseID) + VALUES (1, 'AwesomeProduct', 2, 1); +INSERT INTO ProductInventory(ID,ProductName,WarehouseAmount,WarehouseID) + VALUES (2, 'AwesomeProduct', 5,2); From d2911d12d6b332147e962391b766618b3b1eeb85 Mon Sep 17 00:00:00 2001 From: Andrii Shukalo Date: Sun, 29 Mar 2026 01:40:53 +0200 Subject: [PATCH 2/3] Fixes 1.0.1 --- task.sql | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/task.sql b/task.sql index b32fae7..6323bce 100644 --- a/task.sql +++ b/task.sql @@ -17,17 +17,25 @@ CREATE TABLE Warehouses ( FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION, PRIMARY KEY (ID) ); -CREATE TABLE ProductInventory ( +CREATE TABLE Products ( ID INT, ProductName VARCHAR(50), + PRIMARY KEY (ID) +); + +CREATE TABLE ProductInventory ( + ID INT, + ProductID INT, WarehouseAmount INT, WarehouseID INT, FOREIGN KEY (WarehouseID) REFERENCES Warehouses(ID) ON DELETE CASCADE, + FOREIGN KEY (ProductID) REFERENCES Products(ID) ON DELETE SET NULL, PRIMARY KEY (ID) ); -- Populate test data - +INSERT INTO Products(ID, ProductName) + VALUES (1, 'AwesomeProduct'); INSERT INTO Countries (ID,Name) VALUES (1, 'Country1'); INSERT INTO Countries (ID,Name) @@ -36,7 +44,7 @@ INSERT INTO Warehouses(ID, Name, Address, CountryID) VALUES (1,'Warehouse-1', 'City-1, Street-1', 1); INSERT INTO Warehouses(ID, Name, Address, CountryID) VALUES (2, 'Warehouse-2', 'City-2, Street-2', 2); -INSERT INTO ProductInventory(ID,ProductName,WarehouseAmount,WarehouseID) - VALUES (1, 'AwesomeProduct', 2, 1); -INSERT INTO ProductInventory(ID,ProductName,WarehouseAmount,WarehouseID) - VALUES (2, 'AwesomeProduct', 5,2); +INSERT INTO ProductInventory(ID,ProductID,WarehouseAmount,WarehouseID) + VALUES (1, 1, 2, 1); +INSERT INTO ProductInventory(ID,ProductID,WarehouseAmount,WarehouseID) + VALUES (2, 1, 5,2); From faf9a90ddd469932841188b8285fbbd5a2317fea Mon Sep 17 00:00:00 2001 From: Andrii Shukalo Date: Sun, 29 Mar 2026 01:44:36 +0200 Subject: [PATCH 3/3] Fixes 1.0.2 --- task.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/task.sql b/task.sql index 6323bce..26a848a 100644 --- a/task.sql +++ b/task.sql @@ -1,5 +1,6 @@ -- Create database and tables +DROP DATABASE IF EXISTS ShopDB; CREATE DATABASE ShopDB; USE ShopDB;