You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2008/01/06 15:49:10 UTC

svn commit: r609321 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/access/jdbc/ test/java/org/apache/cayenne/access/ test/java/org/apache/cayenne/access/jdbc/ test/resources/dml/

Author: aadamchik
Date: Sun Jan  6 06:49:09 2008
New Revision: 609321

URL: http://svn.apache.org/viewvc?rev=609321&view=rev
Log:
CAY-954 EJBQL Query: Support for single table inheritance
(refactoring -> implementing a stack of the marker buffers)

Added:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/access.DataContextEJBQLInheritanceTest.xml
Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java?rev=609321&r1=609320&r2=609321&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java Sun Jan  6 06:49:09 2008
@@ -103,9 +103,9 @@
         // on the target entity)...
 
         if (expression.isNegated()) {
-            context.switchToMarker(EJBQLSelectTranslator.makeDistinctMarker(), true);
+            context.pushMarker(EJBQLSelectTranslator.makeDistinctMarker(), true);
             context.append(" DISTINCT");
-            context.switchToMainBuffer();
+            context.popMarker();
         }
 
         visitIsNull(expression, -1);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java?rev=609321&r1=609320&r2=609321&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java Sun Jan  6 06:49:09 2008
@@ -101,7 +101,7 @@
                 .getName());
 
         if (marker != null) {
-            context.switchToMarker(marker, false);
+            context.pushMarker(marker, false);
         }
 
         try {
@@ -140,7 +140,7 @@
         }
         finally {
             if (marker != null) {
-                context.switchToMainBuffer();
+                context.popMarker();
             }
         }
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java?rev=609321&r1=609320&r2=609321&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslator.java Sun Jan  6 06:49:09 2008
@@ -35,6 +35,10 @@
         return "DISTINCT_MARKER";
     }
 
+    static String makeWhereMarker() {
+        return "WHERE_MARKER";
+    }
+
     EJBQLSelectTranslator(EJBQLTranslationContext context) {
         this.context = context;
     }
@@ -46,9 +50,9 @@
     public boolean visitDistinct(EJBQLExpression expression) {
         // "distinct" is appended via a marker as sometimes a later match on to-many would
         // require a DISTINCT insertion.
-        context.switchToMarker(makeDistinctMarker(), true);
+        context.pushMarker(makeDistinctMarker(), true);
         context.append(" DISTINCT");
-        context.switchToMainBuffer();
+        context.popMarker();
         return true;
     }
 
@@ -56,6 +60,7 @@
         context.append(" FROM");
         context.setAppendingResultColumns(false);
         expression.visit(context.getTranslatorFactory().getFromTranslator(context));
+        context.markCurrentPosition(makeWhereMarker());
         return false;
     }
 
@@ -97,7 +102,12 @@
     }
 
     public boolean visitWhere(EJBQLExpression expression) {
+        // "WHERE" is appended via a marker as it may have been already appended when an
+        // entity inheritance qualifier was applied.
+        context.pushMarker(makeWhereMarker(), true);
         context.append(" WHERE");
+        context.popMarker();
+        
         expression.visit(context.getTranslatorFactory().getConditionTranslator(context));
         return false;
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java?rev=609321&r1=609320&r2=609321&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLTranslationContext.java Sun Jan  6 06:49:09 2008
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -52,6 +53,8 @@
     private EJBQLTranslatorFactory translatorFactory;
     private boolean usingAliases;
 
+    protected LinkedList<StringBuilder> bufferStack;
+
     // a flag indicating whether column expressions should be treated as result columns or
     // not.
     private boolean appendingResultColumns;
@@ -64,6 +67,7 @@
         this.parameters = parameters;
         this.translatorFactory = translatorFactory;
         this.usingAliases = true;
+        this.bufferStack = new LinkedList<StringBuilder>();
     }
 
     SQLTemplate getQuery() {
@@ -168,32 +172,30 @@
 
         String internalMarker = (String) getAttribute(marker);
 
-        // make sure we mark the main buffer
-        StringBuilder current = this.currentBuffer;
-
-        try {
-            switchToMainBuffer();
-            append("${").append(internalMarker).append("}");
-        }
-        finally {
-            this.currentBuffer = current;
-        }
+        // append directly to the main buffer, bypassing the stack and the current buffer
+        this.mainBuffer.append("${").append(internalMarker).append("}");
     }
 
     /**
-     * Switches the current buffer to a marked buffer. Note that this can be done even
-     * before the marker is inserted in the main buffer. If "reset" is true, any previous
-     * contents of the marker are cleared.
+     * Switches the current buffer to a marked buffer, pushing the currently used buffer
+     * on the stack. Note that this can be done even before the marker is inserted in the
+     * main buffer. If "reset" is true, any previous contents of the marker are cleared.
      */
