fix data

hexlet-components · Apr 4, 2024 · 7cd2705 · 7cd2705
1 parent 11f4a38
commit 7cd2705
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -4,11 +4,19 @@ schema-load:
 	psql hexlet < schema.sql
 
 data-load:
-	psql hexlet < users.sql
-	psql hexlet < topics.sql
-	psql hexlet < courses.sql
-	psql hexlet < course_members.sql
-	psql hexlet < course_reviews.sql
+	psql hexlet < data/users.sql
+	psql hexlet < data/topics.sql
+	psql hexlet < data/courses.sql
+	psql hexlet < data/course_members.sql
+	psql hexlet < data/course_reviews.sql
+
+	psql hexlet < data/authors.sql
+	psql hexlet < data/books.sql
+	psql hexlet < data/departments.sql
+	psql hexlet < data/drivers_passengers_rides.sql
+	psql hexlet < data/employees.sql
+	psql hexlet < data/materials_and_colors.sql
+	psql hexlet < data/orders_and_customers.sql
 
 generate:
 	node ./bin/load.js

diff --git a/authors.sql → data/authors.sql b/authors.sql → data/authors.sql
diff --git a/books.sql → data/books.sql b/books.sql → data/books.sql
diff --git a/course_members.sql → data/course_members.sql b/course_members.sql → data/course_members.sql
diff --git a/course_reviews.sql → data/course_reviews.sql b/course_reviews.sql → data/course_reviews.sql
diff --git a/courses.sql → data/courses.sql b/courses.sql → data/courses.sql
diff --git a/departments.sql → data/departments.sql b/departments.sql → data/departments.sql
diff --git a/drivers_passengers_rides.sql → data/drivers_passengers_rides.sql b/drivers_passengers_rides.sql → data/drivers_passengers_rides.sql
@@ -7,7 +7,7 @@ INSERT INTO passengers (passenger_id, passenger_name, phone) VALUES
 (102, 'Соколова Ж.З.', '+72228889900'),
 (103, 'Ястребов И.К.', '+73339995566');
 
-INSERT INTO rides (rideid, driver_id, passenger_id, price) VALUES
+INSERT INTO rides (ride_id, driver_id, passenger_id, price) VALUES
 (1001, 1, 101, 567),
 (1002, 1, 102, 234),
 (1003, 2, 103, 1234),

diff --git a/employees.sql → data/employees.sql b/employees.sql → data/employees.sql
diff --git a/materials_and_colors.sql → data/materials_and_colors.sql b/materials_and_colors.sql → data/materials_and_colors.sql
diff --git a/orders_and_customers.sql → data/orders_and_customers.sql b/orders_and_customers.sql → data/orders_and_customers.sql
diff --git a/topics.sql → data/topics.sql b/topics.sql → data/topics.sql
diff --git a/users.sql → data/users.sql b/users.sql → data/users.sql
diff --git a/schema.sql b/schema.sql
@@ -82,7 +82,9 @@ CREATE TABLE employees (
     employee_id INT PRIMARY KEY,
     department_id INT,
     name VARCHAR(50),
-    salary DECIMAL(10, 2)
+    salary DECIMAL(10, 2),
+    position VARCHAR,
+    manager_id int
 );
 
 CREATE TABLE drivers (
@@ -98,7 +100,7 @@ CREATE TABLE passengers (
 );
 
 CREATE TABLE rides (
-    rideid INT PRIMARY KEY,
+    ride_id INT PRIMARY KEY,
     driver_id INT,
     passenger_id INT,
     price DECIMAL(10, 2),
@@ -117,8 +119,3 @@ CREATE TABLE orders (
     customer_id INT,
     total_price DECIMAL(10, 2)
 );
-
-CREATE TABLE employees_with_managers (
-    employee_id INT PRIMARY KEY,
-    employee_name VARCHAR,
-);