From 55fbef328f95e0a8dfff0a459c0bf9d24601a11a Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Sun, 29 Jul 2012 23:35:26 -0400
Subject: Issue #1325628 by damien_vancouver, xjm, Damien Tournoud,
 TravisCarden | jbova: Fixed EntityFieldQuery::propertyQuery missing fully
 qualified column names causes ambiguous column DB error.

---
 modules/simpletest/tests/entity_query.test | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'modules/simpletest/tests')

diff --git a/modules/simpletest/tests/entity_query.test b/modules/simpletest/tests/entity_query.test
index 7a7c6222c..6d77c508b 100644
--- a/modules/simpletest/tests/entity_query.test
+++ b/modules/simpletest/tests/entity_query.test
@@ -1659,4 +1659,23 @@ class EntityFieldQueryTestCase extends DrupalWebTestCase {
       $this->fail('Exception thrown: '. $e->getMessage());
     }
   }
+
+  /**
+   * Tests EFQ table prefixing with multiple conditions and an altered join.
+   *
+   * @see field_test_query_efq_table_prefixing_test_alter()
+   */
+  function testTablePrefixing() {
+    $query = new EntityFieldQuery();
+    $query = $query
+      ->entityCondition('entity_type', 'test_entity')
+      ->entityCondition('bundle', 'test_bundle')
+      ->entityCondition('entity_id', '1')
+      ->addTag('efq_table_prefixing_test');
+
+    $expected = array(array('test_entity', 1));
+
+    $this->assertEntityFieldQuery($query, $expected, 'An EntityFieldQuery returns the expected results when altered with an additional join on the base table.');
+  }
+
 }
-- 
cgit v1.2.3