Pawel_branch #2

Open
s1201683 wants to merge 7 commits from Pawel_branch into master
2 changed files with 26 additions and 17 deletions

1
Hurtownie_Danych Submodule

@ -0,0 +1 @@
Subproject commit 53df1a85b6f517016358f522fedb5e4a012d5531

View File

@ -9,13 +9,13 @@ CREATE TABLE `fact_service` (
CREATE TABLE `dim_customer` ( CREATE TABLE `dim_customer` (
`customer_id` int PRIMARY KEY, `customer_id` int PRIMARY KEY,
`name` varchar(64) , `customer_name` varchar(64) ,
`birth_date` DATE , `customer_birth_date` DATE ,
`email` varchar(64) , `customer_email` varchar(64) ,
`address` varchar(64) , `customer_address` varchar(64) ,
`city` varchar(64) , `customer_city` varchar(64) ,
`country` varchar(64) , `customer_country` varchar(64) ,
`postal_code` varchar(64) `customer_postal_code` varchar(64)
); );
CREATE TABLE `dim_calendar` ( CREATE TABLE `dim_calendar` (
@ -28,7 +28,7 @@ CREATE TABLE `dim_calendar` (
`calendar_year` int , `calendar_year` int ,
`calendar_month_year` int , `calendar_month_year` int ,
`is_weekend` BOOLEAN , `is_weekend` BOOLEAN ,
`month_end` BOOLEAN , `is_month_end` BOOLEAN ,
`week_num` int `week_num` int
); );
@ -54,17 +54,16 @@ CREATE TABLE `dim_equipment` (
); );
CREATE TABLE `dim_store` ( CREATE TABLE `dim_store` (
`sk_store_id` int PRIMARY KEY, `store_id` int PRIMARY KEY,
`nk_store_id` int , `store_key` int ,
`store_manager_id` int ,
`store_manager_start_date` DATE ,
`store_manager_end_date` DATE ,
`active_manager` varchar(64) ,
`store_address` varchar(64) , `store_address` varchar(64) ,
`store_address2` varchar(64) ,
`store_postal_code` varchar(64) , `store_postal_code` varchar(64) ,
`store_city` varchar(64) , `store_city` varchar(64) ,
`store_country` varchar(64) `store_country` varchar(64)
`store_manager_name varchar(64) ,
`valid_from` DATE ,
`valid_to` DATE,
`is_active` varchar(64)
); );
CREATE TABLE `bridge_equipment` ( CREATE TABLE `bridge_equipment` (
@ -79,12 +78,21 @@ CREATE TABLE `dim_service_type` (
CREATE TABLE `dim_staff` ( CREATE TABLE `dim_staff` (
`staff_id` int PRIMARY KEY, `staff_id` int PRIMARY KEY,
`staff_full_name` varchar(64) , <<<<<<< HEAD
`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_city` varchar(64) ,
`staff_country` varchar(64) , `staff_country` varchar(64) ,
`staff_email` varchar(64) , `staff_email` varchar(64) ,
`staff_manager_name` 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` ( CREATE TABLE `dim_car` (