From a1c8bf875c00babc0ed36b5a86ed87fb1581b312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Skurzy=C5=84ski?= Date: Sat, 16 Dec 2023 10:28:29 +0100 Subject: [PATCH 1/5] zmieniono dim_car --- model_hurtowni.sql | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/model_hurtowni.sql b/model_hurtowni.sql index e217226..bdf1b49 100644 --- a/model_hurtowni.sql +++ b/model_hurtowni.sql @@ -56,14 +56,13 @@ CREATE TABLE `dim_equipment` ( ); CREATE TABLE `dim_store` ( - `sk_store_id` int PRIMARY KEY, - `nk_store_id` int , - `store_manager_id` int , - `store_manager_start_date` DATE , - `store_manager_end_date` DATE , - `active_manager` varchar(64) , + `store_key` int PRIMARY KEY, + `store_id` int , + `store_manager_name varchar(64) , + `active_from` DATE , + `active_to` DATE , + `is_active` varchar(64) , `store_address` varchar(64) , - `store_address2` varchar(64) , `store_postal_code` varchar(64) , `store_city` varchar(64) , `store_country` varchar(64) -- 2.20.1 From 200c65905b747f1a0acbef63f726b1c9a48ac232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Charzewski?= Date: Sat, 16 Dec 2023 10:31:26 +0100 Subject: [PATCH 2/5] komentarze do dim staff --- model_hurtowni.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model_hurtowni.sql b/model_hurtowni.sql index 079af09..48ae477 100644 --- a/model_hurtowni.sql +++ b/model_hurtowni.sql @@ -79,8 +79,8 @@ CREATE TABLE `dim_service_type` ( CREATE TABLE `dim_staff` ( `staff_id` int PRIMARY KEY, - `staff_full_name` varchar(64) , - `staff_address` varchar(64) , + `staff_full_name` varchar(64) , -- zawiera first_name i last_name + `staff_address` varchar(64) , -- złączenie address oraz address2 `staff_city` varchar(64) , `staff_country` varchar(64) , `staff_email` varchar(64) , -- 2.20.1 From d7117a232dc4b9f29d576ee680cd44ee7706cf63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Skurzy=C5=84ski?= Date: Sat, 16 Dec 2023 10:41:36 +0100 Subject: [PATCH 3/5] zmieniono dim_store --- model_hurtowni.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/model_hurtowni.sql b/model_hurtowni.sql index fbda0f3..6515c2b 100644 --- a/model_hurtowni.sql +++ b/model_hurtowni.sql @@ -54,16 +54,16 @@ CREATE TABLE `dim_equipment` ( ); CREATE TABLE `dim_store` ( - `store_key` int PRIMARY KEY, - `store_id` int , - `store_manager_name varchar(64) , - `active_from` DATE , - `active_to` DATE , + `store_id` int PRIMARY KEY, + `store_key` int , `is_active` varchar(64) , `store_address` varchar(64) , `store_postal_code` varchar(64) , `store_city` varchar(64) , `store_country` varchar(64) + `store_manager_name varchar(64) , + `valid_from` DATE , + `valid_to` DATE ); CREATE TABLE `bridge_equipment` ( -- 2.20.1 From 6e84f742b122bc76df35b1970d5ea67a664d64f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Skurzy=C5=84ski?= Date: Sat, 16 Dec 2023 12:01:27 +0100 Subject: [PATCH 4/5] zmieniono dim_store --- Hurtownie_Danych | 1 + model_hurtowni.sql | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) create mode 160000 Hurtownie_Danych diff --git a/Hurtownie_Danych b/Hurtownie_Danych new file mode 160000 index 0000000..53df1a8 --- /dev/null +++ b/Hurtownie_Danych @@ -0,0 +1 @@ +Subproject commit 53df1a85b6f517016358f522fedb5e4a012d5531 diff --git a/model_hurtowni.sql b/model_hurtowni.sql index 6515c2b..f4d2307 100644 --- a/model_hurtowni.sql +++ b/model_hurtowni.sql @@ -9,13 +9,13 @@ CREATE TABLE `fact_service` ( CREATE TABLE `dim_customer` ( `customer_id` int PRIMARY KEY, - `name` varchar(64) , - `birth_date` DATE , - `email` varchar(64) , - `address` varchar(64) , - `city` varchar(64) , - `country` varchar(64) , - `postal_code` varchar(64) + `customer_name` varchar(64) , + `customer_birth_date` DATE , + `customer_email` varchar(64) , + `customer_address` varchar(64) , + `customer_city` varchar(64) , + `customer_country` varchar(64) , + `customer_postal_code` varchar(64) ); CREATE TABLE `dim_calendar` ( @@ -28,7 +28,7 @@ CREATE TABLE `dim_calendar` ( `calendar_year` int , `calendar_month_year` int , `is_weekend` BOOLEAN , - `month_end` BOOLEAN , + `is_month_end` BOOLEAN , `week_num` int ); @@ -56,14 +56,15 @@ CREATE TABLE `dim_equipment` ( CREATE TABLE `dim_store` ( `store_id` int PRIMARY KEY, `store_key` int , - `is_active` varchar(64) , + `store_address` varchar(64) , `store_postal_code` varchar(64) , `store_city` varchar(64) , `store_country` varchar(64) `store_manager_name varchar(64) , `valid_from` DATE , - `valid_to` DATE + `valid_to` DATE, + `is_active` varchar(64) ); CREATE TABLE `bridge_equipment` ( @@ -78,12 +79,21 @@ CREATE TABLE `dim_service_type` ( CREATE TABLE `dim_staff` ( `staff_id` int PRIMARY KEY, +<<<<<<< HEAD `staff_full_name` varchar(64) , -- zawiera first_name i last_name `staff_address` varchar(64) , -- złączenie address oraz address2 `staff_city` varchar(64) , `staff_country` varchar(64) , `staff_email` varchar(64) , `staff_manager_name` varchar(64) +======= + `full_name` varchar(64) , + `address` varchar(64) , + `city` varchar(64) , + `country` varchar(64) , + `manager_id` int , + `email` varchar(64) +>>>>>>> 53df1a85b6f517016358f522fedb5e4a012d5531 ); CREATE TABLE `dim_car` ( -- 2.20.1 From f501e46fc02984749283b439181bd84b1ced51ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Skurzy=C5=84ski?= Date: Sat, 16 Dec 2023 12:03:03 +0100 Subject: [PATCH 5/5] zmieniono dim_store --- model_hurtowni.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/model_hurtowni.sql b/model_hurtowni.sql index f4d2307..3d58d2e 100644 --- a/model_hurtowni.sql +++ b/model_hurtowni.sql @@ -56,7 +56,6 @@ CREATE TABLE `dim_equipment` ( CREATE TABLE `dim_store` ( `store_id` int PRIMARY KEY, `store_key` int , - `store_address` varchar(64) , `store_postal_code` varchar(64) , `store_city` varchar(64) , -- 2.20.1