Ticket #10716: 10716-refix.diff
File 10716-refix.diff, 1.8 KB (added by , 16 years ago) |
---|
-
django/db/backends/oracle/creation.py
56 56 'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP, 57 57 } 58 58 59 self.remember['name'] = settings.DATABASE_NAME60 59 self.remember['user'] = settings.DATABASE_USER 61 60 self.remember['passwd'] = settings.DATABASE_PASSWORD 62 61 … … 109 108 print "Tests cancelled." 110 109 sys.exit(1) 111 110 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 114 112 settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = TEST_DATABASE_PASSWD 115 113 116 114 return settings.DATABASE_NAME … … 126 124 TEST_DATABASE_TBLSPACE = self._test_database_tblspace(settings) 127 125 TEST_DATABASE_TBLSPACE_TMP = self._test_database_tblspace_tmp(settings) 128 126 129 settings.DATABASE_NAME = self.connection.settings_dict["DATABASE_NAME"] = self.remember['name']130 127 settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = self.remember['user'] 131 128 settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = self.remember['passwd'] 132 129 … … 138 135 'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP, 139 136 } 140 137 141 self.remember['name'] = settings.DATABASE_NAME142 138 self.remember['user'] = settings.DATABASE_USER 143 139 self.remember['passwd'] = settings.DATABASE_PASSWORD 144 140