From 046c80c285cc628a278bc22d717299322ed3a173 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 13 Aug 2025 16:03:25 +0300 Subject: [PATCH 1/3] tables updated to third normalization form --- .idea/.gitignore | 3 +++ .idea/vcs.xml | 4 ++++ task.sql | 57 ++++++++++++++++++++++++++++++++---------------- 3 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..d843f34 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/task.sql b/task.sql index cc65344..3b35210 100644 --- a/task.sql +++ b/task.sql @@ -4,30 +4,49 @@ CREATE DATABASE ShopDB; USE ShopDB; CREATE TABLE Countries ( - ID INT, + ID INT PRIMARY KEY AUTO_INCREMENT, Name VARCHAR(50), 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, - PRIMARY KEY (ID) +CREATE TABLE Products ( + ID INT PRIMARY KEY AUTO_INCREMENT, + ProductName VARCHAR(50) +); + +CREATE TABLE Warehouses ( + ID INT PRIMARY KEY AUTO_INCREMENT, + WarehouseName VARCHAR(50) NOT NULL, + WarehouseAddress VARCHAR(50) NOT NULL, + CountryID INT NOT NULL, + FOREIGN KEY (CountryID) REFERENCES Countries(ID) ON DELETE NO ACTION ); --- Populate test data +CREATE TABLE Inventory ( + ID INT PRIMARY KEY AUTO_INCREMENT, + ProductID INT NOT NULL, + WarehouseID INT NOT NULL, + WarehouseAmount INT NOT NULL, + FOREIGN KEY (ProductID) REFERENCES Products(ID) ON DELETE CASCADE, + FOREIGN KEY (WarehouseID) REFERENCES Warehouses(ID) ON DELETE CASCADE +); -INSERT INTO Countries (ID,Name) - VALUES (1, 'Country1'); -INSERT INTO Countries (ID,Name) - VALUES (2, 'Country2'); +INSERT INTO Countries (Name) + VALUES ('Country1'); +INSERT INTO Countries (Name) + VALUES ('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 Products (ProductName) + VALUES ('AwesomeProduct'); +INSERT INTO Products (ProductName) + VALUES ('AwesomeProduct2'); + +INSERT INTO Warehouses (WarehouseName, WarehouseAddress, CountryID) + VALUES ('warehouse1', 'city-1, street-1', 1); +INSERT INTO Warehouses (WarehouseName, WarehouseAddress, CountryID) + VALUES ('warehouse2', 'city-2, street-2', 2); + +INSERT INTO Inventory (ProductID, WarehouseID, WarehouseAmount) + VALUES (1, 1, 2); +INSERT INTO Inventory (ProductID, WarehouseID, WarehouseAmount) + VALUES (2, 2, 3); \ No newline at end of file From 8c9ee3479a53529c97d939c266c8b1492d869fd1 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 13 Aug 2025 16:05:06 +0300 Subject: [PATCH 2/3] multiple PK removed --- task.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/task.sql b/task.sql index 3b35210..2aa3188 100644 --- a/task.sql +++ b/task.sql @@ -6,7 +6,6 @@ USE ShopDB; CREATE TABLE Countries ( ID INT PRIMARY KEY AUTO_INCREMENT, Name VARCHAR(50), - PRIMARY KEY (ID) ); CREATE TABLE Products ( From 292b44724d38b83073425bdae3aceef2f4dbebd2 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 13 Aug 2025 16:08:03 +0300 Subject: [PATCH 3/3] drop database added --- task.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/task.sql b/task.sql index 2aa3188..19390e5 100644 --- a/task.sql +++ b/task.sql @@ -1,4 +1,5 @@ -- Create database and tables +DROP DATABASE IF EXISTS ShopDB; CREATE DATABASE ShopDB; USE ShopDB;