Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add column order in SqlTable._insert_query
_insert_query gets called with a query and dict of values such as:

  {'val': 1, 'lucky': False, 'name': 'one'}

Via bindValues(), we only assign a placeholder in the query string to a value,
so we get a query with bindings like:

  INSERT INTO Foo values(:lucky,:val,:name)
  {':name': 'one', ':val': 1, ':lucky': False}

So what we're executing is something like:

  INSERT INTO Foo values(false,1,"one")

However, if the column order in the database doesn't happen to be the order
we're passing the values in, we get the wrong values in the wrong columns.

Instead, we now do:

  INSERT INTO Foo (lucky, val, name) values(false,1,"one")

Which inserts the values in the order we intended.

With Python 3.6, this just happened to work before because we always passed the
keyword arguments in the table column order, and in 3.6 dicts
(and thus **kwargs) happen to be ordered:
https://mail.python.org/pipermail/python-dev/2016-September/146327.html
  • Loading branch information
The-Compiler committed Jun 20, 2017
1 parent 4296a61 commit 29ce1b3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion qutebrowser/misc/sql.py
Expand Up @@ -187,7 +187,8 @@ def delete(self, value, field):
def _insert_query(self, values, replace):
params = ','.join(':{}'.format(key) for key in values)
verb = "REPLACE" if replace else "INSERT"
return Query("{} INTO {} values({})".format(verb, self._name, params))
return Query("{} INTO {} ({}) values({})".format(
verb, self._name, ','.join(values), params))

def insert(self, values, replace=False):
"""Append a row to the table.
Expand Down

0 comments on commit 29ce1b3

Please sign in to comment.