From 21f7d5d9384b57bf38189d05de5004b3684b43d0 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Tue, 17 May 2022 12:53:48 -0400
Subject: [PATCH] Don't add primary keys with sqlite

---
 databases/_upgrade_private_8.sql       | 14 +++++++-------
 databases/_upgrade_sponsorTimes_32.sql | 22 +++++++++++-----------
 src/databases/Sqlite.ts                |  4 +---
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/databases/_upgrade_private_8.sql b/databases/_upgrade_private_8.sql
index d16a81b..768facb 100644
--- a/databases/_upgrade_private_8.sql
+++ b/databases/_upgrade_private_8.sql
@@ -2,13 +2,13 @@ BEGIN TRANSACTION;
 
 -- Add primary keys
 
-ALTER TABLE "userNameLogs" ADD "id" SERIAL PRIMARY KEY;
-ALTER TABLE "categoryVotes" ADD "id" SERIAL PRIMARY KEY;
-ALTER TABLE "sponsorTimes" ADD "id" SERIAL PRIMARY KEY;
-ALTER TABLE "config" ADD PRIMARY KEY ("key");
-ALTER TABLE "ratings" ADD "id" SERIAL PRIMARY KEY;
-ALTER TABLE "tempVipLog" ADD "id" SERIAL PRIMARY KEY;
-ALTER TABLE "votes" ADD "id" SERIAL PRIMARY KEY;
+ALTER TABLE "userNameLogs" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "categoryVotes" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "sponsorTimes" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "config" ADD PRIMARY KEY ("key"); --!sqlite-ignore
+ALTER TABLE "ratings" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "tempVipLog" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "votes" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
 
 UPDATE "config" SET value = 8 WHERE key = 'version';
 
diff --git a/databases/_upgrade_sponsorTimes_32.sql b/databases/_upgrade_sponsorTimes_32.sql
index 50bfcea..ebba3e6 100644
--- a/databases/_upgrade_sponsorTimes_32.sql
+++ b/databases/_upgrade_sponsorTimes_32.sql
@@ -2,17 +2,17 @@ BEGIN TRANSACTION;
 
 -- Add primary keys
 
-ALTER TABLE "sponsorTimes" ADD PRIMARY KEY ("UUID");
-ALTER TABLE "vipUsers" ADD PRIMARY KEY ("userID");
-ALTER TABLE "userNames" ADD PRIMARY KEY ("userID");
-ALTER TABLE "categoryVotes" ADD "id" SERIAL PRIMARY KEY;
-ALTER TABLE "lockCategories" ADD "id" SERIAL PRIMARY KEY;
-ALTER TABLE "warnings" ADD PRIMARY KEY ("userID", "issueTime");
-ALTER TABLE "shadowBannedUsers" ADD PRIMARY KEY ("userID");
-ALTER TABLE "unlistedVideos" ADD "id" SERIAL PRIMARY KEY;
-ALTER TABLE "config" ADD PRIMARY KEY ("key");
-ALTER TABLE "archivedSponsorTimes" ADD PRIMARY KEY ("UUID");
-ALTER TABLE "ratings" ADD "id" SERIAL PRIMARY KEY;
+ALTER TABLE "sponsorTimes" ADD PRIMARY KEY ("UUID"); --!sqlite-ignore
+ALTER TABLE "vipUsers" ADD PRIMARY KEY ("userID"); --!sqlite-ignore
+ALTER TABLE "userNames" ADD PRIMARY KEY ("userID"); --!sqlite-ignore
+ALTER TABLE "categoryVotes" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "lockCategories" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "warnings" ADD PRIMARY KEY ("userID", "issueTime"); --!sqlite-ignore
+ALTER TABLE "shadowBannedUsers" ADD PRIMARY KEY ("userID"); --!sqlite-ignore
+ALTER TABLE "unlistedVideos" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
+ALTER TABLE "config" ADD PRIMARY KEY ("key"); --!sqlite-ignore
+ALTER TABLE "archivedSponsorTimes" ADD PRIMARY KEY ("UUID"); --!sqlite-ignore
+ALTER TABLE "ratings" ADD "id" SERIAL PRIMARY KEY; --!sqlite-ignore
 
 UPDATE "config" SET value = 32 WHERE key = 'version';
 
diff --git a/src/databases/Sqlite.ts b/src/databases/Sqlite.ts
index f396791..f5dd371 100644
--- a/src/databases/Sqlite.ts
+++ b/src/databases/Sqlite.ts
@@ -93,9 +93,7 @@ export class Sqlite implements IDatabase {
     }
 
     private static processUpgradeQuery(query: string): string {
-        const result = query.replace(/^.*--!sqlite-ignore/gm, "");
-
-        return result;
+        return query.replace(/^.*--!sqlite-ignore/gm, "");
     }
 }