From 44a1342c1ea1075b617e5d2e3b4b3ab6fc46c862 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 18 Jun 2015 10:39:09 +0200 Subject: [PATCH] MT#12937 order by id when selecting user preferences Change-Id: Id754cee5e208f570bd0f8f93ca485c6a6751b47d (cherry picked from commit c1c423688e464419132c53708d43368b78997dcf) --- ngcp/up.lua | 3 ++- tests/ngcp.lua | 10 +++++----- tests/ngcp_up.lua | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ngcp/up.lua b/ngcp/up.lua index 8d19ad6..2778513 100644 --- a/ngcp/up.lua +++ b/ngcp/up.lua @@ -74,7 +74,8 @@ NGCPUserPrefs_MT.__tostring = function () function NGCPUserPrefs:_load(level, uuid) local con = assert (self.config:getDBConnection()) - local query = "SELECT * FROM " .. self.db_table .. " WHERE uuid ='" .. uuid .. "'" + local query = "SELECT * FROM " .. self.db_table .. " WHERE uuid ='" .. + uuid .. "' ORDER BY id" local cur = assert (con:execute(query)) local defaults local keys diff --git a/tests/ngcp.lua b/tests/ngcp.lua index 5a8a41b..ffe1300 100644 --- a/tests/ngcp.lua +++ b/tests/ngcp.lua @@ -152,7 +152,7 @@ TestNGCP = {} --class self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() -- - self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) + self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c' ORDER BY id") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) @@ -220,7 +220,7 @@ TestNGCP = {} --class self.cur:numrows() ;mc :returns(1) self.cur:close() -- - self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) + self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c' ORDER BY id") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) @@ -271,7 +271,7 @@ TestNGCP = {} --class self.cur:numrows() ;mc :returns(1) self.cur:close() -- - self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) + self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c' ORDER BY id") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) @@ -316,7 +316,7 @@ TestNGCP = {} --class self.cur:numrows() ;mc :returns(1) self.cur:close() -- - self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) + self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c' ORDER BY id") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) @@ -362,7 +362,7 @@ TestNGCP = {} --class self.cur:numrows() ;mc :returns(1) self.cur:close() -- - self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ah736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) + self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ah736f72-21d1-4ea6-a3ea-4d7f56b3887c' ORDER BY id") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ah736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(nil) self.cur:close() diff --git a/tests/ngcp_up.lua b/tests/ngcp_up.lua index 6dcaff6..8f956ba 100644 --- a/tests/ngcp_up.lua +++ b/tests/ngcp_up.lua @@ -117,7 +117,7 @@ TestNGCPUserPrefs = {} --class function TestNGCPUserPrefs:test_caller_load() assertTrue(self.d.config) - con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) + con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c' ORDER BY id") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) @@ -139,7 +139,7 @@ TestNGCPUserPrefs = {} --class function TestNGCPUserPrefs:test_callee_load() assertTrue(self.d.config) - con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur) + con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c' ORDER BY id") ;mc :returns(self.cur) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c")) self.cur:fetch(mc.ANYARGS) ;mc :returns(up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))