From 3e62160879fb2945a03454ff1d6a872e1ce59f8c Mon Sep 17 00:00:00 2001
From: Alex <n_alex2001@mail.ru>
Date: Sun, 10 Nov 2019 18:20:53 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D1=82=D0=B0=D1=81=D0=BA=201=20=D0=B8=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lesson07/task1.sql |  4 ++++
 lesson07/task3.sql | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 lesson07/task1.sql
 create mode 100644 lesson07/task3.sql

diff --git a/lesson07/task1.sql b/lesson07/task1.sql
new file mode 100644
index 0000000..efcafd7
--- /dev/null
+++ b/lesson07/task1.sql
@@ -0,0 +1,4 @@
+select distinct u.name 
+from orders as o
+	join
+      users as u on u.id = o.user_id 
\ No newline at end of file
diff --git a/lesson07/task3.sql b/lesson07/task3.sql
new file mode 100644
index 0000000..7e60f3d
--- /dev/null
+++ b/lesson07/task3.sql
@@ -0,0 +1,38 @@
+DROP DATABASE IF EXISTS flights;
+CREATE DATABASE flights;
+USE flights;
+
+DROP TABLE IF EXISTS flights;
+CREATE TABLE flights (
+  id SERIAL PRIMARY KEY,
+  `from` VARCHAR(255),
+  `to` VARCHAR(255)
+);
+
+INSERT INTO flights (`from`,`to`) VALUES
+  ('moscow', 'omsk'),
+  ('novgorod', 'kazan'),
+  ('irkutsk', 'moscow'),
+  ('omsk', 'irkutsk'),
+  ('moscow', 'kazan');
+
+DROP TABLE IF EXISTS cities;
+CREATE TABLE cities (
+  label VARCHAR(255),
+  name VARCHAR(255)
+);
+
+INSERT INTO cities (label, name) VALUES
+  ('moscow', 'Ìîñêâà'),
+  ('irkutsk', 'Èðêóòñê'),
+  ('novgorod', 'Íîâãîðîä'),
+  ('kazan', 'Êàçàíü'),
+  ('omsk', 'Îìñê');
+ 
+ select f.id, c1.name as `from`, c2.name as `to` 
+ from flights as f
+ 	join 
+ 	  cities as c1 on f.`from` = c1.label
+ 	join
+ 	  cities as c2 on f.`to` = c2.label
+ order by f.id

From 6e0d645314c4a2f66442c596ad296a6ca8d0f8ce Mon Sep 17 00:00:00 2001
From: Alex <n_alex2001@mail.ru>
Date: Mon, 11 Nov 2019 15:23:05 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D1=81=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lesson07/task2.sql | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 lesson07/task2.sql

diff --git a/lesson07/task2.sql b/lesson07/task2.sql
new file mode 100644
index 0000000..cf02dc7
--- /dev/null
+++ b/lesson07/task2.sql
@@ -0,0 +1,6 @@
+use newdb;
+
+select p.name as product_name, c.name as catalog_name  
+from  newdb.catalogs as c
+        join 
+      products as p on c.id = p.catalog_id
\ No newline at end of file