diff --git a/.vscode/settings.json b/.vscode/settings.json index 9bc98c8..20de972 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,7 +18,6 @@ "screencastMode.onlyKeyboardShortcuts": true, "terminal.integrated.fontSize": 18, "window.zoomLevel": 3, - "workbench.activityBar.visible": true, "workbench.colorTheme": "Default Light+", "workbench.fontAliasing": "antialiased", "workbench.statusBar.visible": true, diff --git a/Scripts/02-02.sql b/Scripts/02-02.sql index 3bbdf2d..43bb2ff 100644 --- a/Scripts/02-02.sql +++ b/Scripts/02-02.sql @@ -8,7 +8,7 @@ SELECT emp.employeeId, FROM sales sls INNER JOIN employee emp ON sls.employeeId = emp.employeeId -WHERE sls.soldDate >= date('now','start of year') +WHERE sls.soldDate >= date(2022-01-01) GROUP BY emp.employeeId, emp.firstName, emp.lastName diff --git a/Scripts/03-03.sql b/Scripts/03-03.sql index d790317..dbad32d 100644 --- a/Scripts/03-03.sql +++ b/Scripts/03-03.sql @@ -18,7 +18,7 @@ WHERE EngineType = 'Electric'; -- Final query -SELECT sls.soldDate, sls.salesAmount, inv.colour, inv.year +SELECT sls.salesId,sls.soldDate, sls.salesAmount, inv.colour, inv.year FROM sales sls INNER JOIN inventory inv ON sls.inventoryId = inv.inventoryId diff --git a/mysqlcodes/query1.sql b/mysqlcodes/query1.sql new file mode 100644 index 0000000..48e259d --- /dev/null +++ b/mysqlcodes/query1.sql @@ -0,0 +1,5 @@ +SELECT e1.firstName ,e1.lastName , e2.firstName as Manager_Name + +FROM employee e1 +LEFT JOIN employee as e2 +on e1.managerId = e2.employeeId; \ No newline at end of file diff --git a/mysqlcodes/query2.sql b/mysqlcodes/query2.sql new file mode 100644 index 0000000..ee38f5f --- /dev/null +++ b/mysqlcodes/query2.sql @@ -0,0 +1,6 @@ +SELECT e.employeeId,e.firstName,e.lastName,count(s.employeeId) as CarsSold +FROM employee e +LEFT JOIN sales s +ON e.employeeId = s.employeeId +GROUP BY e.employeeId,e.firstName,e.lastName +ORDER BY CarsSold DESC \ No newline at end of file diff --git a/mysqlcodes/query3.sql b/mysqlcodes/query3.sql new file mode 100644 index 0000000..3b66b76 --- /dev/null +++ b/mysqlcodes/query3.sql @@ -0,0 +1,8 @@ +SELECT e.employeeId,e.firstName,e.lastName,count(s.salesId) as car_count, +max(s.salesAmount) AS max,min(s.salesAmount) as min +FROM employee e +LEFT JOIN sales s +ON e.employeeId = s.employeeId +GROUP BY e.employeeId,e.firstName,e.lastName +HAVING count(s.salesId) > 5 +ORDER by car_count DESC diff --git a/mysqlcodes/query4.sql b/mysqlcodes/query4.sql new file mode 100644 index 0000000..238bbfc --- /dev/null +++ b/mysqlcodes/query4.sql @@ -0,0 +1,3 @@ +SELECT strftime('%Y',soldDate),sum(salesAmount) +from sales +GROUP BY strftime('%Y',soldDate) \ No newline at end of file diff --git a/mysqlcodes/query5.sql b/mysqlcodes/query5.sql new file mode 100644 index 0000000..9976955 --- /dev/null +++ b/mysqlcodes/query5.sql @@ -0,0 +1,7 @@ +SELECT e.employeeId,strftime('%m',s.soldDate),sum(s.salesAmount) +from sales s +LEFT JOIN employee e ON e.employeeId = s.employeeId +WHERE s.soldDate >= '2021-01-01' +AND s.soldDate < '2022-01-01' +GROUP BY e.employeeId,strftime('%m',s.soldDate) +ORDER BY e.employeeId,strftime('%m',s.soldDate) \ No newline at end of file diff --git a/mysqlcodes/query6.sql b/mysqlcodes/query6.sql new file mode 100644 index 0000000..c21400d --- /dev/null +++ b/mysqlcodes/query6.sql @@ -0,0 +1,7 @@ +SELECT s.salesId +from sales s +LEFT JOIN inventory i +on s.inventoryId = i.inventoryId + LEFT JOIN model m + on i.modelId = m.modelId + WHERE EngineType = 'Electric'