← Back to branch summary

~mysql/mysql-utilities/1.3.2

« back to all changes in this revision

Viewing changes to scripts/mysqldbcompare.py

  • Committer: Paulo Jesus
  • Date: 2013-04-19 18:31:54 UTC
  • mfrom: (289.1.47 mysql-utilities-1.2.2)
  • Revision ID: paulo.jesus@oracle.com-20130419183154-g8rkvs2oezbdvrud
Release-1.3.1 Merge

This patch merges version 1.2.2 to 1.3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/mysqldbcompare.py
33
33
from mysql.utilities.command.dbcompare import database_compare
34
34
from mysql.utilities.common.messages import PARSE_ERR_DB_PAIR
35
35
from mysql.utilities.common.messages import PARSE_ERR_DB_PAIR_EXT
36
 
from mysql.utilities.common.options import parse_connection, add_difftype
 
36
from mysql.utilities.common.ip_parser import parse_connection
 
37
from mysql.utilities.common.options import add_difftype
37
38
from mysql.utilities.common.options import add_verbosity, check_verbosity
38
39
from mysql.utilities.common.options import add_changes_for, add_reverse
39
40
from mysql.utilities.common.options import add_format_option
40
41
from mysql.utilities.common.options import setup_common_options
 
42
from mysql.utilities.common.pattern_matching import REGEXP_OBJ_NAME
41
43
from mysql.utilities.common.sql_transform import is_quoted_with_backticks
42
44
from mysql.utilities.common.sql_transform import remove_backtick_quoting
43
45
 
172
174
 
173
175
res = True
174
176
check_failed = False
 
177
arg_regexp = re.compile('{0}(?:(?:\:){0})?'.format(REGEXP_OBJ_NAME))
175
178
for db in args:
176
179
    # Split the database names considering backtick quotes
177
 
    grp = re.match(r"(`(?:[^`]|``)+`|\w+)(?:(?:\:)(`(?:[^`]|``)+`|\w+))?", db)
 
180
    grp = arg_regexp.match(db)
178
181
    if not grp:
179
182
        parser.error(PARSE_ERR_DB_PAIR.format(db_pair=db,
180
183
                                              db1_label='db1',