wiki/jogobot-red
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Merge branch 'fs#79-mysql-table-prefix' into fs#70-refactoring

Browse Source
This commit is contained in:
Jonathan Golder
2016-08-25 13:15:23 +02:00
parent cac04f344f 71b99b5f58
commit 510771509b
1 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/mysqlred.py
View File

@@ -33,6 +33,7 @@ except ImportError:
import atexit import atexit
import pywikibot
from pywikibot import config from pywikibot import config
import jogobot import jogobot
@@ -53,6 +54,7 @@ class MysqlRed:
db_username = config.db_username db_username = config.db_username
db_password = config.db_password db_password = config.db_password
db_name = config.db_username + jogobot.config['db_suffix'] db_name = config.db_username + jogobot.config['db_suffix']
db_table_prefix = False
# Class variables for storing cached querys # Class variables for storing cached querys
_cached_update_data = [] _cached_update_data = []
@@ -67,6 +69,14 @@ class MysqlRed:
@returns mysql-stream MySQL Connection @returns mysql-stream MySQL Connection
""" """
# Needs to be generated after Parsing of Args (not at import time)
if not type(self).db_table_prefix:
type(self).db_table_prefix = \
pywikibot.Site().family.dbName(pywikibot.Site().code)
# Now we can setup prepared queries
self._prepare_queries()
# Connect to mysqldb only once # Connect to mysqldb only once
if not type( self ).connection: if not type( self ).connection:
@@ -87,6 +97,15 @@ class MysqlRed:
type( self ).connection.close() type( self ).connection.close()
def _prepare_queries( self ):
"""
Used to replace placeholders in prepared queries
"""
type(self)._update_query = type(self)._update_query.format(
prefix=type(self).db_table_prefix)
type(self)._insert_query = type(self)._insert_query.format(
prefix=type(self).db_table_prefix)
@classmethod @classmethod
def flush( cls ): def flush( cls ):
""" """
@@ -135,12 +154,13 @@ class MysqlRedPage( MysqlRed ):
""" """
# Class variables for storing cached querys # Class variables for storing cached querys
# '{prefix}' will be replaced during super().__init__()
_cached_update_data = [] _cached_update_data = []
_update_query = 'UPDATE `red_pages` \ _update_query = 'UPDATE `{prefix}_red_pages` \
SET `page_title` = ?, `rev_id` = ?, `status`= ? WHERE `page_id` = ?;' SET `page_title` = ?, `rev_id` = ?, `status`= ? WHERE `page_id` = ?;'
_cached_insert_data = {} _cached_insert_data = {}
_insert_query = 'INSERT INTO `red_pages` \ _insert_query = 'INSERT INTO `{prefix}_red_pages` \
( page_id, page_title, rev_id, status ) VALUES ( ?, ?, ?, ? );' ( page_id, page_title, rev_id, status ) VALUES ( ?, ?, ?, ? );'
def __init__( self, page_id ): def __init__( self, page_id ):
@@ -169,8 +189,10 @@ SET `page_title` = ?, `rev_id` = ?, `status`= ? WHERE `page_id` = ?;'
cursor = type( self ).connection.cursor(mysqldb.DictCursor) cursor = type( self ).connection.cursor(mysqldb.DictCursor)
cursor.execute( 'SELECT * FROM `red_pages` WHERE `page_id` = ?;', cursor.execute(
( self.__page_id, ) ) 'SELECT * FROM `{prefix}_red_pages` WHERE `page_id` = ?;'.format(
prefix=type(self).db_table_prefix), ( self.__page_id, ) )
res = cursor.fetchone() res = cursor.fetchone()
if res: if res:
@@ -221,12 +243,11 @@ class MysqlRedFam( MysqlRed ):
# Class variables for storing cached querys # Class variables for storing cached querys
_cached_update_data = [] _cached_update_data = []
_update_query = 'UPDATE `red_families` \ _update_query = 'UPDATE `{prefix}_red_families` \
SET `red_page_id` = ?, `heading` = ?, `beginning` = ?, `ending` = ?, \ SET `red_page_id` = ?, `heading` = ?, `beginning` = ?, `ending` = ?, \
`status`= ? WHERE `fam_hash` = ?;' `status`= ? WHERE `fam_hash` = ?;'
_cached_insert_data = {} _cached_insert_data = {}
_insert_query = 'INSERT INTO `red_families` \ _insert_query = 'INSERT INTO `{prefix}_red_families` \
( fam_hash, red_page_id, beginning, ending, status, heading, \ ( fam_hash, red_page_id, beginning, ending, status, heading, \
article0, article1, article2, article3, article4, article5, article6, \ article0, article1, article2, article3, article4, article5, article6, \
article7 ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? );' article7 ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? );'
@@ -252,8 +273,10 @@ article7 ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? );'
cursor = type( self ).connection.cursor( mysqldb.DictCursor ) cursor = type( self ).connection.cursor( mysqldb.DictCursor )
cursor.execute( 'SELECT * FROM `red_families` WHERE `fam_hash` = ?;', cursor.execute(
( fam_hash, ) ) 'SELECT * FROM `{prefix}_red_families` WHERE `fam_hash` = ?;'.
format( prefix=type(self).db_table_prefix), ( fam_hash, ) )
self.data = cursor.fetchone() self.data = cursor.fetchone()
def add_fam( self, articlesList, heading, red_page_id, def add_fam( self, articlesList, heading, red_page_id,
@@ -301,8 +324,9 @@ article7 ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? );'
cursor = type( self ).connection.cursor( mysqldb.DictCursor ) cursor = type( self ).connection.cursor( mysqldb.DictCursor )
cursor.execute( 'SELECT * FROM `red_families` WHERE `status` = ?;', cursor.execute(
( status, ) ) 'SELECT * FROM `{prefix}_red_families` WHERE `status` = ?;'.format(
prefix=type( self ).db_table_prefix), ( status, ) )
while True: while True:
res = cursor.fetchmany( 1000 ) res = cursor.fetchmany( 1000 )