From 4202d1518bba63cfd8d4ebc03fb7fdafa09159fe Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Tue, 6 Aug 2013 01:12:43 -0400
Subject: Issue #1759144 by rondp, Josh Waihi, jweowu, David_Rothstein |
 plachance: Fixed taxonomy_update_7005 on pgsql returns error 'column 'td' of
 relation 'taxonomy_update_7005' does not exist'.

---
 modules/taxonomy/taxonomy.install | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'modules/taxonomy')

diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index c353c9c8c..2d44d3db3 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -682,6 +682,14 @@ function taxonomy_update_7005(&$sandbox) {
     $query->orderBy('tn.vid');
     $query->orderBy('td.weight');
     $query->orderBy('tn.tid');
+
+    // Work around a bug in the PostgreSQL driver that would result in fatal
+    // errors when this subquery is used in the insert query below. See
+    // https://drupal.org/node/2057693.
+    $fields = &$query->getFields();
+    unset($fields['td.weight']);
+    unset($fields['tn.tid']);
+
     db_insert('taxonomy_update_7005')
       ->from($query)
       ->execute();
-- 
cgit v1.2.3