From 6a98631f2d28f6b2eb83fac45b3a23a7591d8e8b Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Wed, 30 Dec 2020 14:17:33 -0800
Subject: [PATCH] Add sql_executescript.

---
 etiquette/photodb.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/etiquette/photodb.py b/etiquette/photodb.py
index 24e87a0..6f15c09 100644
--- a/etiquette/photodb.py
+++ b/etiquette/photodb.py
@@ -2,6 +2,7 @@ import bcrypt
 import json
 import os
 import random
+import re
 import sqlite3
 import tempfile
 import time
@@ -1093,6 +1094,19 @@ class PDBSQLMixin:
         cur.execute(query, bindings)
         return cur
 
+    def sql_executescript(self, script):
+        '''
+        The problem with Python's default executescript is that it executes a
+        COMMIT before running your script. If I wanted a commit I'd write one!
+        '''
+        lines = re.split(r';(:?\n|$)', script)
+        lines = (line.strip() for line in lines)
+        lines = (line for line in lines if line)
+        cur = self.sql.cursor()
+        for line in lines:
+            self.log.loud(line)
+            cur.execute(line)
+
     def sql_insert(self, table, data):
         self.assert_table_exists(table)
         column_names = constants.SQL_COLUMNS[table]
@@ -1833,12 +1847,12 @@ class PhotoDB(
 
     def _first_time_setup(self):
         self.log.info('Running first-time database setup.')
-        self.sql.executescript(constants.DB_INIT)
+        self.sql_executescript(constants.DB_INIT)
         self.sql.commit()
 
     def _load_pragmas(self):
         self.log.debug('Reloading pragmas.')
-        self.sql.executescript(constants.DB_PRAGMAS)
+        self.sql_executescript(constants.DB_PRAGMAS)
         self.sql.commit()
 
     def __del__(self):