summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-05-06 15:29:51 +0000
committerDries Buytaert <dries@buytaert.net>2010-05-06 15:29:51 +0000
commit3a1c93a338ce9bb90537a470286adcc96ae18154 (patch)
tree2e085c9bccc0ea85a6df98921b8ba1c8b9619129 /modules
parent87bdade9b90f3430f4723179894669682100d6e8 (diff)
downloadbrdo-3a1c93a338ce9bb90537a470286adcc96ae18154.tar.gz
brdo-3a1c93a338ce9bb90537a470286adcc96ae18154.tar.bz2
- Patch #650748 by yched: tablename for deleted fields.
Diffstat (limited to 'modules')
-rw-r--r--modules/field/modules/field_sql_storage/field_sql_storage.module14
1 files 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 74cc5564c..1c365b41f 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']}";
+ }
}
/**