valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix naming of modules.mysql.quoteIdentifier() to follow convention

Browse Source
This commit is contained in:
Chris Rebert 2013-12-03 10:42:24 -08:00
parent f82e3a859b
commit d91851a479
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/modules/mysql.py
View File

@ -69,8 +69,8 @@ def __check_table(name, table, **connection_args):
if dbc is None:
return {}
cur = dbc.cursor(MySQLdb.cursors.DictCursor)
s_name = quoteIdentifier(name)
s_table = quoteIdentifier(table)
s_name = quote_identifier(name)
s_table = quote_identifier(table)
qry = 'CHECK TABLE %(dbname)s.%(dbtable)s' % dict(dbname=s_name, dbtable=s_table)
log.debug('Doing query: {0}'.format(qry))
cur.execute(qry)
@ -84,8 +84,8 @@ def __repair_table(name, table, **connection_args):
if dbc is None:
return {}
cur = dbc.cursor(MySQLdb.cursors.DictCursor)
s_name = quoteIdentifier(name)
s_table = quoteIdentifier(table)
s_name = quote_identifier(name)
s_table = quote_identifier(table)
qry = 'REPAIR TABLE %(dbname)s.%(dbtable)s' % dict(dbname=s_name, dbtable=s_table)
log.debug('Doing query: {0}'.format(qry))
cur.execute(qry)
@ -99,8 +99,8 @@ def __optimize_table(name, table, **connection_args):
if dbc is None:
return {}
cur = dbc.cursor(MySQLdb.cursors.DictCursor)
s_name = quoteIdentifier(name)
s_table = quoteIdentifier(table)
s_name = quote_identifier(name)
s_table = quote_identifier(table)
qry = 'OPTIMIZE TABLE %(dbname)s.%(dbtable)s' % dict(dbname=s_name, dbtable=s_table)
log.debug('Doing query: {0}'.format(qry))
cur.execute(qry)
@ -226,7 +226,7 @@ def _grant_to_tokens(grant):
database=database)
def quoteIdentifier(identifier):
def quote_identifier(identifier):
'''
Return an identifier name (column, table, database, etc) escaped accordingly for MySQL
@ -236,7 +236,7 @@ def quoteIdentifier(identifier):
.. code-block:: bash
salt '*' mysql.quoteIdentifier 'foo`bar'
salt '*' mysql.quote_identifier 'foo`bar'
'''
return '`' + identifier.replace('`', '``') + '`'
@ -557,7 +557,7 @@ def db_tables(name, **connection_args):
if dbc is None:
return []
cur = dbc.cursor()
s_name = quoteIdentifier(name)
s_name = quote_identifier(name)
qry = 'SHOW TABLES IN %(dbname)s' % dict(dbname=s_name)
log.debug('Doing query: {0}'.format(qry))
try:
@ -636,7 +636,7 @@ def db_create(name, character_set=None, collate=None, **connection_args):
if dbc is None:
return False
cur = dbc.cursor()
s_name = quoteIdentifier(name)
s_name = quote_identifier(name)
qry = 'CREATE DATABASE %(dbname)s' % dict(dbname=s_name)
args = {}
if character_set is not None:
@ -683,7 +683,7 @@ def db_remove(name, **connection_args):
if dbc is None:
return False
cur = dbc.cursor()
s_name = quoteIdentifier(name)
s_name = quote_identifier(name)
qry = 'DROP DATABASE %(dbname)s;' % dict(dbname=s_name)
log.debug('Doing query: {0}'.format(qry))
try:

12
tests/integration/modules/mysql.py
View File

@ -294,13 +294,13 @@ class MysqlModuleTest(integration.ModuleCase,
create_query = ('CREATE TABLE %(tblname)s ('
' id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,'
' data VARCHAR(100)) ENGINE=%(engine)s;') % dict(
tblname=mysqlmod.quoteIdentifier(tablename),
tblname=mysqlmod.quote_identifier(tablename),
engine=engine,
)
insert_query = ('INSERT INTO %(tblname)s (data)'
' VALUES ') % dict(tblname=mysqlmod.quoteIdentifier(tablename))
' VALUES ') % dict(tblname=mysqlmod.quote_identifier(tablename))
delete_query = ('DELETE from %(tblname)s'
' order by rand() limit 50;') % dict(tblname=mysqlmod.quoteIdentifier(tablename))
' order by rand() limit 50;') % dict(tblname=mysqlmod.quote_identifier(tablename))
for x in range(100):
insert_query += "('foo"+str(x)+"'),"
insert_query += "('bar');"
@ -364,7 +364,7 @@ class MysqlModuleTest(integration.ModuleCase,
connection_user=self.user,
connection_pass=self.password
)
# Note that returned result does not quoteIdentifier of table and db
# Note that returned result does not quote_identifier of table and db
self.assertEqual(ret, [{'Table': dbname+'.'+tablename, 'Msg_text': 'OK', 'Msg_type': 'status', 'Op': 'check'}])
ret = self.run_function(
'mysql.db_repair',
@ -373,7 +373,7 @@ class MysqlModuleTest(integration.ModuleCase,
connection_user=self.user,
connection_pass=self.password
)
# Note that returned result does not quoteIdentifier of table and db
# Note that returned result does not quote_identifier of table and db
self.assertEqual(ret, [{'Table': dbname+'.'+tablename, 'Msg_text': 'OK', 'Msg_type': 'status', 'Op': 'repair'}])
ret = self.run_function(
'mysql.db_optimize',
@ -382,7 +382,7 @@ class MysqlModuleTest(integration.ModuleCase,
connection_user=self.user,
connection_pass=self.password
)
# Note that returned result does not quoteIdentifier of table and db
# Note that returned result does not quote_identifier of table and db
self.assertEqual(ret, [{'Table': dbname+'.'+tablename, 'Msg_text': 'OK', 'Msg_type': 'status', 'Op': 'optimize'}])
# test check/repair/opimize on all tables