From d3820df5bc274e87dab2c3037ac5000bcb936e82 Mon Sep 17 00:00:00 2001 From: Oleksandr Kirichenko Date: Sat, 23 May 2026 11:21:44 +0300 Subject: [PATCH 1/3] Normalize ShopDB to 3NF --- task.sql | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/task.sql b/task.sql index cc65344..1a4f976 100644 --- a/task.sql +++ b/task.sql @@ -1,5 +1,4 @@ --- Create database and tables - +DROP DATABASE IF EXISTS ShopDB; CREATE DATABASE ShopDB; USE ShopDB; @@ -9,25 +8,38 @@ CREATE TABLE Countries ( PRIMARY KEY (ID) ); -CREATE TABLE ProductInventory ( +CREATE TABLE Warehouses ( ID INT, - ProductName VARCHAR(50), - WarehouseAmount INT, - WarehouseName VARCHAR(50), - WarehouseAddress VARCHAR(50), + Name VARCHAR(50), + Address VARCHAR(50), CountryID INT, - FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION, + PRIMARY KEY (ID), + FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION +); + +CREATE TABLE Products ( + ID INT, + Name VARCHAR(50), PRIMARY KEY (ID) ); --- Populate test data - -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); +CREATE TABLE ProductInventory ( + ID INT, + ProductID INT, + WarehouseID INT, + WarehouseAmount INT, + PRIMARY KEY (ID), + FOREIGN KEY (ProductID) REFERENCES Products(ID) ON DELETE NO ACTION, + FOREIGN KEY (WarehouseID) REFERENCES Warehouses(ID) ON DELETE NO ACTION +); + +INSERT INTO Countries (ID, Name) VALUES (1, 'Country1'); +INSERT INTO Countries (ID, Name) VALUES (2, 'Country2'); + +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 Products (ID, Name) VALUES (1, 'AwersomeProduct'); + +INSERT INTO ProductInventory (ID, ProductID, WarehouseID, WarehouseAmount) VALUES (1, 1, 1, 2); +INSERT INTO ProductInventory (ID, ProductID, WarehouseID, WarehouseAmount) VALUES (2, 1, 2, 5); From 536bc7a4d2d1bc3311b7c31f833af490af0c4b0b Mon Sep 17 00:00:00 2001 From: Oleksandr Kirichenko Date: Sat, 23 May 2026 11:25:34 +0300 Subject: [PATCH 2/3] Fixed due to Review --- task.sql | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/task.sql b/task.sql index 1a4f976..0f9e396 100644 --- a/task.sql +++ b/task.sql @@ -8,38 +8,22 @@ CREATE TABLE Countries ( PRIMARY KEY (ID) ); -CREATE TABLE Warehouses ( - ID INT, - Name VARCHAR(50), - Address VARCHAR(50), - CountryID INT, - PRIMARY KEY (ID), - FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION -); - -CREATE TABLE Products ( - ID INT, - Name VARCHAR(50), - PRIMARY KEY (ID) -); - CREATE TABLE ProductInventory ( ID INT, - ProductID INT, - WarehouseID INT, + ProductName VARCHAR(50), WarehouseAmount INT, + WarehouseName VARCHAR(50), + WarehouseAddress VARCHAR(50), + CountryID INT, PRIMARY KEY (ID), - FOREIGN KEY (ProductID) REFERENCES Products(ID) ON DELETE NO ACTION, - FOREIGN KEY (WarehouseID) REFERENCES Warehouses(ID) ON DELETE NO ACTION + FOREIGN KEY (CountryID) REFERENCES Countries(ID) ); INSERT INTO Countries (ID, Name) VALUES (1, 'Country1'); INSERT INTO Countries (ID, Name) VALUES (2, 'Country2'); -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 Products (ID, Name) VALUES (1, 'AwersomeProduct'); +INSERT INTO ProductInventory (ID, ProductName, WarehouseAmount, WarehouseName, WarehouseAddress, CountryID) +VALUES (1, 'AwersomeProduct', 2, 'Warehouse-1', 'City-1, Street-1', 1); -INSERT INTO ProductInventory (ID, ProductID, WarehouseID, WarehouseAmount) VALUES (1, 1, 1, 2); -INSERT INTO ProductInventory (ID, ProductID, WarehouseID, WarehouseAmount) VALUES (2, 1, 2, 5); +INSERT INTO ProductInventory (ID, ProductName, WarehouseAmount, WarehouseName, WarehouseAddress, CountryID) +VALUES (2, 'AwersomeProduct', 5, 'Warehouse-2', 'City-2, Street-2', 2); \ No newline at end of file From cce8d4ea3b84251a68d79492a3108de0c99ef9c1 Mon Sep 17 00:00:00 2001 From: Oleksandr Kirichenko Date: Tue, 2 Jun 2026 19:43:07 +0300 Subject: [PATCH 3/3] Fix the test --- task.sql | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/task.sql b/task.sql index 0f9e396..6af8565 100644 --- a/task.sql +++ b/task.sql @@ -8,22 +8,48 @@ CREATE TABLE Countries ( PRIMARY KEY (ID) ); -CREATE TABLE ProductInventory ( +CREATE TABLE Products ( ID INT, - ProductName VARCHAR(50), - WarehouseAmount INT, - WarehouseName VARCHAR(50), - WarehouseAddress VARCHAR(50), + Name VARCHAR(50), + PRIMARY KEY (ID) +); + +CREATE TABLE Warehouses ( + ID INT, + Name VARCHAR(50), + Address VARCHAR(50), CountryID INT, PRIMARY KEY (ID), FOREIGN KEY (CountryID) REFERENCES Countries(ID) ); -INSERT INTO Countries (ID, Name) VALUES (1, 'Country1'); -INSERT INTO Countries (ID, Name) VALUES (2, 'Country2'); +CREATE TABLE ProductInventory ( + ID INT, + ProductID INT, + WarehouseAmount INT, + WarehouseID INT, + PRIMARY KEY (ID), + FOREIGN KEY (ProductID) REFERENCES Products(ID), + FOREIGN KEY (WarehouseID) REFERENCES Warehouses(ID) +); + +INSERT INTO Countries (ID, Name) +VALUES (1, 'Country1'); + +INSERT INTO Countries (ID, Name) +VALUES (2, 'Country2'); + +INSERT INTO Products (ID, Name) +VALUES (1, 'AwersomeProduct'); + +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, WarehouseName, WarehouseAddress, CountryID) -VALUES (1, 'AwersomeProduct', 2, 'Warehouse-1', 'City-1, Street-1', 1); +INSERT INTO ProductInventory (ID, ProductID, WarehouseAmount, WarehouseID) +VALUES (1, 1, 2, 1); -INSERT INTO ProductInventory (ID, ProductName, WarehouseAmount, WarehouseName, WarehouseAddress, CountryID) -VALUES (2, 'AwersomeProduct', 5, 'Warehouse-2', 'City-2, Street-2', 2); \ No newline at end of file +INSERT INTO ProductInventory (ID, ProductID, WarehouseAmount, WarehouseID) +VALUES (2, 1, 5, 2); \ No newline at end of file