From 154f41fd8ce0f6a4931ed536fd8b820991ed119c Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 11:39:53 -0600
Subject: [PATCH 01/12] Created tables

---
 db.db       | Bin 0 -> 45056 bytes
 queries.sql |  40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 db.db
 create mode 100644 queries.sql

diff --git a/db.db b/db.db
new file mode 100644
index 0000000000000000000000000000000000000000..21c63b9175f2a56a9bbfbfca2c1ccb53106ec325
GIT binary patch
literal 45056
zcmeI&T}#_g7{KvFZL4vu!d7x2jB_!uMK@5#b}@uy-Ek|nRbx6786~rsE7)|lDU88j
zb$*?FhJC2r>~2e9bg5W2!R;da15I*XayZZLIa&_s&UU5cIpS@n+qONis>~{?syr1!
zQIwSbnf5>DM^K(PFZfqAc0cMir98OzIXm-1(X@Rf_jBf3?rU~GcbeP3btk)|efKLl
z5I_I{1Q0*~0R)mFFvx2eeSTgYv_1RHk<;%v-NwN?+jX6z`2BRrl!hgRWjw1$5pNL%
zO`KJ<nxb5@<O^vEQ?5%>)=F|GY$~*x#U;O6G;rhUo>6PiSu390oyzEQbL#2sa9(Yv
z*Rv0u=%NkHCaMf45*vBTELRP4Pi)9NVbrb7a?O9LDr;6alaA{-t|u(H8<xX}Vh>*m
zKwK+=-@Utz?Kw?hm8){cGOAnRxm-8u6-$)rrtf1lE?R;~_1`!Dw!06M&zu3NAy9-D
zT_%TsqRMLlxpvzTuMD&F(lABg(ZiysZCavMuT(_6R^G15V8Wg5q3yOl+Fq;Uj!0^}
z%YSjXKbh8zIaO)7P3J@J_{iTlHSE6E3Crh8yRjUZObtFwWb}Mq{qp)^{Re9yH3S&c
z+`L{e>M--_%9YFq|8N;Cq|^G7{3x#Q&tfGwXBJX_?6@3sOmB^+^~FVXFZ7HO&~uLa
zj(gx-DozY3UurA_HcS4K#le~y{*O9Y3&)Hvsrdca&}i|No6p@fQlb?fkEQjE`BBF4
zi8hwwrE&jDW-|Dq$p)v{;KYFd0tg_000IagfB*srAb<b@Nfpq7z}WvMHNC`z00Iag
zfB*srAb<b@2q1t!D8T!F76JkYAb<b@2q1s}0tg_000PMuVE>=|91|e|2q1s}0tg_0
z00IagfB*vg{+~5~00IagfB*srAb<b@2q1t!@&(xcCqKtThyVfzAb<b@2q1s}0tg_0
z0Kfld4IqF30tg_000IagfB*srAdq|k-v1{*$3%z#0tg_000IagfB*srAb<ex|5*bF
tAb<b@2q1s}0tg_000IakUx598@^egt2q1s}0tg_000IagfB*sr`~tal!x{hp

literal 0
HcmV?d00001

diff --git a/queries.sql b/queries.sql
new file mode 100644
index 0000000..4febcff
--- /dev/null
+++ b/queries.sql
@@ -0,0 +1,40 @@
+-- CREATE TABLES --
+CREATE TABLE organization (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  name VARCHAR (64) NOT NULL UNIQUE,
+  created TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE user (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  name VARCHAR (64) NOT NULL UNIQUE,
+  username VARCHAR (32) NOT NULL UNIQUE,
+  created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE channel (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  name VARCHAR (64) NOT NULL UNIQUE,
+  organization_id INTEGER REFERENCES organization (id),
+  created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE message (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  content TEXT,
+  user_id INTEGER REFERENCES user (id),
+  channel_id INTEGER REFERENCES channel (id),
+  created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+  updated TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE user_channel (
+  user_id INTEGER REFERENCES user(id),
+  channel_id INTEGER REFERENCES channel(id)
+);
+
+
+
+-- INSERT STUFF --

From df664336083352d71e3f1da812842e30e663dee9 Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 11:57:28 -0600
Subject: [PATCH 02/12] inserted users

---
 queries.sql | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/queries.sql b/queries.sql
index 4febcff..d921ed7 100644
--- a/queries.sql
+++ b/queries.sql
@@ -38,3 +38,27 @@ CREATE TABLE user_channel (
 
 
 -- INSERT STUFF --
+
+INSERT INTO user
+  (name, username)
+  VALUES("Vekh", "vivec2002");
+
+INSERT INTO user
+  (name, username)
+  VALUES("Seht", "s-sil");
+
+INSERT INTO user
+  (name, username)
+  VALUES("Ayem", "lexie");
+
+INSERT INTO user
+  (name, username)
+  VALUES("Nerevar", "hortator1");
+
+INSERT INTO user
+  (name, username)
+  VALUES("Kagrenac", "1337toolz");
+
+INSERT INTO user
+  (name, username)
+  VALUES("Dagoth Ur", "ursharmat");

From 53507f85ad8f63533dcf0554ccccd3ab1e4eaeac Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:03:58 -0600
Subject: [PATCH 03/12] Added channels

---
 queries.sql | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/queries.sql b/queries.sql
index d921ed7..2bd2a40 100644
--- a/queries.sql
+++ b/queries.sql
@@ -62,3 +62,27 @@ INSERT INTO user
 INSERT INTO user
   (name, username)
   VALUES("Dagoth Ur", "ursharmat");
+
+INSERT INTO organization
+  (name)
+  VALUES("ALMSIVI");
+
+INSERT INTO organization
+  (name)
+  VALUES("Morrowind");
+
+INSERT INTO channel
+  (name, organization_id)
+  VALUES("#CHIMtips", 1);
+
+INSERT INTO channel
+  (name, organization_id)
+  VALUES("#divinediscussion", 1);
+
+INSERT INTO channel
+  (name, organization_id)
+  VALUES("#guarpics", 2);
+
+INSERT INTO channel
+  (name, organization_id)
+  VALUES("#livingwithcorprus", 2);

From 2589b8ab827a2b97f5edbc9e86eb555dea070c5a Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:13:43 -0600
Subject: [PATCH 04/12] Added messages

---
 queries.sql | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/queries.sql b/queries.sql
index 2bd2a40..10f61a9 100644
--- a/queries.sql
+++ b/queries.sql
@@ -86,3 +86,27 @@ INSERT INTO channel
 INSERT INTO channel
   (name, organization_id)
   VALUES("#livingwithcorprus", 2);
+
+INSERT INTO message
+  (content, user_id, channel_id)
+  VALUES("The sage who suppresses his best aphorism: cut off his hands, for he is a thief.", 1, 1);
+
+INSERT INTO message
+  (content, user_id, channel_id)
+  VALUES("lol wut?", 2, 1);
+
+INSERT INTO message
+  (content, user_id, channel_id)
+  VALUES("What do you guys do when your followers pray to you too much?", 3, 2);
+
+INSERT INTO message
+  (content, user_id, channel_id)
+  VALUES("There is once more the case of the symbolic and barren. The true prince that is cursed and demonized will be adored at last with full hearts. According to the Codes of Mephala there can be no official art, only fixation points of complexity that will erase from the awe of the people given enough time. This is a secret that hides another. An impersonal survival is not the way of the ruling king. Embrace the art of the people and marry it and by that I mean secretly have it murdered.", 1, 2);
+
+INSERT INTO message
+  (content, user_id, channel_id)
+  VALUES("Uh, OK, thanks.", 3, 2);
+
+INSERT INTO message
+  (content, user_id, channel_id)
+  VALUES("Guys, I got locked out of the ALMSIVI channels, you need to reinvite me.  Guys?  Are you seeing this?", 4, 3);
\ No newline at end of file

From 4d04421b8f546b0cc2d7adadace1e7b5fb235887 Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:18:07 -0600
Subject: [PATCH 05/12] added user channel entries

---
 queries.sql | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/queries.sql b/queries.sql
index 10f61a9..7de230b 100644
--- a/queries.sql
+++ b/queries.sql
@@ -109,4 +109,20 @@ INSERT INTO message
 
 INSERT INTO message
   (content, user_id, channel_id)
-  VALUES("Guys, I got locked out of the ALMSIVI channels, you need to reinvite me.  Guys?  Are you seeing this?", 4, 3);
\ No newline at end of file
+  VALUES("Guys, I got locked out of the ALMSIVI channels, you need to reinvite me.  Guys?  Are you seeing this?", 4, 3);
+
+INSERT INTO user_channel
+  (user_id, channel_id)
+  VALUES(1, 1);
+
+INSERT INTO user_channel
+  (user_id, channel_id)
+  VALUES(3, 2);
+
+INSERT INTO user_channel
+  (user_id, channel_id)
+  VALUES(6, 4);
+
+INSERT INTO user_channel
+  (user_id, channel_id)
+  VALUES(5, 3);
\ No newline at end of file

From ec24e8584c901a91df9d6763681683395309bb60 Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:20:38 -0600
Subject: [PATCH 06/12] first couple of queries

---
 queries.sql | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/queries.sql b/queries.sql
index 7de230b..577d511 100644
--- a/queries.sql
+++ b/queries.sql
@@ -125,4 +125,13 @@ INSERT INTO user_channel
 
 INSERT INTO user_channel
   (user_id, channel_id)
-  VALUES(5, 3);
\ No newline at end of file
+  VALUES(5, 3);
+
+
+-- QUERY STUFF --
+
+SELECT name
+from organization
+
+SELECT name
+from channel
\ No newline at end of file

From 4751a86d32f78fcba339add260d9608700c1309d Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:36:24 -0600
Subject: [PATCH 07/12] Add additional queries

---
 db.db       | Bin 45056 -> 45056 bytes
 queries.sql |  17 ++++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/db.db b/db.db
index 21c63b9175f2a56a9bbfbfca2c1ccb53106ec325..88486f64d766c17e9b04fce3242369c67a55ae2c 100644
GIT binary patch
literal 45056
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
P%ycG2PX;|0x!k`2W%>;L

delta 165
zcmZp8z|`=7X@WE(>qHr6M%Il9OZb@>1U3sQT;rcOL4}Qr0SFLWUc6j1#b{hKz4&EO
G6$1drAtn6)

diff --git a/queries.sql b/queries.sql
index 577d511..49c5790 100644
--- a/queries.sql
+++ b/queries.sql
@@ -97,7 +97,7 @@ INSERT INTO message
 
 INSERT INTO message
   (content, user_id, channel_id)
-  VALUES("What do you guys do when your followers pray to you too much?", 3, 2);
+  VALUES("What do you guys do when your followers pray too much?", 3, 2);
 
 INSERT INTO message
   (content, user_id, channel_id)
@@ -131,7 +131,18 @@ INSERT INTO user_channel
 -- QUERY STUFF --
 
 SELECT name
-from organization
+from organization;
 
 SELECT name
-from channel
\ No newline at end of file
+from channel;
+
+SELECT channel.name
+  FROM channel, organization
+  WHERE organization_id = organization.id
+  AND organization.name = "ALMSIVI";
+
+SELECT message.content
+  FROM message, channel
+  WHERE channel_id = channel.id
+  AND channel.name = "#guarpics"
+  ORDER BY message.created DESC;

From bcea5cdc5f54809ebda05b0b10aeb4037ee2c535 Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:42:03 -0600
Subject: [PATCH 08/12] Add Vehk channel query

---
 db.db       | Bin 45056 -> 45056 bytes
 queries.sql |   8 +++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/db.db b/db.db
index 88486f64d766c17e9b04fce3242369c67a55ae2c..4137bd7741f8bb80660e0c348d000ad7f80f5870 100644
GIT binary patch
delta 538
zcmZp8z|`=7X~S)KRue-jW7EkG<fS33O$vwfB*0=u28I^829~-8<_d-uRuE;k{M2zv
zO8TqemJIio$1U0CFRy~jPD@5M22puq<FM3>?8z7X#c`UlDc~PJQ%3ft1S|OfT!xu3
zvoXjs8XGI8mnIe!WF{9gVeusvp~+qKcszcx9=G2%H5AI=bn@iRIT|=67oVKNgi~_z
X!+HL=B|YXV;FfHdpMg_y(E<Sg6YqXH

delta 538
zcmZp8z|`=7X~S)KR%0_O1B1yA<fS33O$vwfB*0=u28I^829~-8<_d-uRuE;k{M2zv
zO8TqemJIio$1U0CFRy~jPD@5M22puq<FM51jL8@M#c`UlDc~PJQ+CFt1S|OfT!xu3
zvoXjs8XGI8mnIe!WF{9gVeusvp~+qKcszcx9=G2%H5AI=bn@iRIT|=67oVKNgi~_z
X!+HL=B|YXV;FfHdpMg_y(E<Sgh$elq

diff --git a/queries.sql b/queries.sql
index 49c5790..ae179c8 100644
--- a/queries.sql
+++ b/queries.sql
@@ -41,7 +41,7 @@ CREATE TABLE user_channel (
 
 INSERT INTO user
   (name, username)
-  VALUES("Vekh", "vivec2002");
+  VALUES("Vehk", "vivec2002");
 
 INSERT INTO user
   (name, username)
@@ -146,3 +146,9 @@ SELECT message.content
   WHERE channel_id = channel.id
   AND channel.name = "#guarpics"
   ORDER BY message.created DESC;
+
+SELECT channel.name
+  FROM user, channel, user_channel
+  WHERE user.id = user_id
+  AND channel.id = channel_id
+  AND user.name  = "Vehk";

From 4068141ce61630eea7ff7c9d6c88c9fd28a0e0f4 Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:43:50 -0600
Subject: [PATCH 09/12] Add query to find users from channel

---
 db.db       | Bin 45056 -> 45056 bytes
 queries.sql |   6 ++++++
 2 files changed, 6 insertions(+)

diff --git a/db.db b/db.db
index 4137bd7741f8bb80660e0c348d000ad7f80f5870..2861edaea842729e98f118342828627f35921d9d 100644
GIT binary patch
delta 503
zcmZp8z|`=7X~P|P7Go<z<H--?Wx$M03WxQ?K_W&5h8DU8mbwP!3WgR|CSXOk{4{XN
zN&2hflneJ)z$w><NA9S<3NC${0<87@ak$frnT<i7(b!lyy)?0?ATzm`35#d22u<#)
z$L+t9^*H^osi8;)mpdnS&e6mrxB288MkZX6lON6tz$xc3UlFHV!~9HKa*GxS004Yx
Bbvgh5

delta 503
zcmZp8z|`=7X~P|P7DFpz)5#CyWx$M03WxQ?K_W&5h8DU8mbwP!3WgR|CSXOk{4{XN
zN&2hflneJ)z$w><NA9S<3NC${0<87@ak$frnT<i7(b!lyy)?0?ATzm`35#d22u<#)
z$L+t9^*H^osi8;)mpdnS&e6mrxB288MkZX6lON6tz$xc3UlFHV!~9HKa*GxS006$1
Bb$$Q<

diff --git a/queries.sql b/queries.sql
index ae179c8..b7f115e 100644
--- a/queries.sql
+++ b/queries.sql
@@ -152,3 +152,9 @@ SELECT channel.name
   WHERE user.id = user_id
   AND channel.id = channel_id
   AND user.name  = "Vehk";
+
+SELECT user.name
+  FROM user, channel, user_channel
+  WHERE user.id = user_id
+  AND channel.id = channel_id
+  AND channel.name = "#CHIMtips";
\ No newline at end of file

From 6de1983816bb0d113a3a2a8ba8dc4f70ec9f86b7 Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:45:16 -0600
Subject: [PATCH 10/12] Add query to show all messages from Vehk

---
 queries.sql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/queries.sql b/queries.sql
index b7f115e..0d9d256 100644
--- a/queries.sql
+++ b/queries.sql
@@ -157,4 +157,9 @@ SELECT user.name
   FROM user, channel, user_channel
   WHERE user.id = user_id
   AND channel.id = channel_id
-  AND channel.name = "#CHIMtips";
\ No newline at end of file
+  AND channel.name = "#CHIMtips";
+
+SELECT content
+FROM message, user
+WHERE user_id = user.id
+  AND user.name = "Vehk";
\ No newline at end of file

From 485667cbeb0fd688ab31b831cfce4e5a90d2505e Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:48:27 -0600
Subject: [PATCH 11/12] Add query to show messages from Ayem in
 #divinediscussion

---
 db.db       | Bin 45056 -> 45056 bytes
 queries.sql |   9 ++++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/db.db b/db.db
index 2861edaea842729e98f118342828627f35921d9d..848b99d0ae591cb35b8bd9216855b1075ff0bf8d 100644
GIT binary patch
delta 503
zcmZp8z|`=7X~P|P7IQ08v&j$SWx$M03WxQ?K_W&5h8DU8mbwP!3WgR|CSXOk{4{XN
zN&2hflneJ)z$w><NA9S<3NC${0<87@fsQiAbf>u)GaG|Eqp`7adTC-&L1uC>6Q&}p
z{_Cp8?Z1=tIQ_7xp-2YgPHb+O+&M=Rm)z!)a~PR$Nltz^F94^U$9zScat-q{amg)O
GAOHaKymr0-

delta 503
zcmZp8z|`=7X~P|P7Go<z<H--?Wx$M03WxQ?K_W&5h8DU8mbwP!3WgR|CSXOk{4{XN
zN&2hflneJ)z$w><NA9S<3NC${0<87@ak$frnT<i7(b!lyy)?0?ATzm`35#d22u<#)
z$L+t9^*H^osi8;)mpdnS&e6mrxB288MkZX6lON6tz$xc3UlFHV!~9HKa*GxS004Yx
Bbvgh5

diff --git a/queries.sql b/queries.sql
index 0d9d256..387ffde 100644
--- a/queries.sql
+++ b/queries.sql
@@ -162,4 +162,11 @@ SELECT user.name
 SELECT content
 FROM message, user
 WHERE user_id = user.id
-  AND user.name = "Vehk";
\ No newline at end of file
+  AND user.name = "Vehk";
+
+SELECT content
+FROM message, channel, user
+WHERE user_id = user.id
+  AND channel_id = channel.id
+  AND channel.name = "#divinediscussion"
+  AND user.name = "Ayem";
\ No newline at end of file

From b423f71cf00352bd37abd8e6e7d49ad4e70ff105 Mon Sep 17 00:00:00 2001
From: Zach Campbell <beazlebubbles@gmail.com>
Date: Fri, 7 Sep 2018 12:50:22 -0600
Subject: [PATCH 12/12] Add query to count messages from all users

---
 db.db       | Bin 45056 -> 45056 bytes
 queries.sql |  16 +++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/db.db b/db.db
index 848b99d0ae591cb35b8bd9216855b1075ff0bf8d..385dc743f11ea01e857ce11b3b4e56ec056dcff8 100644
GIT binary patch
delta 503
zcmZp8z|`=7X~P|P7E3Er)5#CyWx$M03WxQ?K_W&5h8DU8mbwP!3WgR|CSXOk{4{XN
zN&2hflneJ)z$w><NA9S<3NC${0<87@ak$frnT<i7(b!lyy)?0?ATzm`35#d22u<#)
z$L+t9^*H^osi8;)mpdnS&e6mrxB288MkZX6lON6tz$xc3UlFHV!~9HKa*GxS000lS
BcG3U<

delta 503
zcmZp8z|`=7X~P|P7IQ08v&j$SWx$M03WxQ?K_W&5h8DU8mbwP!3WgR|CSXOk{4{XN
zN&2hflneJ)z$w><NA9S<3NC${0<87@fsQiAbf>u)GaG|Eqp`7adTC-&L1uC>6Q&}p
z{_Cp8?Z1=tIQ_7xp-2YgPHb+O+&M=Rm)z!)a~PR$Nltz^F94^U$9zScat-q{amg)O
GAOHaKymr0-

diff --git a/queries.sql b/queries.sql
index 387ffde..3e79fc1 100644
--- a/queries.sql
+++ b/queries.sql
@@ -160,13 +160,19 @@ SELECT user.name
   AND channel.name = "#CHIMtips";
 
 SELECT content
-FROM message, user
-WHERE user_id = user.id
+  FROM message, user
+  WHERE user_id = user.id
   AND user.name = "Vehk";
 
 SELECT content
-FROM message, channel, user
-WHERE user_id = user.id
+  FROM message, channel, user
+  WHERE user_id = user.id
   AND channel_id = channel.id
   AND channel.name = "#divinediscussion"
-  AND user.name = "Ayem";
\ No newline at end of file
+  AND user.name = "Ayem";
+
+SELECT user.name AS "User Name", COUNT(*) AS "Message Count"
+  FROM user, message
+  WHERE user_id = user.id
+  GROUP BY user.id
+  ORDER BY user.name DESC;
\ No newline at end of file