| OLD | NEW | 
| (Empty) |  | 
 |   1 # coding: utf-8 | 
 |   2  | 
 |   3 # This file is part of the Adblock Plus web scripts, | 
 |   4 # Copyright (C) 2006-2015 Eyeo GmbH | 
 |   5 # | 
 |   6 # Adblock Plus is free software: you can redistribute it and/or modify | 
 |   7 # it under the terms of the GNU General Public License version 3 as | 
 |   8 # published by the Free Software Foundation. | 
 |   9 # | 
 |  10 # Adblock Plus is distributed in the hope that it will be useful, | 
 |  11 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
 |  12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
 |  13 # GNU General Public License for more details. | 
 |  14 # | 
 |  15 # You should have received a copy of the GNU General Public License | 
 |  16 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 
 |  17  | 
 |  18 import itertools | 
 |  19 import MySQLdb | 
 |  20  | 
 |  21 from sitescripts.utils import get_config | 
 |  22  | 
 |  23 def connect(): | 
 |  24   config = get_config() | 
 |  25   return MySQLdb.connect( | 
 |  26     user=config.get("filterhitstats", "dbuser"), | 
 |  27     passwd=config.get("filterhitstats", "dbpassword"), | 
 |  28     db=config.get("filterhitstats", "database"), | 
 |  29     use_unicode=True, charset="utf8" | 
 |  30   ) | 
 |  31  | 
 |  32 def query(db, sql, *params, **kwargs): | 
 |  33   """ | 
 |  34   Executes the query given by the provided SQL and returns the results. | 
 |  35   If dict_result keyword argument is provided + True the results will be | 
 |  36   returned as a tuple of dictionaries, otherwise a tuple of tuples. | 
 |  37   """ | 
 |  38   if kwargs.pop('dict_result', False): | 
 |  39     cursor = db.cursor(MySQLdb.cursors.DictCursor) | 
 |  40   else: | 
 |  41     cursor = db.cursor() | 
 |  42   try: | 
 |  43     cursor.execute(sql, params) | 
 |  44     db.commit() | 
 |  45     return cursor.fetchall() | 
 |  46   finally: | 
 |  47     cursor.close() | 
 |  48  | 
 |  49 def write(db, queries): | 
 |  50   """ | 
 |  51   This writes a given iteratable object of tuples containing SQL | 
 |  52   strings and any required parameters to the database. All queries will | 
 |  53   be run as one transaction and rolled back on error. | 
 |  54   """ | 
 |  55   try: | 
 |  56     cursor = db.cursor() | 
 |  57     try: | 
 |  58       for query in queries: | 
 |  59         sql, params = query[0], query[1:] | 
 |  60         cursor.execute(sql, params) | 
 |  61       db.commit() | 
 |  62     finally: | 
 |  63       cursor.close() | 
 |  64   except MySQLdb.Error: | 
 |  65     db.rollback() | 
 |  66     raise | 
| OLD | NEW |