From 641821f6f1a6a86ac39fbc2ed61a5304b2801366 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 15 Jan 2024 22:56:06 +0000
Subject: [PATCH] databases??

---
 ext/mime/main.php    | 8 +++++---
 ext/upgrade/main.php | 8 +++++---
 ext/upload/test.php  | 5 +++--
 tests/bootstrap.php  | 1 -
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ext/mime/main.php b/ext/mime/main.php
index 32afb536..88ba8674 100644
--- a/ext/mime/main.php
+++ b/ext/mime/main.php
@@ -30,9 +30,11 @@ class MimeSystem extends Extension
         // adjustment needs to be made to the mime types.
 
         if ($this->get_version(self::VERSION) < 1) {
-            // Each of these commands could hit a lot of data, combining
-            // them into one big transaction would not be a good idea.
-            $database->commit();
+            if ($database->is_transaction_open()) {
+                // Each of these commands could hit a lot of data, combining
+                // them into one big transaction would not be a good idea.
+                $database->commit();
+            }
             $database->set_timeout(null); // These updates can take a little bit
 
             $extensions = $database->get_col_iterable("SELECT DISTINCT ext FROM images");
diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php
index 639f0cc0..9d7cd8cd 100644
--- a/ext/upgrade/main.php
+++ b/ext/upgrade/main.php
@@ -193,9 +193,11 @@ class Upgrade extends Extension
 
         if ($this->get_version("db_version") < 21) {
             log_info("upgrade", "Setting predictable media values for known file types");
-            // Each of these commands could hit a lot of data, combining
-            // them into one big transaction would not be a good idea.
-            $database->commit();
+            if ($database->is_transaction_open()) {
+                // Each of these commands could hit a lot of data, combining
+                // them into one big transaction would not be a good idea.
+                $database->commit();
+            }
             $database->execute("UPDATE images SET lossless = :t, video = :t WHERE ext IN ('swf')", ["t" => true]);
             $database->execute("UPDATE images SET lossless = :f, video = :f, audio = :t WHERE ext IN ('mp3')", ["t" => true, "f" => false]);
             $database->execute("UPDATE images SET lossless = :f, video = :f, audio = :f WHERE ext IN ('jpg','jpeg')", ["f" => false]);
diff --git a/ext/upload/test.php b/ext/upload/test.php
index bdfb650b..68ed599d 100644
--- a/ext/upload/test.php
+++ b/ext/upload/test.php
@@ -45,9 +45,10 @@ class UploadTest extends ShimmiePHPUnitTestCase
         ];
         $page = $this->post_page("upload", ["tags0" => "foo bar"]);
         $this->assert_response(302);
-        $this->assertStringStartsWith("/test/post/list/id%3D4%2C3%2C2%2C1/1", $page->redirect);
-
         $this->assertEquals(4, $database->get_one("SELECT COUNT(*) FROM images"));
+        // FIXME: image IDs get allocated even when transactions are rolled back,
+        // so these IDs are not necessarily correct
+        // $this->assertStringStartsWith("/test/post/list/id%3D4%2C3%2C2%2C1/1", $page->redirect);
     }
 
     public function testUpload(): void
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 098a8839..b22ad8ac 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -42,4 +42,3 @@ $userPage->onUserCreation(new UserCreationEvent("demo", "demo", "demo", "demo@de
 $userPage->onUserCreation(new UserCreationEvent("test", "test", "test", "test@test.com", false));
 $database->commit();
 $_tracer->end();
-