david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add "name" column to ordered select

Browse Source 
to make tests pass with different version of sqlobject, "name" column needs to be added to ordered select queries

darcs-hash:20070727212802-86b55-a709af3dd1eff5304970db38d3837852c2fa9040.gz
This commit is contained in:
David Rousselie
2007-07-27 23:28:02 +02:00
parent 70e01783fd
commit 5eb9cb24e2
3 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/jcl/jabber/component.py
View File

@@ -817,7 +817,7 @@ class AccountManager(object):
# "user_jid" column with Account subclasses # "user_jid" column with Account subclasses
for _account in \ for _account in \
Account.select(clauseTables=["account"], Account.select(clauseTables=["account"],
orderBy="user_jid"): orderBy=["user_jid", "name"]):
if current_user_jid != _account.user_jid: if current_user_jid != _account.user_jid:
current_user_jid = _account.user_jid current_user_jid = _account.user_jid
result.extend(self.send_presence(self.component.jid, result.extend(self.send_presence(self.component.jid,

2
src/jcl/jabber/feeder.py
View File

@@ -139,7 +139,7 @@ class FeederHandler(Handler):
return all accounts. return all accounts.
""" """
accounts = Account.select(clauseTables=["account"], accounts = Account.select(clauseTables=["account"],
orderBy="user_jid") orderBy=["user_jid", "name"])
return accounts return accounts
def handle(self, stanza, lang_class, data): def handle(self, stanza, lang_class, data):

72
src/jcl/jabber/tests/feeder.py
View File

@@ -113,22 +113,22 @@ class FeederComponent_TestCase(JCLComponent_TestCase):
class AccountFeeder(Feeder): class AccountFeeder(Feeder):
def feed(self, _account): def feed(self, _account):
return [("Simple Message for account " + _account.name, return [("Simple Message for account " + _account.name,
"user_jid: " + _account.user_jid), \ "user_jid: " + _account.user_jid),
("Simple Message for account " + _account.name, \ ("Simple Message for account " + _account.name,
"jid: " + _account.jid)] "jid: " + _account.jid)]
self.comp.stream = MockStream() self.comp.stream = MockStream()
self.comp.stream_class = MockStream self.comp.stream_class = MockStream
model.db_connect() model.db_connect()
account11 = Account(user_jid = "user1@test.com", \ account11 = Account(user_jid="user1@test.com",
name = "account11", \ name="account11",
jid = "account11@jcl.test.com") jid="account11@jcl.test.com")
account12 = Account(user_jid = "user1@test.com", \ account12 = Account(user_jid="user1@test.com",
name = "account12", \ name="account12",
jid = "account12@jcl.test.com") jid="account12@jcl.test.com")
account2 = Account(user_jid = "user2@test.com", \ account2 = Account(user_jid="user2@test.com",
name = "account2", \ name="account2",
jid = "account2@jcl.test.com") jid="account2@jcl.test.com")
self.comp.handler.feeder = AccountFeeder(self.comp) self.comp.handler.feeder = AccountFeeder(self.comp)
self.comp.handler.sender = MessageSender(self.comp) self.comp.handler.sender = MessageSender(self.comp)
self.comp.handle_tick() self.comp.handle_tick()
@@ -137,42 +137,42 @@ class FeederComponent_TestCase(JCLComponent_TestCase):
self.assertEquals(len(messages_sent), 6) self.assertEquals(len(messages_sent), 6)
self.assertEqual(messages_sent[0].get_from(), "account11@jcl.test.com") self.assertEqual(messages_sent[0].get_from(), "account11@jcl.test.com")
self.assertEqual(messages_sent[0].get_to(), "user1@test.com") self.assertEqual(messages_sent[0].get_to(), "user1@test.com")
self.assertEqual(messages_sent[0].get_subject(), \ self.assertEqual(messages_sent[0].get_subject(),
"Simple Message for account account11") "Simple Message for account account11")
self.assertEqual(messages_sent[0].get_body(), \ self.assertEqual(messages_sent[0].get_body(),
"user_jid: user1@test.com") "user_jid: user1@test.com")
self.assertEqual(messages_sent[1].get_from(), "account11@jcl.test.com") self.assertEqual(messages_sent[1].get_from(), "account11@jcl.test.com")
self.assertEqual(messages_sent[1].get_to(), "user1@test.com") self.assertEqual(messages_sent[1].get_to(), "user1@test.com")
self.assertEqual(messages_sent[1].get_subject(), \ self.assertEqual(messages_sent[1].get_subject(),
"Simple Message for account account11") "Simple Message for account account11")
self.assertEqual(messages_sent[1].get_body(), \ self.assertEqual(messages_sent[1].get_body(),
"jid: account11@jcl.test.com") "jid: account11@jcl.test.com")
self.assertEqual(messages_sent[2].get_from(), "account12@jcl.test.com") self.assertEqual(messages_sent[2].get_from(), "account12@jcl.test.com")
self.assertEqual(messages_sent[2].get_to(), "user1@test.com") self.assertEqual(messages_sent[2].get_to(), "user1@test.com")
self.assertEqual(messages_sent[2].get_subject(), \ self.assertEqual(messages_sent[2].get_subject(),
"Simple Message for account account12") "Simple Message for account account12")
self.assertEqual(messages_sent[2].get_body(), \ self.assertEqual(messages_sent[2].get_body(),
"user_jid: user1@test.com") "user_jid: user1@test.com")
self.assertEqual(messages_sent[3].get_from(), "account12@jcl.test.com") self.assertEqual(messages_sent[3].get_from(), "account12@jcl.test.com")
self.assertEqual(messages_sent[3].get_to(), "user1@test.com") self.assertEqual(messages_sent[3].get_to(), "user1@test.com")
self.assertEqual(messages_sent[3].get_subject(), \ self.assertEqual(messages_sent[3].get_subject(),
"Simple Message for account account12") "Simple Message for account account12")
self.assertEqual(messages_sent[3].get_body(), \ self.assertEqual(messages_sent[3].get_body(),
"jid: account12@jcl.test.com") "jid: account12@jcl.test.com")
self.assertEqual(messages_sent[4].get_from(), "account2@jcl.test.com") self.assertEqual(messages_sent[4].get_from(), "account2@jcl.test.com")
self.assertEqual(messages_sent[4].get_to(), "user2@test.com") self.assertEqual(messages_sent[4].get_to(), "user2@test.com")
self.assertEqual(messages_sent[4].get_subject(), \ self.assertEqual(messages_sent[4].get_subject(),
"Simple Message for account account2") "Simple Message for account account2")
self.assertEqual(messages_sent[4].get_body(), \ self.assertEqual(messages_sent[4].get_body(),
"user_jid: user2@test.com") "user_jid: user2@test.com")
self.assertEqual(messages_sent[5].get_from(), "account2@jcl.test.com") self.assertEqual(messages_sent[5].get_from(), "account2@jcl.test.com")
self.assertEqual(messages_sent[5].get_to(), "user2@test.com") self.assertEqual(messages_sent[5].get_to(), "user2@test.com")
self.assertEqual(messages_sent[5].get_subject(), \ self.assertEqual(messages_sent[5].get_subject(),
"Simple Message for account account2") "Simple Message for account account2")
self.assertEqual(messages_sent[5].get_body(), \ self.assertEqual(messages_sent[5].get_body(),
"jid: account2@jcl.test.com") "jid: account2@jcl.test.com")
class Feeder_TestCase(unittest.TestCase): class Feeder_TestCase(unittest.TestCase):
def test_feed_exist(self): def test_feed_exist(self):