Ticket #5000: table-prefix-better.diff

django/db/models/options.py

@@ -98 +98 @@
             self.verbose_name_plural = string_concat(self.verbose_name, 's')
         del self.meta
 
-        # If the db_table wasn't provided, use the app_label + module_name.
+        prefix = getattr(settings, 'DATABASE_TABLE_PREFIX', '')
+
+        # If the db_table wasn't provided, use prefix + app_label + module_name.
+        # Otherwise, use prefix + given table name from db_table.
         if not self.db_table:
-            self.db_table = "%s_%s" % (self.app_label, self.module_name)
-            self.db_table = truncate_name(self.db_table, connection.ops.max_name_length())
+            self.db_table = "%s%s_%s" % (prefix, self.app_label, self.module_name)
+        else:
+            self.db_table = "%s%s" % (prefix, self.db_table)
+        
+        self.db_table = truncate_name(self.db_table, connection.ops.max_name_length())
 
-
     def _prepare(self, model):
         if self.order_with_respect_to:
             self.order_with_respect_to = self.get_field(self.order_with_respect_to)

django/conf/global_settings.py

@@ -131 +131 @@
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 DATABASE_OPTIONS = {}          # Set to empty dictionary for default.
 
+# Global prefix for every table created from a model in this project.
+DATABASE_TABLE_PREFIX = ''
+
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'
 

docs/ref/settings.txt

@@ -227 +227 @@
 The port to use when connecting to the database. An empty string means the
 default port. Not used with SQLite.
 
+.. setting:: DATABASE_TABLE_PREFIX
+
+DATABASE_TABLE_PREFIX
+---------------------
+
+Default: ``''`` (Empty string)
+
+A prefix that will be added to every table name. Includes models that
+specify a table name manually.
+
 .. setting:: DATABASE_USER
 
 DATABASE_USER