From 9d0791dab4b4df086374c5c0ba2a6558e10e81c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
Date: Mon, 16 Nov 2015 15:56:27 +0100
Subject: [PATCH 07/14] removes dependency to libslp-db-utils

Change-Id: I90471e77d20e04bae58cc42eb2639e4aef97fdec
---
 src/common/CMakeLists.txt         |  3 ++-
 src/dpl/db/src/sql_connection.cpp | 17 +----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 968c7c1..9ae376f 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -5,7 +5,8 @@ PKG_CHECK_MODULES(COMMON_DEP
     REQUIRED
     libsystemd
     libsmack
-    db-util
+    sqlite3
+    icu-i18n
     cynara-admin
     cynara-client
     )
diff --git a/src/dpl/db/src/sql_connection.cpp b/src/dpl/db/src/sql_connection.cpp
index fdb4fe4..f49a6dc 100644
--- a/src/dpl/db/src/sql_connection.cpp
+++ b/src/dpl/db/src/sql_connection.cpp
@@ -26,7 +26,6 @@
 #include <memory>
 #include <dpl/noncopyable.h>
 #include <dpl/assert.h>
-#include <db-util.h>
 #include <unistd.h>
 #include <cstdio>
 #include <cstdarg>
@@ -606,16 +605,7 @@ void SqlConnection::Connect(const std::string &address,
 
     // Connect to database
     int result;
-    if (type & Flag::UseLucene) {
-        result = db_util_open_with_options(
-                address.c_str(),
-                &m_connection,
-                flag,
-                NULL);
-
-        m_usingLucene = true;
-        LogPedantic("Lucene index enabled");
-    } else {
+    (void)type;
         result = sqlite3_open_v2(
                 address.c_str(),
                 &m_connection,
@@ -624,7 +614,6 @@ void SqlConnection::Connect(const std::string &address,
 
         m_usingLucene = false;
         LogPedantic("Lucene index disabled");
-    }
 
     if (result == SQLITE_OK) {
         LogPedantic("Connected to DB");
@@ -653,11 +642,7 @@ void SqlConnection::Disconnect()
 
     int result;
 
-    if (m_usingLucene) {
-        result = db_util_close(m_connection);
-    } else {
         result = sqlite3_close(m_connection);
-    }
 
     if (result != SQLITE_OK) {
         const char *error = sqlite3_errmsg(m_connection);
-- 
2.21.0