Merge branch 'fix-insert' into 'master'

Moving queue_tmp to permanent table to fix the __queue_reorder crash

See merge request !113

.gitignore

@@ -22,3 +22,6 @@ cscope.files
 cscope.out
 tags
 !*.inc
+*.zst
+config.log
+autom4te.cache

PKGBUILD

 # Maintainer: Maël 'Kubat' MARTIN <mael.martin31@gmail.com>
 pkgname=lektor
-pkgver=mk7.1036.462cf03
+pkgver=mk7.1044.1d6ed7d
 pkgrel=1
 pkgdesc="The lektor kara player, from the Bakaclub"
 arch=(x86_64 i686)

src/database/disk.sql

@@ -77,6 +77,13 @@ CREATE TABLE IF NOT EXISTS queue
   , priority INTEGER NOT NULL DEFAULT 1 CHECK(priority > 0 AND priority < 6)
   );
 
+-- Temporary queue table used when reordering the queue (for inserts)
+CREATE TABLE IF NOT EXISTS queue_tmp
+   ( position INTEGER PRIMARY KEY AUTOINCREMENT CHECK(position > 0)
+   , kara_id INTEGER
+   , priority INTEGER NOT NULL DEFAULT 1 CHECK(priority > 0 AND priority < 6)
+   );
+
 
 -- The user table
 -- Used for the [password {passwd}] MPD command. The documentation can be found

src/database/queue.c

@@ -132,12 +132,6 @@ __queue_reorder(volatile sqlite3 *db)
     "(SELECT CASE WHEN (SELECT current FROM queue_state) IS NULL THEN 0"    \
     " ELSE (SELECT current FROM queue_state) END AS val LIMIT 1)"
     static const char *SQL_REORDER =
-        /* Create temporary tables */
-        "CREATE TEMPORARY TABLE queue_tmp IF NOT EXISTS"
-        " ( position INTEGER PRIMARY KEY AUTOINCREMENT CHECK(position > 0)"
-        " , kara_id INTEGER"
-        " , priority INTEGER NOT NULL DEFAULT 1 CHECK(priority > 0 AND priority < 6)"
-        " );"
         /* Separate karas that are after the current one */
         "INSERT INTO queue_tmp (kara_id, priority)"
         " SELECT kara_id, priority FROM queue WHERE position > " CURRENT_POS_OR_0