From b45d832fd57f201d6a42a9abb872a898472fd386 Mon Sep 17 00:00:00 2001
From: Allan Chappell <generalredneck@gmail.com>
Date: Thu, 17 Jan 2013 18:32:40 -0600
Subject: [PATCH] [#1614234] Updating views data for fields built with text
 field module and are varchar.

---
 handlers/views_natural_sort_handler_sort.inc |  1 +
 views_natural_sort.views.inc                 | 40 +++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/handlers/views_natural_sort_handler_sort.inc b/handlers/views_natural_sort_handler_sort.inc
index c5dd5ba..ce86bf2 100644
--- a/handlers/views_natural_sort_handler_sort.inc
+++ b/handlers/views_natural_sort_handler_sort.inc
@@ -16,6 +16,7 @@ class views_natural_sort_handler_sort extends views_handler_sort {
     switch ($this->options['order']) {
       case 'NASC':
       case 'NDESC':
+        $this->ensure_my_table();
         $order = substr($this->options['order'], 1);
         $vns_alias = $this->query->ensure_table('views_natural_sort');
         $this->query->add_orderby($vns_alias, 'content', $order);
diff --git a/views_natural_sort.views.inc b/views_natural_sort.views.inc
index d6aa523..6970d16 100644
--- a/views_natural_sort.views.inc
+++ b/views_natural_sort.views.inc
@@ -28,7 +28,45 @@ function views_natural_sort_views_data() {
 }
 
 function views_natural_sort_views_data_alter(&$data) {
-
   // TODO: Add a field and argument handler to support grouping.
   $data['node']['title']['sort']['handler'] = 'views_natural_sort_handler_sort';
 }
+
+function views_natural_sort_field_views_data_alter(&$data, $field, $module) {
+  // TODO: check to see if field is "registered" to be sort naturally.
+  if ($module != 'text' || $field['storage']['type'] != 'field_sql_storage') {
+    return;
+  }
+  foreach ($field['bundles'] as $entity_type => $bundles) {
+    $entity_info = entity_get_info($entity_type);
+    $field_table =  _field_sql_storage_tablename($field);
+    $view_fields = array();
+    foreach($field['columns'] as $column_name => $column_data) {
+
+      // See field_views_field_default_views_data. it says only varchar is worth sorting.
+      if ($column_data['type'] != 'varchar') {
+        continue;
+      }
+
+      // Stash the field names so we can join on them later.
+      $current_view_field_column = $field['field_name'] . '_' . $column_name;
+
+      $view_fields[] = $current_view_field_column;
+      $data[$field_table][$current_view_field_column]['sort']['handler'] = 'views_natural_sort_handler_sort';
+    }
+    $data['views_natural_sort']['table']['join'][$field_table] = array(
+      'left_field' => 'entity_id',
+      'field' => 'eid',
+      'extra' => array(
+        array(
+          'field' => 'entity_type',
+          'value' => $entity_type,
+        ),
+        array(
+          'field' => 'field',
+          'value' => $view_fields,
+        ),
+      ),
+    );
+  }
+}
-- 
GitLab