1 From 1e2f8f58d4320afa1d83a6f94822e53346108ee8 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
3 Date: Mon, 16 Nov 2015 15:56:27 +0100
4 Subject: [PATCH] removes dependency to libslp-db-utils
6 Change-Id: I90471e77d20e04bae58cc42eb2639e4aef97fdec
8 src/common/CMakeLists.txt | 1 ++-
9 src/dpl/db/src/sql_connection.cpp | 17 +----------------
10 2 files changed, 3 additions(+), 17 deletions(-)
12 diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
13 index 968c7c1..d1fe644 100644
14 --- a/src/common/CMakeLists.txt
15 +++ b/src/common/CMakeLists.txt
16 @@ -5,7 +5,8 @@ PKG_CHECK_MODULES(COMMON_DEP
26 diff --git a/src/dpl/db/src/sql_connection.cpp b/src/dpl/db/src/sql_connection.cpp
27 index fdb4fe4..1fb97be 100644
28 --- a/src/dpl/db/src/sql_connection.cpp
29 +++ b/src/dpl/db/src/sql_connection.cpp
32 #include <dpl/noncopyable.h>
33 #include <dpl/assert.h>
38 @@ -606,16 +605,7 @@ void SqlConnection::Connect(const std::string &address,
40 // Connect to database
42 - if (type & Flag::UseLucene) {
43 - result = db_util_open_with_options(
49 - m_usingLucene = true;
50 - LogPedantic("Lucene index enabled");
53 result = sqlite3_open_v2(
56 @@ -624,7 +614,6 @@ void SqlConnection::Connect(const std::string &address,
58 m_usingLucene = false;
59 LogPedantic("Lucene index disabled");
62 if (result == SQLITE_OK) {
63 LogPedantic("Connected to DB");
64 @@ -653,11 +642,7 @@ void SqlConnection::Disconnect()
68 - if (m_usingLucene) {
69 - result = db_util_close(m_connection);
71 result = sqlite3_close(m_connection);
74 if (result != SQLITE_OK) {
75 const char *error = sqlite3_errmsg(m_connection);