Ticket #10716: 10716-refix.diff

File 10716-refix.diff, 1.8 KB (added by Karen Tracey, 16 years ago)
  • django/db/backends/oracle/creation.py

     
    5656            'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
    5757        }
    5858
    59         self.remember['name'] = settings.DATABASE_NAME
    6059        self.remember['user'] = settings.DATABASE_USER
    6160        self.remember['passwd'] = settings.DATABASE_PASSWORD
    6261
     
    109108                    print "Tests cancelled."
    110109                    sys.exit(1)
    111110
    112         settings.DATABASE_NAME = self.connection.settings_dict["DATABASE_NAME"] = TEST_DATABASE_NAME
    113         settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = TEST_DATABASE_USER
     111        settings.TEST_DATABASE_USER = settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = TEST_DATABASE_USER
    114112        settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = TEST_DATABASE_PASSWD
    115113
    116114        return settings.DATABASE_NAME
     
    126124        TEST_DATABASE_TBLSPACE = self._test_database_tblspace(settings)
    127125        TEST_DATABASE_TBLSPACE_TMP = self._test_database_tblspace_tmp(settings)
    128126
    129         settings.DATABASE_NAME = self.connection.settings_dict["DATABASE_NAME"] = self.remember['name']
    130127        settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = self.remember['user']
    131128        settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = self.remember['passwd']
    132129
     
    138135            'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
    139136        }
    140137
    141         self.remember['name'] = settings.DATABASE_NAME
    142138        self.remember['user'] = settings.DATABASE_USER
    143139        self.remember['passwd'] = settings.DATABASE_PASSWORD
    144140
Back to Top