Ticket #4999: xx.diff

db/models/options.py

@@ -78 +78 @@
 
         # If the db_table wasn't provided, use the app_label + module_name.
         if not self.db_table:
-            self.db_table = "%s_%s" % (self.app_label, self.module_name)
+            try:
+                prefix = settings.DATABASE_TABLE_PREFIX
+            except AttributeError:
+                prefix = ''
+
+            self.db_table = "%s%s_%s" % (prefix, self.app_label, self.module_name)
             self.db_table = truncate_name(self.db_table,
                                           backend.get_max_name_length())
 

db/backends/util.py

@@ -13 +13 @@
         self.cursor = cursor
         self.db = db
 
+        try:
+            from django.conf import settings
+            self.debug_query = settings.DEBUG_QUERY
+        except AttributeError:
+            self.debug_query = False
+
     def execute(self, sql, params=()):
         start = time()
         try:
@@ -24 +30 @@
                 'time': "%.3f" % (stop - start),
             })
 
+            if self.debug_query:
+                print 'QUERY:', self.db.queries[-1]['sql']
+
     def executemany(self, sql, param_list):
         start = time()
         try:
@@ -35 +44 @@
                 'time': "%.3f" % (stop - start),
             })
 
+            if self.debug_query:
+                print 'QUERY:', self.db.queries[-1]['sql']
+
     def __getattr__(self, attr):
         if attr in self.__dict__:
             return self.__dict__[attr]

core/management.py

@@ -276 +276 @@
                 style.SQL_TABLE(backend.quote_name(f.rel.to._meta.db_table)),
                 style.SQL_FIELD(backend.quote_name(f.rel.to._meta.pk.column)),
                 backend.get_deferrable_sql()))
+
+            if hasattr(f, 'contribute_to_table'):
+                f.contribute_to_table(table_output, backend, style)
+
             table_output.append('    %s (%s, %s)%s' % \
                 (style.SQL_KEYWORD('UNIQUE'),
                 style.SQL_FIELD(backend.quote_name(f.m2m_column_name())),
                 style.SQL_FIELD(backend.quote_name(f.m2m_reverse_name())),
                 tablespace_sql))
+            
             table_output.append(')')
             if opts.db_tablespace and backend.supports_tablespaces:
                 # f.db_tablespace is only for indices, so ignore its value here.
@@ -1701 +1706 @@
     # way. For example, if this file (manage.py) lives in a directory
     # "myproject", this code would add "/path/to/myproject" to sys.path.
     project_directory, settings_filename = os.path.split(settings_mod.__file__)
+    
+    if project_directory == '':
+        project_directory = os.getcwd()
+    
     project_name = os.path.basename(project_directory)
     settings_name = os.path.splitext(settings_filename)[0]
     sys.path.append(os.path.join(project_directory, '..'))