Project

General

Profile

Download (6.66 KB) Statistics
| Branch: | Tag: | Revision:
1
Index: views_query.inc
2
===================================================================
3
RCS file: /cvs/drupal-contrib/contributions/modules/views/Attic/views_query.inc,v
4
retrieving revision 1.51.2.11
5
diff -u -r1.51.2.11 views_query.inc
6
--- views_query.inc	12 Apr 2007 15:18:59 -0000	1.51.2.11
7
+++ views_query.inc	29 Sep 2007 17:19:18 -0000
8
@@ -139,7 +139,7 @@
9
   if (is_array($filter['value']) && count($filter['value'])) {
10
     if ($filter['operator'] == 'OR' || $filter['operator'] == 'NOR') {
11
       $query->ensure_table($table);
12
-      $where_args = array_merge(array($query->use_alias_prefix . $table, $field), $filter['value']);
13
+      $where_args = array_merge(array($query->get_table_name($table), $field), $filter['value']);
14
       $placeholder = array_fill(0, count($filter['value']), '%s');
15
       if ($filter['operator'] == 'OR') {
16
         $query->add_where("%s.%s IN ('". implode("','", $placeholder) ."')", $where_args);
17
@@ -167,7 +167,7 @@
18
   }
19
   else {
20
     $query->ensure_table("$table");
21
-    $query->add_where("%s.%s %s '%s'", $query->use_alias_prefix . $table, $field, $filter['operator'], $filter['value']);
22
+    $query->add_where("%s.%s %s '%s'", $query->get_table_name($table), $field, $filter['operator'], $filter['value']);
23
   }
24
 }
25
 
26
@@ -554,7 +554,7 @@
27
    * @param $alias_prefix
28
    *   An optional prefix for the table alias.
29
    */
30
-  function get_table_name($table, $table_num, $alias_prefix = null) {
31
+  function get_table_name($table, $table_num = 1, $alias_prefix = null) {
32
     if (is_null($alias_prefix)) {
33
       $alias_prefix = $this->use_alias_prefix;
34
     }
35
Index: views.module
36
===================================================================
37
RCS file: /cvs/drupal-contrib/contributions/modules/views/views.module,v
38
retrieving revision 1.166.2.43
39
diff -u -r1.166.2.43 views.module
40
--- views.module	14 Jul 2007 18:54:16 -0000	1.166.2.43
41
+++ views.module	29 Sep 2007 17:19:17 -0000
42
@@ -1928,7 +1928,7 @@
43
     case 'handler':
44
       $table = $filterinfo['table'];
45
       $column = $filterinfo['field'];
46
-      $field = "$table.$column";
47
+      $field = $query->get_table_name($table) .'.'. $column;
48
       $query->ensure_table($table);
49
 
50
       switch ($filter['operator']) {
51
@@ -2020,7 +2020,7 @@
52
 
53
   $table = $filterinfo['table'];
54
   $column = $filterinfo['field'];
55
-  $field = "$table.$column";
56
+  $field = $query->get_table_name($table) .'.'. $column;
57
   if ($filterinfo['from_unixtime']) {
58
     $field = "from_UNIXTIME($field)";
59
   }
60
Index: modules/views_user.inc
61
===================================================================
62
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/Attic/views_user.inc,v
63
retrieving revision 1.14.2.7
64
diff -u -r1.14.2.7 views_user.inc
65
--- modules/views_user.inc	3 Mar 2007 22:31:27 -0000	1.14.2.7
66
+++ modules/views_user.inc	29 Sep 2007 17:19:18 -0000
67
@@ -372,7 +372,7 @@
68
  */
69
 function views_handler_filter_uid_touched($op, $filter, $filterinfo, &$query) {
70
   if (!module_exists('comment')) { // not much to do in this case
71
-    $query->add_where("node.uid = '%s'", $filter['value']);
72
+    $query->add_where($query->get_table_name('node') .".uid = '%s'", $filter['value']);
73
     return;
74
   }
75
 
76
@@ -383,7 +383,7 @@
77
   $table = $query->get_table_name('comments', $tblnum);
78
 
79
   $query->set_distinct(); // once you do this, there's just one node.
80
-  $query->add_where("node.uid = '%s' OR $table.uid = '%s'", $filter['value'], $filter['value']);
81
+  $query->add_where($query->get_table_name('node') .".uid = '%s' OR $table.uid = '%s'", $filter['value'], $filter['value']);
82
 }
83
 
84
 /*
85
@@ -412,18 +412,18 @@
86
       if (in_array(DRUPAL_ANONYMOUS_RID, $filter['value'])) {
87
         return;
88
       }
89
-      $query->add_where("node.uid != 0");
90
+      $query->add_where($query->get_table_name('node') .".uid != 0");
91
       return;
92
     }
93
     else if ($filter['operator'] == 'NOR') {
94
       //filter for anonymous users too?
95
       if (in_array(DRUPAL_ANONYMOUS_RID, $filter['value'])) {
96
         $query->ensure_table($table);
97
-        $query->add_where("%s.%s = '0'", $table, $field); //this will get no results
98
+        $query->add_where("%s.%s = '0'", $query->get_table_name($table), $field); //this will get no results
99
         return;
100
       }
101
       else {
102
-        $query->add_where("node.uid = 0");
103
+        $query->add_where($query->get_table_name('node') .".uid = 0");
104
         return;
105
       }
106
     }
107
@@ -433,7 +433,7 @@
108
       //if there are other roles left the default filter handling is ok
109
       //else we must exclude the anonymous user
110
       if (count($filter['value']) == 0) {
111
-        $query->add_where("node.uid != 0");
112
+        $query->add_where($query->get_table_name('node') .".uid != 0");
113
         return;
114
       }
115
     }
116
@@ -445,7 +445,7 @@
117
       unset($filter['value'][$key]);
118
       
119
       if (count($filter['value']) == 0) {
120
-        $query->add_where("node.uid = 0");
121
+        $query->add_where($query->get_table_name('node') .".uid = 0");
122
         return;
123
       }
124
       else {
125
@@ -456,15 +456,15 @@
126
         $num = $query->add_table($table, false, 1, $joininfo);
127
         $tablename = $query->get_table_name($table, $num);
128
         //and allow anonymous nodes
129
-        $query->add_where("node.uid = 0 OR %s.%s IS NOT NULL", $tablename, $field);
130
+        $query->add_where($query->get_table_name('node') .".uid = 0 OR %s.%s IS NOT NULL", $tablename, $field);
131
         return;
132
       }
133
     }
134
     else if ($filter['operator'] == 'NOR') {
135
-      $query->add_where("node.uid != 0");
136
+      $query->add_where($query->get_table_name('node') .".uid != 0");
137
     }
138
     else if ($filter['operator'] == 'AND') {
139
-      $query->add_where("node.uid = 0");
140
+      $query->add_where($query->get_table_name('node') .".uid = 0");
141
       if (count($filter['value']) == 1) {
142
         //no need to run the default filter handler any more
143
         return;
144
Index: modules/views_upload.inc
145
===================================================================
146
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/Attic/views_upload.inc,v
147
retrieving revision 1.4.4.5
148
diff -u -r1.4.4.5 views_upload.inc
149
--- modules/views_upload.inc	3 Mar 2007 22:40:31 -0000	1.4.4.5
150
+++ modules/views_upload.inc	29 Sep 2007 17:19:18 -0000
151
@@ -160,12 +160,13 @@
152
 function views_handler_file_filter_fid_exist($op, $filter, $filterdata, &$query) {
153
   switch ($op) {
154
     case 'handler':
155
-      $query->ensure_table('file_revisions');
156
+      $table = 'file_revisions';
157
+      $query->ensure_table($table);
158
       if ($filter['value']) {
159
-        $query->add_where('file_revisions.fid');
160
+        $query->add_where($query->get_table_name($table) .'.fid');
161
       }
162
       else {
163
-        $query->add_where('ISNULL(file_revisions.fid)');
164
+        $query->add_where('ISNULL('. $query->get_table_name($table) .'.fid)');
165
       }
166
   }
167
 }
(2-2/2)