From 698bddc0201c3db73cfb175a9df0586604fe243c Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Thu, 6 Jul 2017 19:07:22 +0900 Subject: [PATCH] Change pkg db version policy - change db policy to use static integer Change-Id: I84ac40030be56d75c953003a85303669a3b48e0f Signed-off-by: Junghyun Yeon --- packaging/pkgmgr-info.spec | 6 +----- parser/src/pkgmgr_parser_db.c | 5 +---- parser/src/pkgmgr_parser_db_queries.h | 2 ++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packaging/pkgmgr-info.spec b/packaging/pkgmgr-info.spec index c9bc014..b2e8fb4 100644 --- a/packaging/pkgmgr-info.spec +++ b/packaging/pkgmgr-info.spec @@ -49,11 +49,7 @@ cp %{SOURCE1001} . %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \ - -DTIZEN_MAJOR_VER=%{tizen_version_major} \ - -DTIZEN_MINOR_VER=%{tizen_version_minor} \ - -DTIZEN_PATCH_VER=%{tizen_version_patch} \ - -DUNITDIR=%{_unitdir} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DUNITDIR=%{_unitdir} %__make %{?jobs:-j%jobs} diff --git a/parser/src/pkgmgr_parser_db.c b/parser/src/pkgmgr_parser_db.c index 07eb050..5a079b9 100644 --- a/parser/src/pkgmgr_parser_db.c +++ b/parser/src/pkgmgr_parser_db.c @@ -191,11 +191,8 @@ static int __set_db_version(sqlite3 *db) static const char query_raw[] = "PRAGMA user_version="; char query[BUFSIZE]; int ret; - int version; - version = atoi(TIZEN_MAJOR_VER) * 10000 + atoi(TIZEN_MINOR_VER) * 100 + - atoi(TIZEN_PATCH_VER); - snprintf(query, sizeof(query), "%s%d", query_raw, version); + snprintf(query, sizeof(query), "%s%d", query_raw, PKG_DB_VERSION); ret = sqlite3_exec(db, query, NULL, NULL, NULL); if (ret != SQLITE_OK) { diff --git a/parser/src/pkgmgr_parser_db_queries.h b/parser/src/pkgmgr_parser_db_queries.h index 2190eb3..b0051a0 100644 --- a/parser/src/pkgmgr_parser_db_queries.h +++ b/parser/src/pkgmgr_parser_db_queries.h @@ -18,6 +18,8 @@ #ifndef __PKGMGR_PARSER_DB_QUERIES_H__ #define __PKGMGR_PARSER_DB_QUERIES_H__ +#define PKG_DB_VERSION 30001 + #define QUERY_CREATE_TABLE_PACKAGE_INFO \ "CREATE TABLE IF NOT EXISTS package_info (\n" \ " package TEXT PRIMARY KEY NOT NULL,\n" \ -- 2.7.4