From 1b74966ef14f35bbae6f5d99e1827ca063eb8d95 Mon Sep 17 00:00:00 2001
From: ejurgensen <espenjurgensen@gmail.com>
Date: Mon, 29 Jun 2020 22:17:44 +0200
Subject: [PATCH] [db] Remove HAVE_SPOTIFY_H conditionals, not required

The db functions don't depend on the Spotify library, so remove conditionals
---
 src/db.c | 4 +---
 src/db.h | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/db.c b/src/db.c
index 1244f84c..25ec6673 100644
--- a/src/db.c
+++ b/src/db.c
@@ -4319,7 +4319,6 @@ db_pairing_fetch_byguid(struct pairing_info *pi)
 #undef Q_TMPL
 }
 
-#ifdef HAVE_SPOTIFY_H
 /* Spotify */
 void
 db_spotify_purge(void)
@@ -4399,7 +4398,6 @@ db_spotify_files_delete(void)
     DPRINTF(E_DBG, L_DB, "Deleted %d rows\n", sqlite3_changes(hdl));
 #undef Q_TMPL
 }
-#endif
 
 /* Admin */
 int
@@ -4540,7 +4538,7 @@ db_admin_getint64(int64_t *int64val, const char *key)
 int
 db_admin_delete(const char *key)
 {
-#define Q_TMPL "DELETE FROM admin where key='%q';"
+#define Q_TMPL "DELETE FROM admin WHERE key='%q';"
   char *query;
 
   query = sqlite3_mprintf(Q_TMPL, key);
diff --git a/src/db.h b/src/db.h
index 76b0850f..22084fce 100644
--- a/src/db.h
+++ b/src/db.h
@@ -762,7 +762,6 @@ db_pairing_add(struct pairing_info *pi);
 int
 db_pairing_fetch_byguid(struct pairing_info *pi);
 
-#ifdef HAVE_SPOTIFY_H
 /* Spotify */
 void
 db_spotify_purge(void);
@@ -772,7 +771,6 @@ db_spotify_pl_delete(int id);
 
 void
 db_spotify_files_delete(void);
-#endif
 
 /* Admin */
 int