update ua_db.sql for db migration support

Change-Id: I7b7b5dfd85e196e6e71243955f9e38861d597d6a
Signed-off-by: Abhay Agarwal <ay.agarwal@samsung.com>

diff --git a/packaging/ua-manager.spec b/packaging/ua-manager.spec
index c73b42e..89cb12f 100644 (file)
--- a/packaging/ua-manager.spec
+++ b/packaging/ua-manager.spec
@@ -1,6 +1,6 @@
 Name:       ua-manager
 Summary:    User awareness manager
-Version:    0.9.5
+Version:    0.9.6
 Release:    1
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -67,7 +67,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 #database initialization
 mkdir -p %{buildroot}/opt/usr/dbspace
 sqlite3 %{buildroot}%{database_full_path} < %{buildroot}/usr/share/ua_db.sql
-rm %{buildroot}/usr/share/ua_db.sql
+#rm %{buildroot}/usr/share/ua_db.sql
 
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 cp ua-manager.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/ua-manager.conf
@@ -95,6 +95,7 @@ cp ua-manager.service %{buildroot}%{_unitdir}/ua-manager.service
 %attr(644,root,root) %{_unitdir}/ua-manager.service
 %config %attr(660, network_fw, network_fw) %{database_full_path}
 %config %attr(660, network_fw, network_fw) %{database_full_path}-journal
+%config %attr(660, network_fw, network_fw) /usr/share/ua_db.sql
 
 %files devel
 %defattr(-, root, root)
@@ -109,4 +110,3 @@ cp ua-manager.service %{buildroot}%{_unitdir}/ua-manager.service
 %{_includedir}/ua-manager/plugins/ua-power-plugin.h
 %{_includedir}/ua-manager/plugins/ua-cloud-plugin.h
 %{_libdir}/pkgconfig/ua-plugins.pc
-

diff --git a/ua-daemon/CMakeLists.txt b/ua-daemon/CMakeLists.txt
index 3498ddd..3874944 100644 (file)
--- a/ua-daemon/CMakeLists.txt
+++ b/ua-daemon/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(ua-manager C)
 
 SET(DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data)
 
-#Include Source files for bluetooth service common files only
+#Include Source files for ua-daemon common files only
 SET(SRCS
        src/ua-manager-main.c
        src/ua-manager-common.c

diff --git a/ua-daemon/data/ua_db.sql b/ua-daemon/data/ua_db.sql
index 70261cd..515883a 100644 (file)
--- a/ua-daemon/data/ua_db.sql
+++ b/ua-daemon/data/ua_db.sql
@@ -41,3 +41,10 @@ CREATE TABLE IF NOT EXISTS device_services (
   FOREIGN KEY(service_number) REFERENCES services(service_number),
   PRIMARY KEY(device_number, service_number)
 );
+
+CREATE TABLE IF NOT EXISTS ibeacon_adv (
+  ibeacon_id INTEGER,
+  ibeacon_adv TEXT,
+  adv_len INTEGER,
+  PRIMARY KEY(ibeacon_adv)
+);