copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Backed out changeset f169c518cd8d

Browse source 
sqlite with ? doesn't work as expected
This commit is contained in:
Yann Leboulanger 2009-11-01 12:14:42 +01:00
parent b0712e1774
commit 21ffce890c
1 changed files with 41 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/common/logger.py
View file

@ -149,12 +149,9 @@ class Logger:
self.open_db() self.open_db()
self.get_jids_already_in_db() self.get_jids_already_in_db()
def simple_commit(self, sql_to_commit, values=None): def simple_commit(self, sql_to_commit):
'''helper to commit''' '''helper to commit'''
if values: self.cur.execute(sql_to_commit)
self.cur.execute(sql_to_commit, values)
else:
self.cur.execute(sql_to_commit)
try: try:
self.con.commit() self.con.commit()
except sqlite.OperationalError, e: except sqlite.OperationalError, e:
@ -386,19 +383,21 @@ class Logger:
def insert_unread_events(self, message_id, jid_id): def insert_unread_events(self, message_id, jid_id):
''' add unread message with id: message_id''' ''' add unread message with id: message_id'''
sql = 'INSERT INTO unread_messages VALUES (?, ?, 0)' sql = 'INSERT INTO unread_messages VALUES (%d, %d, 0)' % (message_id,
self.simple_commit(sql, values=(message_id, jid_id)) jid_id)
self.simple_commit(sql)
def set_read_messages(self, message_ids): def set_read_messages(self, message_ids):
''' mark all messages with ids in message_ids as read''' ''' mark all messages with ids in message_ids as read'''
ids = ','.join([str(i) for i in message_ids]) ids = ','.join([str(i) for i in message_ids])
sql = 'DELETE FROM unread_messages WHERE message_id IN (?)' sql = 'DELETE FROM unread_messages WHERE message_id IN (%s)' % ids
self.simple_commit(sql, values=(ids,)) self.simple_commit(sql)
def set_shown_unread_msgs(self, msg_id): def set_shown_unread_msgs(self, msg_id):
''' mark unread message as shown un GUI ''' ''' mark unread message as shown un GUI '''
sql = 'UPDATE unread_messages SET shown = 1 where message_id = ?' sql = 'UPDATE unread_messages SET shown = 1 where message_id = %s' % \
self.simple_commit(sql, values=(msg_id,)) msg_id
self.simple_commit(sql)
def reset_shown_unread_messages(self): def reset_shown_unread_messages(self):
''' Set shown field to False in unread_messages table ''' ''' Set shown field to False in unread_messages table '''
@ -424,8 +423,8 @@ class Logger:
SELECT logs.log_line_id, logs.message, logs.time, logs.subject, SELECT logs.log_line_id, logs.message, logs.time, logs.subject,
jids.jid jids.jid
FROM logs, jids FROM logs, jids
WHERE logs.log_line_id = ? AND logs.jid_id = jids.jid_id WHERE logs.log_line_id = %d AND logs.jid_id = jids.jid_id
''', (msg_id,) ''' % msg_id
) )
results = self.cur.fetchall() results = self.cur.fetchall()
if len(results) == 0: if len(results) == 0:
@ -537,9 +536,9 @@ class Logger:
try: try:
self.cur.execute(''' self.cur.execute('''
SELECT time, kind, message FROM logs SELECT time, kind, message FROM logs
WHERE (?) AND kind IN (?, ?, ?, ?, ?) AND time > ? WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d
ORDER BY time DESC LIMIT ? OFFSET ? ORDER BY time DESC LIMIT %d OFFSET %d
''', (where_sql, constants.KIND_SINGLE_MSG_RECV, ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV,
constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT, constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT,
constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR, constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR,
timed_out, restore_how_many_rows, pending_how_many) timed_out, restore_how_many_rows, pending_how_many)
@ -578,10 +577,10 @@ class Logger:
self.cur.execute(''' self.cur.execute('''
SELECT contact_name, time, kind, show, message, subject FROM logs SELECT contact_name, time, kind, show, message, subject FROM logs
WHERE (?) WHERE (%s)
AND time BETWEEN ? AND ? AND time BETWEEN %d AND %d
ORDER BY time ORDER BY time
''', (where_sql, start_of_day, last_second_of_day)) ''' % (where_sql, start_of_day, last_second_of_day))
results = self.cur.fetchall() results = self.cur.fetchall()
return results return results
@ -608,9 +607,9 @@ class Logger:
like_sql = '%' + query.replace("'", "''") + '%' like_sql = '%' + query.replace("'", "''") + '%'
self.cur.execute(''' self.cur.execute('''
SELECT contact_name, time, kind, show, message, subject FROM logs SELECT contact_name, time, kind, show, message, subject FROM logs
WHERE (?) AND message LIKE '?' WHERE (%s) AND message LIKE '%s'
ORDER BY time ORDER BY time
''', (where_sql, like_sql)) ''' % (where_sql, like_sql))
results = self.cur.fetchall() results = self.cur.fetchall()
return results return results
@ -636,11 +635,11 @@ class Logger:
# Now we have timestamps of time 0:00 of every day with logs # Now we have timestamps of time 0:00 of every day with logs
self.cur.execute(''' self.cur.execute('''
SELECT DISTINCT time/(86400)*86400 FROM logs SELECT DISTINCT time/(86400)*86400 FROM logs
WHERE (?) WHERE (%s)
AND time BETWEEN ? AND ? AND time BETWEEN %d AND %d
AND kind NOT IN (?, ?) AND kind NOT IN (%d, %d)
ORDER BY time ORDER BY time
''', (where_sql, start_of_month, last_second_of_month, ''' % (where_sql, start_of_month, last_second_of_month,
constants.KIND_STATUS, constants.KIND_GCSTATUS)) constants.KIND_STATUS, constants.KIND_GCSTATUS))
result = self.cur.fetchall() result = self.cur.fetchall()
@ -665,9 +664,9 @@ class Logger:
where_sql = 'jid_id = %s' % jid_id where_sql = 'jid_id = %s' % jid_id
self.cur.execute(''' self.cur.execute('''
SELECT MAX(time) FROM logs SELECT MAX(time) FROM logs
WHERE (?) WHERE (%s)
AND kind NOT IN (?, ?) AND kind NOT IN (%d, %d)
''', (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS)) ''' % (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS))
results = self.cur.fetchone() results = self.cur.fetchone()
if results is not None: if results is not None:
@ -687,8 +686,8 @@ class Logger:
where_sql = 'jid_id = %s' % jid_id where_sql = 'jid_id = %s' % jid_id
self.cur.execute(''' self.cur.execute('''
SELECT time FROM rooms_last_message_time SELECT time FROM rooms_last_message_time
WHERE (?) WHERE (%s)
''', (where_sql,)) ''' % (where_sql))
results = self.cur.fetchone() results = self.cur.fetchone()
if results is not None: if results is not None:
@ -702,8 +701,9 @@ class Logger:
we had logs for that room in rooms_last_message_time table''' we had logs for that room in rooms_last_message_time table'''
jid_id = self.get_jid_id(jid, 'ROOM') jid_id = self.get_jid_id(jid, 'ROOM')
# jid_id is unique in this table, create or update : # jid_id is unique in this table, create or update :
sql = 'REPLACE INTO rooms_last_message_time VALUES (?, ?)' sql = 'REPLACE INTO rooms_last_message_time VALUES (%d, %d)' % \
self.simple_commit(sql, (jid_id, time)) (jid_id, time)
self.simple_commit(sql)
def _build_contact_where(self, account, jid): def _build_contact_where(self, account, jid):
'''build the where clause for a jid, including metacontacts '''build the where clause for a jid, including metacontacts
@ -733,17 +733,18 @@ class Logger:
# unknown type # unknown type
return return
self.cur.execute( self.cur.execute(
'SELECT type from transports_cache WHERE transport = "?"', (jid,)) 'SELECT type from transports_cache WHERE transport = "%s"' % jid)
results = self.cur.fetchall() results = self.cur.fetchall()
if results: if results:
result = results[0][0] result = results[0][0]
if result == type_id: if result == type_id:
return return
sql = 'UPDATE transports_cache SET type = ? WHERE transport = "?"' sql = 'UPDATE transports_cache SET type = %d WHERE transport = "%s"' %\
self.simple_commit(sql, values=(type_id, jid)) (type_id, jid)
self.simple_commit(sql)
return return
sql = 'INSERT INTO transports_cache VALUES ("?", ?)' sql = 'INSERT INTO transports_cache VALUES ("%s", %d)' % (jid, type_id)
self.simple_commit(sql, values=(jid, type_id)) self.simple_commit(sql)
def get_transports_type(self): def get_transports_type(self):
'''return all the type of the transports in DB''' '''return all the type of the transports in DB'''
@ -814,9 +815,9 @@ class Logger:
# yield the row # yield the row
yield hash_method, hash_, identities, features yield hash_method, hash_, identities, features
for hash_method, hash_ in to_be_removed: for hash_method, hash_ in to_be_removed:
sql = '''DELETE FROM caps_cache WHERE hash_method = "?" AND sql = '''DELETE FROM caps_cache WHERE hash_method = "%s" AND
hash = "?"''' hash = "%s"''' % (hash_method, hash_)
self.simple_commit(sql, values=(hash_method, hash_)) self.simple_commit(sql)
def add_caps_entry(self, hash_method, hash_, identities, features): def add_caps_entry(self, hash_method, hash_, identities, features):
data = [] data = []