diff --git a/models/InheritanceDeal.php b/models/InheritanceDeal.php
new file mode 100644
index 000000000..c1f40e3b6
--- /dev/null
+++ b/models/InheritanceDeal.php
@@ -0,0 +1,16 @@
+<?php
+class InheritanceDeal extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('inheritance_deal');
+        
+        $this->hasColumn('id', 'integer', 4, array (  'primary' => true,  'autoincrement' => true,));
+        $this->hasColumn('name', 'string', 255, array ());
+    }
+  
+    public function setUp()
+    {
+        $this->hasMany('InheritanceUser as Users', array('refClass' => 'InheritanceDealUser', 'local' => 'entity_id', 'foreign' => 'user_id'));
+    }
+}
\ No newline at end of file
diff --git a/models/InheritanceDealUser.php b/models/InheritanceDealUser.php
new file mode 100644
index 000000000..ba60b8633
--- /dev/null
+++ b/models/InheritanceDealUser.php
@@ -0,0 +1,40 @@
+<?php
+class InheritanceEntityUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('inheritance_entity_user');
+
+        $this->hasColumn('type', 'integer', 4, array (  'primary' => true,));
+        $this->hasColumn('user_id', 'integer', 4, array (  'primary' => true,));
+        $this->hasColumn('entity_id', 'integer', 4, array (  'primary' => true,));
+    }
+
+    public function setUp()
+    {  
+    }
+}
+
+class InheritanceDealUser extends InheritanceEntityUser
+{
+    public function setTableDefinition()
+    {
+        parent::setTableDefinition();
+
+        $this->setTableName('inheritance_entity_user');
+
+        $this->hasColumn('user_id', 'integer', 4, array (  'primary' => true,));
+        $this->hasColumn('entity_id', 'integer', 4, array (  'primary' => true,));
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->hasOne('InheritanceUser as User', array('local' => 'user_id', 'foreign' => 'id'));
+        $this->hasOne('InheritanceDeal as Deal', array('local' => 'entity_id', 'foreign' => 'id'));
+        $this->setInheritanceMap(array (
+        'type' => 1,
+        ));
+    }
+}
\ No newline at end of file
diff --git a/models/InheritanceUser.php b/models/InheritanceUser.php
new file mode 100644
index 000000000..fa9dacfe8
--- /dev/null
+++ b/models/InheritanceUser.php
@@ -0,0 +1,16 @@
+<?php
+class InheritanceUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('inheritance_user');
+
+        $this->hasColumn('id', 'integer', 4, array (  'primary' => true,  'autoincrement' => true,));
+        $this->hasColumn('username', 'string', 128, array (  'notnull' => true,));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('InheritanceDeal as Deals', array('refClass' => 'InheritanceDealUser', 'local' => 'user_id', 'foreign' => 'entity_id'));
+    }
+}
\ No newline at end of file
diff --git a/tests/Query/ApplyInheritanceTestCase.php b/tests/Query/ApplyInheritanceTestCase.php
new file mode 100644
index 000000000..eafd6d159
--- /dev/null
+++ b/tests/Query/ApplyInheritanceTestCase.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_Query_ApplyInheritance_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.phpdoctrine.com
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_ApplyInheritance_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    {
+        
+    }
+    
+    public function prepareTables() 
+    {
+        $this->tables = array('InheritanceDeal', 'InheritanceEntityUser', 'InheritanceUser');
+        
+        parent::prepareTables();
+    }
+    
+    public function testApplyInheritance()
+    {
+        $query = new Doctrine_Query();
+        $query->from('InheritanceDeal d, d.Users u');
+        $query->where('u.id = 1');
+        
+        $sql = 'SELECT i.id AS i__id, i.name AS i__name, i2.id AS i2__id, i2.username AS i2__username FROM inheritance_deal i LEFT JOIN inheritance_entity_user i3 ON i.id = i3.entity_id LEFT JOIN inheritance_user i2 ON i2.id = i3.user_id WHERE i2.id = 1 AND (i3.type = 1 OR i3.type IS NULL)';
+        
+        $this->assertEqual($sql, $query->getSql());
+    }
+}
diff --git a/tests/run.php b/tests/run.php
index 06851f333..375af00e6 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -334,6 +334,7 @@ $cache->addTestCase(new Doctrine_Cache_Apc_TestCase());
 //$cache->addTestCase(new Doctrine_Cache_TestCase());
 $test->addTestCase($cache);
 
+$test->addTestCase(new Doctrine_Query_ApplyInheritance_TestCase());
 
 class CliReporter extends HtmlReporter{
     public function paintHeader(){