Merge "Fixing the MySqlPageGenerator"

pywikibot/config2.py

@@ -544,9 +544,17 @@ def register_families_folder(folder_path):
 report_dead_links_on_talk = False
 
 # ############# DATABASE SETTINGS ##############
+# Setting to connect the database or replica of the database of the wiki.
+# db_name_format can be used to manipulate the dbName of site.
+# Example for a pywikibot running on wmflabs:
+# db_hostname = 'enwiki.labsdb'
+# db_name_format = '{0}_p'
+# db_connect_file = '~/replica.my.cnf'
 db_hostname = 'localhost'
-db_username = 'wikiuser'
+db_username = ''
 db_password = ''
+db_name_format = '{0}'
+db_connect_file = None
 
 # ############# SEARCH ENGINE SETTINGS ##############
 

pywikibot/pagegenerators.py

@@ -1993,8 +1993,8 @@ def MySQLPageGenerator(query, site=None):
     MySQLdb <https://sourceforge.net/projects/mysql-python/>
 
     @param query: MySQL query to execute
-    @param site: Site object or raw database name
-    @type site: L{pywikibot.site.BaseSite} or str
+    @param site: Site object
+    @type site: L{pywikibot.site.BaseSite}
     @return: iterator of pywikibot.Page
     """
     try:
@@ -2003,14 +2003,13 @@ def MySQLPageGenerator(query, site=None):
         import MySQLdb as mysqldb
     if site is None:
         site = pywikibot.Site()
-    if isinstance(site, pywikibot.site.BaseSite):
-        # We want to let people to set a custom dbname
-        # since the master dbname might not be exactly
-        # equal to the name on the replicated site
-        site = site.dbName()
-    conn = mysqldb.connect(config.db_hostname, db=site,
-                           user=config.db_username,
-                           passwd=config.db_password)
+    if config.db_connect_file is None:
+        conn = mysqldb.connect(config.db_hostname, db=config.db_name_format.format(site.dbName()),
+                               user=config.db_username, passwd=config.db_password)
+    else:
+        conn = mysqldb.connect(config.db_hostname, db=config.db_name_format.format(site.dbName()),
+                               read_default_file=config.db_connect_file)
+
     cursor = conn.cursor()
     pywikibot.output(u'Executing query:\n%s' % query)
     query = query.encode(site.encoding())