From 52f977e8857cd6d322c13c842f86c2cda14c7533 Mon Sep 17 00:00:00 2001
From: Oscar <oscarcao777@example.com>
Date: Fri, 24 Jan 2025 01:50:10 +0000
Subject: [PATCH] final clean-up for database

---
 web_server/database/app.db     | Bin 49152 -> 65536 bytes
 web_server/database/schema.sql |  12 ++++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web_server/database/app.db b/web_server/database/app.db
index eb231e8c9a89470f8caf6b7888a306fa7125b185..38e7d2e9804c6ada44adb108ba092991e6035f2b 100644
GIT binary patch
delta 746
zcmZo@U~Xt&nIJ7#$H2fK0K_m*HBrY{yN*FmCxDkth=HGR2O}>J`$q1`T*p`zvsdwD
zvwO1rVN2#*#B9hW#khkrcjH7oMysZ>5O#4zMaEY1lEkE()Z)^l;^d;tq|{;ri{ClO
z)iK0XA;i(i$5jC?K6yQ-#N<6Ze3Rq3l_qavmt{%KODUfGfmdR3Be&?}>D;oDukx5q
ze#I>~`5?dYWO*LBdIbdqF3qO=Aa-$GUB*^Hu!W_?sYUSxMX712MX7noK>N}7yeO8V
z%W`RO0S#3E3umS%c>0AX`1u2IsE>~hSSC5KBsD$1s4^ZXtBfg~mROcwT9lZSnUh&k
z3DQ2<o?lWnAjs3#F(^{O+ci=HYP605%%sWlfxd(JOp3#Wt0~)?U0hn4u~m1n5O+Q>
zB*Z5Nv*}Lm<K7s`#um-M0g4{`U^ek!T}Fn?yp+_6;zFQpsqu-WCHY`}Ji4#q4besT
z*oz<rHHrmHPUM)z<n2FsFPAryy5D3uPIWH!l@M87pUM85y4)OBA>1ZKkIn6zDvazi
z#P#(Vn+qqav-jB>hq8&gE8=nrJa&uY4H0aCCdEK@xEcMEPw{Y1KETg0`8k`?WDbsS
zCNHnaPCTcWo60;lckz`mPUhhaW#tubD$@XRSs9s|g?uM>v${^s=VP1vn^kJ^1y<F~
kqHG+Dn*_K67}+)p3cTl^7{IznL10mW0*Kro0A?Ei0O`l!i~s-t

delta 302
zcmZo@U}<Pzo**sg&%nUI1H>@kJyFM4*`GmACxDmZI|Das2Lmq;yDUc>XA56Dk3BaB
zr!Q*<rwrHb&4L1Ktjx_qhLiL7Tqj@VQ=P2O%{F-_pVa0bd>o8iO?Im6;`;iGE!vas
zbM#G?W|f$1$~B2eOl@)++ca%XR|ZvaQBlTL$CAXPoYdru#1atZa1L^H3~^Nmadh%=
zRZur#6So$ftiUEA3X+UB1d*JaH4Gdex9S>9u3^{Z=2`*aHYw_C-omcJC?qT{EzQ_s
z4>mU~KPSiAc=A6sZ>}a2eRhb<<h3mMlY?3JF*kbYO+LwWYBCRRD66J;Q<=u*Y21p8
Z%uQvwKt>tkCIRk%&D;WC<rg(L006t?OacG^

diff --git a/web_server/database/schema.sql b/web_server/database/schema.sql
index 8cbe2c5..26b1321 100644
--- a/web_server/database/schema.sql
+++ b/web_server/database/schema.sql
@@ -40,6 +40,7 @@ CREATE TABLE follows
 (
     user_id INTEGER NOT NULL,
     streamer_id INTEGER NOT NULL,
+    since DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (user_id, streamer_id),
     FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE,
     FOREIGN KEY (streamer_id) REFERENCES streamers(streamer_id) ON DELETE CASCADE
@@ -49,8 +50,8 @@ DROP TABLE IF EXISTS chat;
 CREATE TABLE chat
 (
     message_id INTEGER,
-    chatter_id VARCHAR(50) NOT NULL,
     stream_id INTEGER NOT NULL,
+    chatter_id VARCHAR(50) NOT NULL,
     message VARCHAR(256) NOT NULL,
     time_sent DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (message_id, stream_id),
@@ -72,7 +73,6 @@ CREATE TABLE stream_categories
 (
     stream_id INTEGER NOT NULL,
     category_id INTEGER NOT NULL,
-    since DATETIME NOT NULL,
     FOREIGN KEY (stream_id) REFERENCES streams(stream_id),
     FOREIGN KEY (category_id) REFERENCES categories(category_id) ON DELETE CASCADE
 );
@@ -86,10 +86,10 @@ CREATE TABLE user_preferences
     PRIMARY KEY(user_id, category_id),
     FOREIGN KEY(user_id) REFERENCES users(user_id) ON DELETE CASCADE,
     FOREIGN KEY(category_id) REFERENCES categories(category_id) ON DELETE CASCADE
-)
+);
 
-DROP TABLE IF EXISTS subscribed;
-CREATE TABLE subscribed
+DROP TABLE IF EXISTS subscribes;
+CREATE TABLE subscribes
 (
     user_id INTEGER NOT NULL,
     streamer_id INTEGER NOT NULL,
@@ -98,5 +98,5 @@ CREATE TABLE subscribed
     PRIMARY KEY (user_id,streamer_id),
     FOREIGN KEY(user_id) REFERENCES users(user_id) ON DELETE CASCADE,
     FOREIGN KEY(streamer_id) REFERENCES streamers(streamer_id) ON DELETE CASCADE   
-)
+);