Side by Side Diff: sitescripts/reports/utils.py
Issue 29952558:
#17868 - Use actual utf8 with mysql
Patch Set:
Created Nov. 27, 2018, 7:12 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« sitescripts/reports/schema.sql ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 # This file is part of the Adblock Plus web scripts, | 1 # This file is part of the Adblock Plus web scripts, |
| 2 # Copyright (C) 2006-present eyeo GmbH | 2 # Copyright (C) 2006-present eyeo GmbH |
| 3 # | 3 # |
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify |
| 5 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as |
| 6 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. |
| 7 # | 7 # |
| 8 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, |
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 271 dbpasswd = get_config().get('reports', 'dbpassword') | 271 dbpasswd = get_config().get('reports', 'dbpassword') |
| 272 if os.name == 'nt': | 272 if os.name == 'nt': |
| 273 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_un icode=True, charset='utf8', named_pipe=True) | 273 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_un icode=True, charset='utf8', named_pipe=True) |
| 274 else: | 274 else: |
| 275 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_un icode=True, charset='utf8') | 275 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_un icode=True, charset='utf8') |
| 276 | 276 |
| 277 | 277 |
| 278 def executeQuery(cursor, query, args=None): | 278 def executeQuery(cursor, query, args=None): |
| 279 tablePrefix = get_config().get('reports', 'dbprefix') | 279 tablePrefix = get_config().get('reports', 'dbprefix') |
| 280 query = re.sub(r'#PFX#', tablePrefix, query) | 280 query = re.sub(r'#PFX#', tablePrefix, query) |
| 281 cursor.execute('SET NAMES utf8mb4') | |
| 282 cursor.execute('SET CHARACTER SET utf8mb4') | |
| 283 cursor.execute('SET character_set_connection=utf8mb4') | |
| 281 cursor.execute(query, args) | 284 cursor.execute(query, args) |
| OLD | NEW |
« no previous file with comments
|
« sitescripts/reports/schema.sql ('k')
|
no next file »
|
no next file with comments »
