← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal-security

« back to all changes in this revision

Viewing changes to django/db/backends/mysql/client.py

  • Committer: Bazaar Package Importer
  • Author(s): Chris Lamb
  • Date: 2010-05-21 07:52:55 UTC
  • mfrom: (1.3.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 28.
  • Revision ID: james.westby@ubuntu.com-20100521075255-ii78v1dyfmyu3uzx
Tags: upstream-1.2
Import upstream version 1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/db/backends/mysql/client.py
9
9
    def runshell(self):
10
10
        settings_dict = self.connection.settings_dict
11
11
        args = [self.executable_name]
12
 
        db = settings_dict['DATABASE_OPTIONS'].get('db', settings_dict['DATABASE_NAME'])
13
 
        user = settings_dict['DATABASE_OPTIONS'].get('user', settings_dict['DATABASE_USER'])
14
 
        passwd = settings_dict['DATABASE_OPTIONS'].get('passwd', settings_dict['DATABASE_PASSWORD'])
15
 
        host = settings_dict['DATABASE_OPTIONS'].get('host', settings_dict['DATABASE_HOST'])
16
 
        port = settings_dict['DATABASE_OPTIONS'].get('port', settings_dict['DATABASE_PORT'])
17
 
        defaults_file = settings_dict['DATABASE_OPTIONS'].get('read_default_file')
 
12
        db = settings_dict['OPTIONS'].get('db', settings_dict['NAME'])
 
13
        user = settings_dict['OPTIONS'].get('user', settings_dict['USER'])
 
14
        passwd = settings_dict['OPTIONS'].get('passwd', settings_dict['PASSWORD'])
 
15
        host = settings_dict['OPTIONS'].get('host', settings_dict['HOST'])
 
16
        port = settings_dict['OPTIONS'].get('port', settings_dict['PORT'])
 
17
        defaults_file = settings_dict['OPTIONS'].get('read_default_file')
18
18
        # Seems to be no good way to set sql_mode with CLI.
19
19
 
20
20
        if defaults_file: