From 3a1c93a338ce9bb90537a470286adcc96ae18154 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 6 May 2010 15:29:51 +0000
Subject: [PATCH] - Patch #650748 by yched: tablename for deleted fields.

---
 .../field_sql_storage/field_sql_storage.module     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module
index 74cc5564cb8..1c365b41fa9 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.module
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.module
@@ -40,7 +40,12 @@ function field_sql_storage_field_storage_info() {
  *   A string containing the generated name for the database table
  */
 function _field_sql_storage_tablename($field) {
-  return "field_data_{$field['field_name']}" . ($field['deleted'] ? "_{$field['id']}" : '');
+  if ($field['deleted']) {
+    return "field_deleted_data_{$field['id']}";
+  }
+  else {
+    return "field_data_{$field['field_name']}";
+  }
 }
 
 /**
@@ -52,7 +57,12 @@ function _field_sql_storage_tablename($field) {
  *   A string containing the generated name for the database table
  */
 function _field_sql_storage_revision_tablename($field) {
-  return "field_revision_{$field['field_name']}" . ($field['deleted'] ? "_{$field['id']}" : '');
+  if ($field['deleted']) {
+    return "field_deleted_revision_{$field['id']}";
+  }
+  else {
+    return "field_revision_{$field['field_name']}";
+  }
 }
 
 /**