diff options
| -rw-r--r-- | rpki/left_right.py | 2 | ||||
| -rw-r--r-- | rpki/publication.py | 2 | ||||
| -rw-r--r-- | rpki/rpkid.py | 6 | ||||
| -rw-r--r-- | rpki/sql.py | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/rpki/left_right.py b/rpki/left_right.py index 2d46cdfa..5c1ae106 100644 --- a/rpki/left_right.py +++ b/rpki/left_right.py @@ -353,7 +353,7 @@ class self_elt(data_elt): """ Find a self object based on its self_handle. """ - return cls.sql_fetch_where1(gctx, "self_handle = %s", self_handle) + return cls.sql_fetch_where1(gctx, "self_handle = %s", (self_handle,)) def serve_fetch_all(self): """ diff --git a/rpki/publication.py b/rpki/publication.py index 2462ae39..0c3c5a10 100644 --- a/rpki/publication.py +++ b/rpki/publication.py @@ -170,7 +170,7 @@ class client_elt(control_elt): Find the client object on which a get, set, or destroy method should operate, or which would conflict with a create method. """ - return self.sql_fetch_where1(self.gctx, "client_handle = %s", self.client_handle) + return self.sql_fetch_where1(self.gctx, "client_handle = %s", (self.client_handle,)) def serve_fetch_all(self): """ diff --git a/rpki/rpkid.py b/rpki/rpkid.py index d6163bee..5546a02b 100644 --- a/rpki/rpkid.py +++ b/rpki/rpkid.py @@ -310,8 +310,10 @@ class main(object): if match is None: raise rpki.exceptions.BadContactURL, "Bad URL path received in up_down_handler(): %s" % path self_handle, child_handle = match.groups() - child = rpki.left_right.child_elt.sql_fetch_where1(self, "self.self_handle = %s AND child.child_handle = %s AND child.self_id = self.self_id", - (self_handle, child_handle), "self") + child = rpki.left_right.child_elt.sql_fetch_where1(self, + "self.self_handle = %s AND child.child_handle = %s AND child.self_id = self.self_id", + (self_handle, child_handle), + "self") if child is None: raise rpki.exceptions.ChildNotFound, "Could not find child %s of self %s in up_down_handler()" % (child_handle, self_handle) child.serve_up_down(query, done) diff --git a/rpki/sql.py b/rpki/sql.py index c753278c..65a3b85c 100644 --- a/rpki/sql.py +++ b/rpki/sql.py @@ -335,7 +335,7 @@ class sql_persistent(object): if self.sql_debug: rpki.log.debug("sql_delete(%r, %r)" % (self.sql_template.delete, id)) self.sql_delete_hook() - self.gctx.sql.execute(self.sql_template.delete, id) + self.gctx.sql.execute(self.sql_template.delete, (id,)) key = (self.__class__, id) if self.gctx.sql.cache.get(key) == self: del self.gctx.sql.cache[key] |