-    void switchToMarker(String marker, boolean reset) {
+    void pushMarker(String marker, boolean reset) {
+
+        bufferStack.add(currentBuffer);
+
         this.currentBuffer = findOrCreateMarkedBuffer(marker);
         if (reset) {
             this.currentBuffer.delete(0, this.currentBuffer.length());
         }
     }
 
-    void switchToMainBuffer() {
-        this.currentBuffer = this.mainBuffer;
+    /**
+     * Pops a marker stack, switching to the previously used marker.
+     */
+    void popMarker() {
+        this.currentBuffer = bufferStack.removeLast();
     }
 
     private StringBuilder findOrCreateMarkedBuffer(String marker) {

Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java?rev=609321&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceTest.java Sun Jan  6 06:49:09 2008
@@ -0,0 +1,80 @@
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ ****************************************************************/
+package org.apache.cayenne.access;
+
+import java.util.List;
+
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.query.EJBQLQuery;
+import org.apache.cayenne.testdo.inherit.CustomerRepresentative;
+import org.apache.cayenne.testdo.inherit.Employee;
+import org.apache.cayenne.testdo.inherit.Manager;
+import org.apache.cayenne.unit.PeopleCase;
+
+public class DataContextEJBQLInheritanceTest extends PeopleCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        deleteTestData();
+    }
+
+    public void testSelect() throws Exception {
+        createTestData("testSelect");
+
+        ObjectContext context = createDataContext();
+
+        EJBQLQuery superclass = new EJBQLQuery(
+                "select p from AbstractPerson p ORDER BY p.name");
+
+        List superclassResult = context.performQuery(superclass);
+        assertEquals(5, superclassResult.size());
+
+        assertEquals(Employee.class.getName(), superclassResult
+                .get(0)
+                .getClass()
+                .getName());
+        assertEquals(Employee.class.getName(), superclassResult
+                .get(1)
+                .getClass()
+                .getName());
+        assertEquals(Manager.class.getName(), superclassResult
+                .get(2)
+                .getClass()
+                .getName());
+        assertEquals(Manager.class.getName(), superclassResult
+                .get(3)
+                .getClass()
+                .getName());
+        assertEquals(CustomerRepresentative.class.getName(), superclassResult
+                .get(4)
+                .getClass()
+                .getName());
+
+        EJBQLQuery subclass = new EJBQLQuery("select e from Employee e ORDER BY e.name");
+
+        List subclassResult = context.performQuery(subclass);
+//        assertEquals(4, subclassResult.size());
+//
+//        assertEquals(Employee.class.getName(), subclassResult.get(0).getClass().getName());
+//        assertEquals(Employee.class.getName(), subclassResult.get(1).getClass().getName());
+//        assertEquals(Manager.class.getName(), subclassResult.get(2).getClass().getName());
+//        assertEquals(Manager.class.getName(), subclassResult.get(3).getClass().getName());
+    }
+}

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java?rev=609321&r1=609320&r2=609321&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/EJBQLSelectTranslatorTest.java Sun Jan  6 06:49:09 2008
@@ -56,7 +56,7 @@
         assertTrue(sql, sql.indexOf("t0.ARTIST_ID") > 0);
         assertTrue(sql, sql.indexOf("t0.ARTIST_NAME") > 0);
         assertTrue(sql, sql.indexOf("t0.DATE_OF_BIRTH") > 0);
-        assertTrue(sql, sql.endsWith(" FROM ARTIST t0${marker1}"));
+        assertTrue(sql, sql.endsWith(" FROM ARTIST t0${marker1}${marker2}"));
 
         StringBuilder fromMarker = (StringBuilder) query.getParameters().get("marker1");
         assertNotNull(fromMarker);
@@ -118,7 +118,7 @@
         String from = fromMarker.toString();
         assertEquals("", from);
 
-        assertTrue(sql, sql.endsWith(" FROM ARTIST t0${marker1} WHERE t0.ARTIST_NAME ="
+        assertTrue(sql, sql.endsWith(" FROM ARTIST t0${marker1}${marker2} t0.ARTIST_NAME ="
                 + " #bind('Dali' 'VARCHAR')"));
     }
 
@@ -133,12 +133,12 @@
         String sql1 = query1.getDefaultTemplate();
 
         assertTrue(sql, sql.startsWith("SELECT"));
-        assertTrue(sql, sql.indexOf(" FROM ARTIST t0${marker1} WHERE ") > 0);
-        assertEquals(1, countDelimiters(sql, " OR ", sql.indexOf("WHERE ")));
+        assertTrue(sql, sql.indexOf(" FROM ARTIST t0${marker1}${marker2} ") > 0);
+        assertEquals(1, countDelimiters(sql, " OR ", sql.indexOf("${marker2}")));
 
         assertTrue(sql1, sql1.startsWith("SELECT"));
-        assertTrue(sql1, sql.indexOf(" FROM ARTIST t0${marker1} WHERE ") > 0);
-        assertEquals(2, countDelimiters(sql1, " OR ", sql.indexOf("WHERE ")));
+        assertTrue(sql1, sql.indexOf(" FROM ARTIST t0${marker1}${marker2} ") > 0);
+        assertEquals(2, countDelimiters(sql1, " OR ", sql.indexOf("${marker2}")));
     }
 
     public void testSelectFromWhereAndEqual() {
@@ -153,12 +153,12 @@
         String sql1 = query1.getDefaultTemplate();
 
         assertTrue(sql, sql.startsWith("SELECT"));
-        assertTrue(sql, sql.indexOf(" WHERE ") > 0);
-        assertEquals(1, countDelimiters(sql, " AND ", sql.indexOf("WHERE ")));
+        assertTrue(sql, sql.indexOf("${marker2} ") > 0);
+        assertEquals(1, countDelimiters(sql, " AND ", sql.indexOf("${marker2}")));
 
         assertTrue(sql1, sql1.startsWith("SELECT"));
-        assertTrue(sql1, sql1.indexOf(" WHERE ") > 0);
-        assertEquals(2, countDelimiters(sql1, " AND ", sql1.indexOf("WHERE ")));
+        assertTrue(sql1, sql1.indexOf("${marker2} ") > 0);
+        assertEquals(2, countDelimiters(sql1, " AND ", sql1.indexOf("${marker2}")));
     }
 
     public void testSelectFromWhereNot() {
@@ -166,7 +166,7 @@
         String sql = query.getDefaultTemplate();
 
         assertTrue(sql, sql.startsWith("SELECT"));
-        assertTrue(sql, sql.endsWith(" WHERE NOT "
+        assertTrue(sql, sql.endsWith("${marker2} NOT "
                 + "t0.ARTIST_NAME = #bind('Dali' 'VARCHAR')"));
     }
 
@@ -175,7 +175,7 @@
         String sql = query.getDefaultTemplate();
 
         assertTrue(sql, sql.startsWith("SELECT"));
-        assertTrue(sql, sql.endsWith(" WHERE t0.ESTIMATED_PRICE > #bind($id2 'DECIMAL')"));
+        assertTrue(sql, sql.endsWith("${marker2} t0.ESTIMATED_PRICE > #bind($id3 'DECIMAL')"));
     }
 
     public void testSelectFromWhereGreaterOrEqual() {
@@ -183,14 +183,14 @@
         String sql = query.getDefaultTemplate();
 
         assertTrue(sql, sql
-                .endsWith(" WHERE t0.ESTIMATED_PRICE >= #bind($id2 'INTEGER')"));
+                .endsWith("${marker2} t0.ESTIMATED_PRICE >= #bind($id3 'INTEGER')"));
     }
 
     public void testSelectFromWhereLess() {
         SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice < 1.0");
         String sql = query.getDefaultTemplate();
 
-        assertTrue(sql, sql.endsWith(" WHERE t0.ESTIMATED_PRICE < #bind($id2 'DECIMAL')"));
+        assertTrue(sql, sql.endsWith("${marker2} t0.ESTIMATED_PRICE < #bind($id3 'DECIMAL')"));
     }
 
     public void testSelectFromWhereLessOrEqual() {
@@ -198,37 +198,37 @@
         String sql = query.getDefaultTemplate();
 
         assertTrue(sql, sql
-                .endsWith(" WHERE t0.ESTIMATED_PRICE <= #bind($id2 'DECIMAL')"));
+                .endsWith("${marker2} t0.ESTIMATED_PRICE <= #bind($id3 'DECIMAL')"));
     }
 
     public void testSelectFromWhereNotEqual() {
         SQLTemplate query = translateSelect("select a from Artist a where a.artistName <> 'Dali'");
         String sql = query.getDefaultTemplate();
 
-        assertTrue(sql, sql.endsWith(" WHERE t0.ARTIST_NAME <> #bind('Dali' 'VARCHAR')"));
+        assertTrue(sql, sql.endsWith("${marker2} t0.ARTIST_NAME <> #bind('Dali' 'VARCHAR')"));
     }
 
     public void testSelectFromWhereBetween() {
         SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice between 3 and 5");
         String sql = query.getDefaultTemplate();
 
-        assertTrue(sql, sql.endsWith(" WHERE t0.ESTIMATED_PRICE "
-                + "BETWEEN #bind($id2 'INTEGER') AND #bind($id3 'INTEGER')"));
+        assertTrue(sql, sql.endsWith("${marker2} t0.ESTIMATED_PRICE "
+                + "BETWEEN #bind($id3 'INTEGER') AND #bind($id4 'INTEGER')"));
     }
 
     public void testSelectFromWhereNotBetween() {
         SQLTemplate query = translateSelect("select p from Painting p where p.estimatedPrice not between 3 and 5");
         String sql = query.getDefaultTemplate();
 
-        assertTrue(sql, sql.endsWith(" WHERE t0.ESTIMATED_PRICE "
-                + "NOT BETWEEN #bind($id2 'INTEGER') AND #bind($id3 'INTEGER')"));
+        assertTrue(sql, sql.endsWith("${marker2} t0.ESTIMATED_PRICE "
+                + "NOT BETWEEN #bind($id3 'INTEGER') AND #bind($id4 'INTEGER')"));
     }
 
     public void testSelectFromWhereLike() {
         SQLTemplate query = translateSelect("select p from Painting p where p.paintingTitle like 'Stuff'");
         String sql = query.getDefaultTemplate();
 
-        assertTrue(sql, sql.endsWith(" WHERE t0.PAINTING_TITLE "
+        assertTrue(sql, sql.endsWith("${marker2} t0.PAINTING_TITLE "
                 + "LIKE #bind('Stuff' 'VARCHAR')"));
     }
 
@@ -236,7 +236,7 @@
         SQLTemplate query = translateSelect("select p from Painting p where p.paintingTitle NOT like 'Stuff'");
         String sql = query.getDefaultTemplate();
 
-        assertTrue(sql, sql.endsWith(" WHERE t0.PAINTING_TITLE "
+        assertTrue(sql, sql.endsWith("${marker2} t0.PAINTING_TITLE "
                 + "NOT LIKE #bind('Stuff' 'VARCHAR')"));
     }
 
@@ -249,7 +249,7 @@
                 params);
         String sql = query.getDefaultTemplate();
         assertTrue(sql, sql
-                .endsWith("t0.ARTIST_NAME = #bind($id2) OR t0.ARTIST_NAME = #bind($id3)"));
+                .endsWith("t0.ARTIST_NAME = #bind($id3) OR t0.ARTIST_NAME = #bind($id4)"));
     }
 
     public void testMax() {

Added: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/access.DataContextEJBQLInheritanceTest.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/access.DataContextEJBQLInheritanceTest.xml?rev=609321&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/access.DataContextEJBQLInheritanceTest.xml (added)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/resources/dml/access.DataContextEJBQLInheritanceTest.xml Sun Jan  6 06:49:09 2008
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans default-lazy-init="true">	
+
+	<bean id="E1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+		<constructor-arg><value>
+		insert into PERSON (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, null, null, 'a', 1, 'EE', 20000)
+		</value></constructor-arg>
+	</bean>
+	<bean id="E2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+		<constructor-arg><value>
+		insert into PERSON (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, null, null, 'b', 2, 'EE', 25000)
+		</value></constructor-arg>
+	</bean>
+	<bean id="M1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+		<constructor-arg><value>
+		insert into PERSON (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, null, null, 'c', 4, 'EM', 30000)
+		</value></constructor-arg>
+	</bean>
+	<bean id="M2" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+		<constructor-arg><value>
+		insert into PERSON (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, null, null, 'd', 5, 'EM', 40000)
+		</value></constructor-arg>
+	</bean>
+	<bean id="C1" class="org.apache.cayenne.unit.util.UpdatingSQLTemplate">
+		<constructor-arg type="java.lang.Class"><value>org.apache.cayenne.testdo.inherit.AbstractPerson</value></constructor-arg>
+		<constructor-arg><value>
+		insert into PERSON (CLIENT_COMPANY_ID, CLIENT_CONTACT_TYPE, DEPARTMENT_ID, NAME, PERSON_ID, PERSON_TYPE, SALARY) values (null, null, null, 'e', 6, 'C', null)
+		</value></constructor-arg>
+	</bean>
+	
+	<bean id="testSelect" class="java.util.ArrayList">
+		<constructor-arg>
+			<list>
+				<ref bean="E1"/>
+				<ref bean="E2"/>
+				<ref bean="M1"/>
+				<ref bean="M2"/>
+				<ref bean="C1"/>
+			</list>
+		</constructor-arg>
+	</bean>
+</beans>
\ No newline at end of file