diff options
| author | Rob Austein <sra@hactrn.net> | 2007-12-22 17:10:57 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-12-22 17:10:57 +0000 |
| commit | 0d72c2b7b4f95049ba08c9b39e3d46b710008dab (patch) | |
| tree | 1c8ef1a673af146901f765819396987aa4fada0c /scripts/irdb.py | |
| parent | dd3bb389110e757506a0996fd72adc99fed133de (diff) | |
Whack SQL usage to let MySQLdb handle the quoting, per the Python DB API.
svn path=/scripts/irbe-setup.py; revision=1421
Diffstat (limited to 'scripts/irdb.py')
| -rwxr-xr-x | scripts/irdb.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/irdb.py b/scripts/irdb.py index 2ba02b40..3500594c 100755 --- a/scripts/irdb.py +++ b/scripts/irdb.py @@ -37,7 +37,7 @@ def handler(query, path): cur.execute("""SELECT registrant_id, subject_name, valid_until FROM registrant WHERE registrant.rpki_self_id = %s AND registrant.rpki_child_id = %s - """ % (q_pdu.self_id, q_pdu.child_id)) + """, (q_pdu.self_id, q_pdu.child_id)) if cur.rowcount != 1: raise rpki.exceptions.NotInDatabase, \ "This query should have produced a single exact match, something's messed up (rowcount = %d, self_id = %s, child_id = %s)" \ @@ -46,9 +46,9 @@ def handler(query, path): registrant_id, subject_name, valid_until = cur.fetchone() r_pdu.subject_name = subject_name r_pdu.valid_until = valid_until.strftime("%Y-%m-%dT%H:%M:%SZ") - r_pdu.as = rpki.resource_set.resource_set_as.from_sql(cur, "SELECT start_as, end_as FROM asn WHERE registrant_id = %s" % registrant_id) - r_pdu.ipv4 = rpki.resource_set.resource_set_ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM net WHERE registrant_id = %s AND version = 4" % registrant_id) - r_pdu.ipv6 = rpki.resource_set.resource_set_ipv6.from_sql(cur, "SELECT start_ip, end_ip FROM net WHERE registrant_id = %s AND version = 6" % registrant_id) + r_pdu.as = rpki.resource_set.resource_set_as.from_sql(cur, "SELECT start_as, end_as FROM asn WHERE registrant_id = %s", (registrant_id,)) + r_pdu.ipv4 = rpki.resource_set.resource_set_ipv4.from_sql(cur, "SELECT start_ip, end_ip FROM net WHERE registrant_id = %s AND version = 4", (registrant_id,)) + r_pdu.ipv6 = rpki.resource_set.resource_set_ipv6.from_sql(cur, "SELECT start_ip, end_ip FROM net WHERE registrant_id = %s AND version = 6", (registrant_id,)) except Exception, data: rpki.log.error(traceback.format_exc()) |