diff --git a/.vscode/settings.json b/.vscode/settings.json index c97cc32..778b9d2 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": "Visual Studio Dark", "workbench.fontAliasing": "antialiased", "workbench.statusBar.visible": true diff --git a/queries/01_02/ComparisonConditions.sql b/queries/01_02/ComparisonConditions.sql index 6c3f224..b08937c 100644 --- a/queries/01_02/ComparisonConditions.sql +++ b/queries/01_02/ComparisonConditions.sql @@ -1,6 +1,6 @@ SELECT empno, name,hiredate FROM emp_tab -WHERE name LIKE '_D%'; +WHERE name LIKE '_D%' or name LIKE 'K%'; SELECT * FROM emp_tab WHERE deptno IN (30,40); @@ -9,4 +9,6 @@ SELECT * FROM emp_tab WHERE salary BETWEEN 2000 AND 6000; SELECT empno FROM emp_tab -WHERE manager IS NULL; \ No newline at end of file +WHERE manager IS NULL; + +SELECT * FROM emp_tab \ No newline at end of file diff --git a/queries/01_02/LogicalConditions.sql b/queries/01_02/LogicalConditions.sql index e1c3a75..2863e78 100644 --- a/queries/01_02/LogicalConditions.sql +++ b/queries/01_02/LogicalConditions.sql @@ -1,8 +1,21 @@ SELECT * FROM emp_tab WHERE name LIKE 'S%' AND deptno=30; +SELECT * FROM ( + SELECT * FROM emp_tab WHERE name LIKE 'S%' +) AS 'Test of S'; + + SELECT * FROM emp_tab WHERE name LIKE 'S%' OR deptno=30; SELECT * FROM emp_tab -WHERE deptno NOT IN(30,40); \ No newline at end of file +WHERE deptno NOT IN(30,40); + +SELECT * FROM emp_tab +WHERE NOT(NOT(deptno > 35)) + +SELECT name 'Name', CONCAT('$', salary*12) 'Salary' FROM emp_tab +WHERE salary*12 < 50000 + +-- SELECT CONCAT('$', FORMAT(salary, 2)) 'Salary' FROM emp_tab; diff --git a/queries/01_02/ORDERBY.sql b/queries/01_02/ORDERBY.sql index cd2dbed..87eb892 100644 --- a/queries/01_02/ORDERBY.sql +++ b/queries/01_02/ORDERBY.sql @@ -1,5 +1,24 @@ -SELECT * FROM emp_tab -WHERE deptno=30 ORDER BY salary; +SELECT name 'Name', deptno 'Dept #', +CONCAT('$',salary*12) 'Annual Salary' FROM emp_tab +WHERE deptno=30 ORDER BY salary DESC; -SELECT * FROM emp_tab -ORDER BY deptno,salary DESC; \ No newline at end of file +SELECT name 'Name', job 'Job', deptno 'Dept #', +commission 'Commision', CONCAT('$', salary*12) +AS Salary FROM emp_tab +ORDER BY deptno DESC,commission DESC, Salary DESC; + +SELECT * FROM emp_tab; + +SELECT + name 'Name', + job 'Job', + deptno 'Dept #' +FROM emp_tab +WHERE NOT deptno=70 AND NOT name='FORD' +AND NOT job='CLERK' +ORDER BY name; + +SELECT * +FROM emp_tab +WHERE NOT deptno=70 AND NOT name='FORD' +ORDER BY name; \ No newline at end of file diff --git a/queries/01_02/OrderOfPrecedence.sql b/queries/01_02/OrderOfPrecedence.sql index 3524eab..1418529 100644 --- a/queries/01_02/OrderOfPrecedence.sql +++ b/queries/01_02/OrderOfPrecedence.sql @@ -1,9 +1,9 @@ SELECT empno,name,deptno,salary FROM emp_tab -WHERE deptno=30 OR deptno=40 -AND salary>2500; +WHERE deptno=40 OR deptno=30 +AND salary BETWEEN 2500 AND 4900; SELECT empno,name,deptno,salary FROM emp_tab WHERE (deptno=30 OR deptno=40) -AND salary>2500; \ No newline at end of file +AND salary BETWEEN 2500 AND 4900; \ No newline at end of file diff --git a/queries/01_02/WHEREcondition.sql b/queries/01_02/WHEREcondition.sql index 2c769f7..0e41f2d 100644 --- a/queries/01_02/WHEREcondition.sql +++ b/queries/01_02/WHEREcondition.sql @@ -4,4 +4,8 @@ WHERE salary>2500; SELECT empno,name, salary FROM emp_tab -WHERE name='KING'; \ No newline at end of file +WHERE name='KING'; + +SELECT * +FROM emp_tab +