From 3b30d5b0ed9613634b39fae23ddd3001b875b8fe Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 26 Jan 2022 16:58:01 +0100
Subject: Fix support for MSSQL testing

---
 configure.ac   | 3 ++-
 sql/mssql.sql  | 2 +-
 vars.config.in | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b086a7b6e..ae85c0d4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,7 +146,7 @@ AC_ARG_ENABLE(mssql,
   yes) db_type=mssql; mssql=true ;;
   no)  db_type=generic; mssql=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-mssql) ;;
-esac],[db_type=generic])
+esac],[if test "x$mssql" = "x"; then db_type=generic; mysql=false; fi])
 
 AC_ARG_ENABLE(mysql,
 [AS_HELP_STRING([--enable-mysql],[enable MySQL support (default: no)])],
@@ -285,6 +285,7 @@ AC_SUBST(new_sql_schema)
 AC_SUBST(full_xml)
 AC_SUBST(db_type)
 AC_SUBST(odbc)
+AC_SUBST(mssql)
 AC_SUBST(mysql)
 AC_SUBST(pgsql)
 AC_SUBST(sqlite)
diff --git a/sql/mssql.sql b/sql/mssql.sql
index f8b65edc4..dfd9da2f1 100644
--- a/sql/mssql.sql
+++ b/sql/mssql.sql
@@ -546,7 +546,7 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
 CREATE UNIQUE INDEX [i_push_ut] ON [push_session] (username, timestamp)
 WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);
 
-CREATE TABLE [dbo].[mqtt_pub](
+CREATE TABLE [dbo].[mqtt_pub] (
 	[username] [varchar](191) NOT NULL,
 	[server_host] [varchar](191) NOT NULL,
 	[resource] [varchar](191) NOT NULL,
diff --git a/vars.config.in b/vars.config.in
index 04024fd73..a243d2c8e 100644
--- a/vars.config.in
+++ b/vars.config.in
@@ -30,6 +30,7 @@
 
 %% Dependencies
 {odbc, @odbc@}.
+{mssql, @mssql@}.
 {mysql, @mysql@}.
 {pgsql, @pgsql@}.
 {sqlite, @sqlite@}.
-- 
cgit v1.2.3