zmieniono dim_store

Hurtownie_Danych

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

model_hurtowni.sql

@@ -54,17 +54,16 @@ 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_id` int PRIMARY KEY,
+	`store_key` int ,
 	`store_address` varchar(64) ,
-	`store_address2` 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, 
+	`is_active` varchar(64) 
 );
 
 CREATE TABLE `bridge_equipment` (
@@ -79,12 +78,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` (