DB: don't pass PG_DB to check_table/check_enum

src/invidious.cr

@@ -113,19 +113,19 @@ LOGGER = Invidious::LogHandler.new(OUTPUT, CONFIG.log_level)
 
 # Check table integrity
 if CONFIG.check_tables
-  Invidious::Database.check_enum(PG_DB, "privacy", PlaylistPrivacy)
+  Invidious::Database.check_enum("privacy", PlaylistPrivacy)
 
-  Invidious::Database.check_table(PG_DB, "channels", InvidiousChannel)
-  Invidious::Database.check_table(PG_DB, "channel_videos", ChannelVideo)
-  Invidious::Database.check_table(PG_DB, "playlists", InvidiousPlaylist)
-  Invidious::Database.check_table(PG_DB, "playlist_videos", PlaylistVideo)
-  Invidious::Database.check_table(PG_DB, "nonces", Nonce)
-  Invidious::Database.check_table(PG_DB, "session_ids", SessionId)
-  Invidious::Database.check_table(PG_DB, "users", User)
-  Invidious::Database.check_table(PG_DB, "videos", Video)
+  Invidious::Database.check_table("channels", InvidiousChannel)
+  Invidious::Database.check_table("channel_videos", ChannelVideo)
+  Invidious::Database.check_table("playlists", InvidiousPlaylist)
+  Invidious::Database.check_table("playlist_videos", PlaylistVideo)
+  Invidious::Database.check_table("nonces", Nonce)
+  Invidious::Database.check_table("session_ids", SessionId)
+  Invidious::Database.check_table("users", User)
+  Invidious::Database.check_table("videos", Video)
 
   if CONFIG.cache_annotations
-    Invidious::Database.check_table(PG_DB, "annotations", Annotation)
+    Invidious::Database.check_table("annotations", Annotation)
   end
 end
 

src/invidious/database/base.cr

@@ -3,26 +3,26 @@ require "pg"
 module Invidious::Database
   extend self
 
-  def check_enum(db, enum_name, struct_type = nil)
+  def check_enum(enum_name, struct_type = nil)
     return # TODO
 
-    if !db.query_one?("SELECT true FROM pg_type WHERE typname = $1", enum_name, as: Bool)
+    if !PG_DB.query_one?("SELECT true FROM pg_type WHERE typname = $1", enum_name, as: Bool)
       LOGGER.info("check_enum: CREATE TYPE #{enum_name}")
 
-      db.using_connection do |conn|
+      PG_DB.using_connection do |conn|
         conn.as(PG::Connection).exec_all(File.read("config/sql/#{enum_name}.sql"))
       end
     end
   end
 
-  def check_table(db, table_name, struct_type = nil)
+  def check_table(table_name, struct_type = nil)
     # Create table if it doesn't exist
     begin
-      db.exec("SELECT * FROM #{table_name} LIMIT 0")
+      PG_DB.exec("SELECT * FROM #{table_name} LIMIT 0")
     rescue ex
       LOGGER.info("check_table: check_table: CREATE TABLE #{table_name}")
 
-      db.using_connection do |conn|
+      PG_DB.using_connection do |conn|
         conn.as(PG::Connection).exec_all(File.read("config/sql/#{table_name}.sql"))
       end
     end
@@ -30,7 +30,7 @@ module Invidious::Database
     return if !struct_type
 
     struct_array = struct_type.type_array
-    column_array = get_column_array(db, table_name)
+    column_array = get_column_array(PG_DB, table_name)
     column_types = File.read("config/sql/#{table_name}.sql").match(/CREATE TABLE public\.#{table_name}\n\((?<types>[\d\D]*?)\);/)
       .try &.["types"].split(",").map(&.strip).reject &.starts_with?("CONSTRAINT")
 
@@ -41,14 +41,14 @@ module Invidious::Database
         if !column_array[i]?
           new_column = column_types.select(&.starts_with?(name))[0]
           LOGGER.info("check_table: ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
-          db.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
+          PG_DB.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
           next
         end
 
         # Column doesn't exist
         if !column_array.includes? name
           new_column = column_types.select(&.starts_with?(name))[0]
-          db.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
+          PG_DB.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
         end
 
         # Column exists but in the wrong position, rotate
@@ -59,29 +59,29 @@ module Invidious::Database
             # There's a column we didn't expect
             if !new_column
               LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]}")
-              db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
+              PG_DB.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
 
-              column_array = get_column_array(db, table_name)
+              column_array = get_column_array(PG_DB, table_name)
               next
             end
 
             LOGGER.info("check_table: ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
-            db.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
+            PG_DB.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
 
             LOGGER.info("check_table: UPDATE #{table_name} SET #{column_array[i]}_new=#{column_array[i]}")
-            db.exec("UPDATE #{table_name} SET #{column_array[i]}_new=#{column_array[i]}")
+            PG_DB.exec("UPDATE #{table_name} SET #{column_array[i]}_new=#{column_array[i]}")
 
             LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
-            db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
+            PG_DB.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
 
             LOGGER.info("check_table: ALTER TABLE #{table_name} RENAME COLUMN #{column_array[i]}_new TO #{column_array[i]}")
-            db.exec("ALTER TABLE #{table_name} RENAME COLUMN #{column_array[i]}_new TO #{column_array[i]}")
+            PG_DB.exec("ALTER TABLE #{table_name} RENAME COLUMN #{column_array[i]}_new TO #{column_array[i]}")
 
-            column_array = get_column_array(db, table_name)
+            column_array = get_column_array(PG_DB, table_name)
           end
         else
           LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
-          db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
+          PG_DB.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
         end
       end
     end
@@ -91,14 +91,14 @@ module Invidious::Database
     column_array.each do |column|
       if !struct_array.includes? column
         LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column} CASCADE")
-        db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column} CASCADE")
+        PG_DB.exec("ALTER TABLE #{table_name} DROP COLUMN #{column} CASCADE")
       end
     end
   end
 
   def get_column_array(db, table_name)
     column_array = [] of String
-    db.query("SELECT * FROM #{table_name} LIMIT 0") do |rs|
+    PG_DB.query("SELECT * FROM #{table_name} LIMIT 0") do |rs|
       rs.column_count.times do |i|
         column = rs.as(PG::ResultSet).field(i)
         column_array << column.name