Revert "Fix the problem that can't access the device-users table"

This reverts commit 798a02d0faca05dc6a7a5124c382471e43efd381.

Change-Id: I764120b8e4056b78bccc7484d117e8c60e65b74c
Signed-off-by: Lokesh <l.kasana@samsung.com>

diff --git a/ua-daemon/data/ua_db.sql b/ua-daemon/data/ua_db.sql
index 6bb27d5..033d79a 100644 (file)
--- a/ua-daemon/data/ua_db.sql
+++ b/ua-daemon/data/ua_db.sql
@@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS device_services (
   PRIMARY KEY(device_number, service_number)
 );
 
-CREATE TABLE IF NOT EXISTS device_users (
+CREATE TABLE IF NOT EXISTS device_user (
   device_number INTEGER,
   user_id INTEGER,
   FOREIGN KEY(device_number) REFERENCES devices(device_number),

diff --git a/ua-daemon/src/ua-manager-device-user-db.c b/ua-daemon/src/ua-manager-device-user-db.c
index b451811..66823d0 100644 (file)
--- a/ua-daemon/src/ua-manager-device-user-db.c
+++ b/ua-daemon/src/ua-manager-device-user-db.c
@@ -24,45 +24,45 @@
 #include "ua-manager-common.h"
 #include "ua-manager-database.h"
 
-#define DELETE_DEVICE_USER "DELETE FROM device_users " \
-       "WHERE device_number = ? AND user_id = ?"
+#define DELETE_DEVICE_USER "delete from device_user " \
+       "WHERE device_number = ? and user_id = ?"
 
-#define DELETE_ALL_DEVICE_USER "DELETE FROM device_users "
+#define DELETE_ALL_DEVICE_USER "delete from device_user "
 
-#define DELETE_FOR_USER "DELETE FROM device_users " \
+#define DELETE_FOR_USER "delete from device_user " \
        "WHERE user_id = ?"
 
-#define DELETE_FOR_DEVICE "DELETE FROM device_users " \
+#define DELETE_FOR_DEVICE "delete from device_user " \
        "WHERE device_number = ?"
 
 #define SELECT_USER_FOR_DEVICE "SELECT U.user_id, U.account, U.name " \
-       "FROM device_users as D JOIN userdata as U USING(user_id) " \
-       "WHERE D.device_number = ?"
+       "FROM device_user as D JOIN userdata as U USING(user_id) " \
+       "where D.device_number = ?"
 
 #define SELECT_COUNT_FOR_DEVICE "SELECT count(*) " \
-       "FROM device_users where device_number = ?"
+       "FROM device_user where device_number = ?"
 
 #define SELECT_DEVICE_USER "SELECT D.device_id, D.tech_type, U.account " \
-       "FROM device_users as P JOIN userdata as U USING(user_id) JOIN devices as D " \
+       "FROM device_user as P JOIN userdata as U USING(user_id) JOIN devices as D " \
        "USING(device_number)"
 
-#define INSERT_DEVICE_USER "INSERT INTO device_users " \
-       "(device_number, user_id) VALUES (?, ?)"
+#define INSERT_DEVICE_USER "insert into device_user " \
+       "(device_number, user_id) values (?, ?)"
 
 
 /* DELETE statements */
-static sqlite3_stmt *delete_device_users;
-static sqlite3_stmt *delete_all_device_users;
+static sqlite3_stmt *delete_device_user;
+static sqlite3_stmt *delete_all_device_user;
 static sqlite3_stmt *delete_for_user;
 static sqlite3_stmt *delete_for_device;
 
 /* SELECT statements */
 static sqlite3_stmt *select_user_for_device;
 static sqlite3_stmt *select_count_for_device;
-static sqlite3_stmt *select_device_users;
+static sqlite3_stmt *select_device_user;
 
 /* INSERT statements */
-static sqlite3_stmt *insert_device_users;
+static sqlite3_stmt *insert_device_user;
 
 extern sqlite3 *database_handle;
 
@@ -70,8 +70,8 @@ static void __uam_device_user_finalize_delete(void)
 {
        FUNC_ENTRY;
 
-       FINALIZE(delete_device_users);
-       FINALIZE(delete_all_device_users);
+       FINALIZE(delete_device_user);
+       FINALIZE(delete_all_device_user);
        FINALIZE(delete_for_user);
        FINALIZE(delete_for_device);
 
@@ -84,7 +84,7 @@ static void __uam_device_user_finalize_select(void)
 
        FINALIZE(select_user_for_device);
        FINALIZE(select_count_for_device);
-       FINALIZE(select_device_users);
+       FINALIZE(select_device_user);
 
        FUNC_EXIT;
 }
@@ -93,7 +93,7 @@ static void __uam_device_user_finalize_insert(void)
 {
        FUNC_ENTRY;
 
-       FINALIZE(insert_device_users);
+       FINALIZE(insert_device_user);
 
        FUNC_EXIT;
 }
@@ -109,9 +109,9 @@ static int __uam_device_user_prepare_delete(sqlite3 *db)
                return SQLITE_OK;
        }
 
-       PREPARE_QUERY(rc, db, delete_device_users,
+       PREPARE_QUERY(rc, db, delete_device_user,
                DELETE_DEVICE_USER, __uam_device_user_finalize_delete);
-       PREPARE_QUERY(rc, db, delete_all_device_users,
+       PREPARE_QUERY(rc, db, delete_all_device_user,
                DELETE_ALL_DEVICE_USER, __uam_device_user_finalize_delete);
        PREPARE_QUERY(rc, db, delete_for_user,
                DELETE_FOR_USER, __uam_device_user_finalize_delete);
@@ -138,7 +138,7 @@ static int __uam_device_user_prepare_select(sqlite3 *db)
                SELECT_USER_FOR_DEVICE, __uam_device_user_finalize_select);
        PREPARE_QUERY(rc, db, select_count_for_device,
                SELECT_COUNT_FOR_DEVICE, __uam_device_user_finalize_select);
-       PREPARE_QUERY(rc, db, select_device_users,
+       PREPARE_QUERY(rc, db, select_device_user,
                SELECT_DEVICE_USER, __uam_device_user_finalize_select);
 
        initialized = 1;
@@ -157,7 +157,7 @@ static int __uam_device_user_prepare_insert(sqlite3 *db)
                return SQLITE_OK;
        }
 
-       PREPARE_QUERY(rc, db, insert_device_users,
+       PREPARE_QUERY(rc, db, insert_device_user,
                INSERT_DEVICE_USER, __uam_device_user_finalize_insert);
 
        initialized = 1;
@@ -228,7 +228,7 @@ int _uam_db_insert_device_user(int device_number, int user_id)
 {
        FUNC_ENTRY;
        int error_code = UAM_ERROR_NONE;
-       sqlite3_stmt *stmt = insert_device_users;
+       sqlite3_stmt *stmt = insert_device_user;
        int sql_ret = SQLITE_OK;
 
        UAM_INFO("%d-%d", device_number, user_id);
@@ -289,7 +289,7 @@ int _uam_device_user_db_clear(void)
 {
        FUNC_ENTRY;
        int error_code = UAM_ERROR_NONE;
-       sqlite3_stmt *stmt = delete_all_device_users;
+       sqlite3_stmt *stmt = delete_all_device_user;
        int sql_ret = SQLITE_OK;
 
        sql_ret = sqlite3_step(stmt);
@@ -337,7 +337,7 @@ int _uam_db_delete_device_user_id(int device_number, int user_id)
 {
        FUNC_ENTRY;
        int error_code = UAM_ERROR_NONE;
-       sqlite3_stmt *stmt = delete_device_users;
+       sqlite3_stmt *stmt = delete_device_user;
        int sql_ret = SQLITE_OK;
 
        UAM_INFO("Device Number: %d user_id: %d", device_number, user_id);
@@ -585,7 +585,7 @@ handle_error:
 GSList *_uam_db_get_device_user_info()
 {
        FUNC_ENTRY;
-       sqlite3_stmt *stmt = select_device_users;
+       sqlite3_stmt *stmt = select_device_user;
        GSList *dev_user_list = NULL;
        db_dev_user_info_t *info = NULL;
        int sql_ret = SQLITE_OK;