web/lib/django/db/backends/mysql/client.py
changeset 29 cc9b7e14412b
parent 0 0d40e90630ef
equal deleted inserted replaced
28:b758351d191f 29:cc9b7e14412b
     7     executable_name = 'mysql'
     7     executable_name = 'mysql'
     8 
     8 
     9     def runshell(self):
     9     def runshell(self):
    10         settings_dict = self.connection.settings_dict
    10         settings_dict = self.connection.settings_dict
    11         args = [self.executable_name]
    11         args = [self.executable_name]
    12         db = settings_dict['DATABASE_OPTIONS'].get('db', settings_dict['DATABASE_NAME'])
    12         db = settings_dict['OPTIONS'].get('db', settings_dict['NAME'])
    13         user = settings_dict['DATABASE_OPTIONS'].get('user', settings_dict['DATABASE_USER'])
    13         user = settings_dict['OPTIONS'].get('user', settings_dict['USER'])
    14         passwd = settings_dict['DATABASE_OPTIONS'].get('passwd', settings_dict['DATABASE_PASSWORD'])
    14         passwd = settings_dict['OPTIONS'].get('passwd', settings_dict['PASSWORD'])
    15         host = settings_dict['DATABASE_OPTIONS'].get('host', settings_dict['DATABASE_HOST'])
    15         host = settings_dict['OPTIONS'].get('host', settings_dict['HOST'])
    16         port = settings_dict['DATABASE_OPTIONS'].get('port', settings_dict['DATABASE_PORT'])
    16         port = settings_dict['OPTIONS'].get('port', settings_dict['PORT'])
    17         defaults_file = settings_dict['DATABASE_OPTIONS'].get('read_default_file')
    17         defaults_file = settings_dict['OPTIONS'].get('read_default_file')
    18         # Seems to be no good way to set sql_mode with CLI.
    18         # Seems to be no good way to set sql_mode with CLI.
    19 
    19 
    20         if defaults_file:
    20         if defaults_file:
    21             args += ["--defaults-file=%s" % defaults_file]
    21             args += ["--defaults-file=%s" % defaults_file]
    22         if user:
    22         if user: