< c.execute("INSERT INTO register(owner,username,password) VALUES('%s','%s','%s')" % (jabberID, username, password))
---
> c.execute("INSERT INTO register(owner,username,password,salt) VALUES('%s','%s','%s','')" % (jabberID, username, password))
89a109,110
> c.execute("DELETE FROM settings USING settings, register WHERE settings.ownerID = register.id AND register.owner = '%s'" % jabberID)
> c.execute("DELETE FROM list_attributes USING list_attributes, register WHERE list_attributes.ownerID = register.id AND register.owner = '%s'" % jabberID)
91,93d111
< c.execute("DELETE FROM settings WHERE owner = '%s'" % jabberID)
< c.execute("DELETE FROM lists WHERE owner = '%s'" % jabberID)
< c.execute("DELETE FROM list_attributes WHERE owner = '%s'" % jabberID)
99c117
< c.execute("SELECT variable,value FROM settings WHERE owner = '%s'" % (jabberID))
---
> c.execute("SELECT settings.variable,settings.value FROM settings, register WHERE settings.ownerID = register.id AND register.owner = '%s'" % (jabberID))
113c131
< c.execute("SELECT value FROM settings WHERE owner = '%s' AND variable = '%s'" % (jabberID, variable))
---
> c.execute("SELECT settings.value FROM settings, register WHERE settings.ownerID = register.id AND register.owner = '%s' AND settings.variable = '%s'" % (jabberID, variable))
125,127c143,145
< c.execute("DELETE FROM settings WHERE owner = '%s' AND variable = '%s'" % (jabberID, variable))
< c.execute("INSERT INTO settings(owner,variable,value) VALUES('%s','%s','%s')" % (jabberID, variable, value))
<
---
> c.execute("DELETE FROM settings USING settings, register WHERE settings.ownerID = register.id AND register.owner = '%s' AND settings.variable = '%s'" % (jabberID, variable))
> c.execute("INSERT INTO settings(ownerID,variable,value) VALUES((SELECT id FROM register WHERE owner = '%s'),'%s','%s')" % (jabberID, variable, value))
>
134c152
< c.execute("SELECT attribute,value FROM list_attributes WHERE owner = '%s' AND type = '%s' AND jid = '%s'" % (jabberID, type, legacyID))
---
> c.execute("SELECT list_attributes.attribute, list_attributes.value FROM list_attributes, register WHERE list_attributes.ownerID = register.id AND register.owner = '%s' AND list_attributes.type = '%s' AND list_attributes.jid = '%s'" % (jabberID, type, legacyID))
148c166
< c.execute("SELECT type FROM lists WHERE owner = '%s'" % (jabberID))
---
> c.execute("SELECT list_attributes.type FROM list_attributes, register WHERE list_attributes.ownerID = register.id AND register.owner = '%s'" % (jabberID))
163c181
< c.execute("SELECT jid FROM lists WHERE owner = '%s' AND type = '%s'" % (jabberID, type))
---
> c.execute("SELECT list_attributes.jid FROM list_attributes, register WHERE list_attributes.ownerID = register.id AND register.owner = '%s' AND list_attributes.type = '%s'" % (jabberID, type))
172c190
< ic.execute("SELECT attribute,value FROM list_attributes WHERE owner = '%s' AND type = '%s' AND jid = '%s'" % (jabberID, type, jid))
---
> ic.execute("SELECT list_attributes.attribute, list_attributes.value FROM list_attributes, register WHERE list_attributes.ownerID = register.id AND register.owner = '%s' AND list_attributes.type = '%s' AND list_attributes.jid = '%s'" % (jabberID, type, jid))
187,189c205
< c.execute("DELETE FROM lists WHERE owner = '%s' AND type = '%s' AND jid = '%s'" % (jabberID, type, legacyID))
< c.execute("DELETE FROM list_attributes WHERE owner = '%s' AND type = '%s' AND jid = '%s'" % (jabberID, type, legacyID))
< c.execute("INSERT INTO lists(owner,type,jid) VALUES('%s','%s','%s')" % (jabberID, type, legacyID))
---
> c.execute("DELETE FROM list_attributes USING list_attributes, register WHERE list_attributes.ownerID = register.id AND register.owner = '%s' AND list_attributes.type = '%s' AND list_attributes.jid = '%s'" % (jabberID, type, legacyID))
> c.execute("INSERT INTO list_attributes(ownerID,type,jid,attribute,value) VALUES((SELECT id FROM register WHERE owner = '%s'),'%s','%s','%s','%s')" % (jabberID, type, legacyID, p, payload[p].replace("'", "\\'")))
198,199c214
< c.execute("DELETE FROM lists WHERE owner = '%s' AND type = '%s' AND jid = '%s'" % (jabberID, type, legacyID))
< c.execute("DELETE FROM list_attributes WHERE owner = '%s' AND type = '%s' AND jid = '%s'" % (jabberID, type, legacyID))
---
> c.execute("DELETE FROM list_attributes USING list_attributes, register WHERE list_attributes.ownerID = register.id AND register.owner = '%s' AND list_attributes.type = '%s' AND list_attributes.jid = '%s'" % (jabberID, type, legacyID))