1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From 1e2f8f58d4320afa1d83a6f94822e53346108ee8 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] removes dependency to libslp-db-utils
Change-Id: I90471e77d20e04bae58cc42eb2639e4aef97fdec
---
src/common/CMakeLists.txt | 1 ++-
src/dpl/db/src/sql_connection.cpp | 17 +----------------
2 files changed, 3 additions(+), 17 deletions(-)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 968c7c1..d1fe644 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..1fb97be 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.1.4
|
