Author: gbayon
Date: Wed Dec 14 10:05:16 2005
New Revision: 356821

URL: http://svn.apache.org/viewcvs?rev=356821&view=rev
Log:
Fixed IBATISNET-135

Modified:
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Access/OleDb/DynamicAccount.xml
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/DynamicAccount.xml
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/DynamicAccount.xml
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/ByteFx/DynamicAccount.xml
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/DynamicAccount.xml
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/DynamicAccount.xml
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/DynamicTest.cs
    
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Access/OleDb/DynamicAccount.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Access/OleDb/DynamicAccount.xml?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Access/OleDb/DynamicAccount.xml
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Access/OleDb/DynamicAccount.xml
 Wed Dec 14 10:05:16 2005
@@ -7,7 +7,49 @@
        </alias>
                        
        <statements>
-       
+
+               <select  id="DynamicAll"
+                                       parameterClass="Account"
+                                       resultClass="Account">
+                               select
+                               Account_ID                      as Id,
+                               Account_FirstName       as FirstName,
+                               Account_LastName        as LastName,
+                               Account_Email           as EmailAddress
+                               from Accounts
+               </select>
+               
+               <select id="DynamicWithExtend"
+                               extends="DynamicAll"
+                               parameterClass="Account"
+                               resultClass="Account">
+                       <dynamic prepend="WHERE" >
+                       <isGreaterThan prepend="AND" property="Id" 
compareValue="0"  >
+                               Account_ID = #Id#
+                       </isGreaterThan>
+                       <isNotNull prepend="AND" property="Ids" >
+                               Account_ID in
+                               <iterate property="Ids" open="(" close=")"  
conjunction="," >
+                                       #Ids[]#
+                               </iterate>
+                       </isNotNull>
+                       <isNotEmpty prepend="AND" property="FirstName" >
+                               Account_FirstName = #FirstName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="LastName" >
+                               Account_LastName = #LastName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="EmailAddress" >
+                               <isEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = '[EMAIL PROTECTED]'
+                               </isEqual>
+                               <isNotEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = #EmailAddress#
+                               </isNotEqual>
+                       </isNotEmpty>
+                       </dynamic>
+               </select>
+                                       
                <!-- IBATISNET-114: remapResults -->
                <statement  id="DynamicSqlOnColumnSelection" 
                                        parameterClass="Account" 

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/DynamicAccount.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/DynamicAccount.xml?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/DynamicAccount.xml
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/DynamicAccount.xml
 Wed Dec 14 10:05:16 2005
@@ -8,6 +8,48 @@
                        
        <statements>
        
+               <select  id="DynamicAll"
+                                       parameterClass="Account"
+                                       resultClass="Account">
+                               select
+                               Account_ID                      as Id,
+                               Account_FirstName       as FirstName,
+                               Account_LastName        as LastName,
+                               Account_Email           as EmailAddress
+                               from Accounts
+               </select>
+               
+               <select id="DynamicWithExtend"
+                               extends="DynamicAll"
+                               parameterClass="Account"
+                               resultClass="Account">
+                       <dynamic prepend="WHERE" >
+                       <isGreaterThan prepend="AND" property="Id" 
compareValue="0"  >
+                               Account_ID = #Id#
+                       </isGreaterThan>
+                       <isNotNull prepend="AND" property="Ids" >
+                               Account_ID in
+                               <iterate property="Ids" open="(" close=")"  
conjunction="," >
+                                       #Ids[]#
+                               </iterate>
+                       </isNotNull>
+                       <isNotEmpty prepend="AND" property="FirstName" >
+                               Account_FirstName = #FirstName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="LastName" >
+                               Account_LastName = #LastName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="EmailAddress" >
+                               <isEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = '[EMAIL PROTECTED]'
+                               </isEqual>
+                               <isNotEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = #EmailAddress#
+                               </isNotEqual>
+                       </isNotEmpty>
+                       </dynamic>
+               </select>
+                       
                <!-- IBATISNET-114: remapResults -->
                <statement  id="DynamicSqlOnColumnSelection" 
                                        parameterClass="Account" 

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/DynamicAccount.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/DynamicAccount.xml?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/DynamicAccount.xml
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/DynamicAccount.xml
 Wed Dec 14 10:05:16 2005
@@ -7,7 +7,49 @@
        </alias>
                        
        <statements>
-       
+
+               <select  id="DynamicAll"
+                                       parameterClass="Account"
+                                       resultClass="Account">
+                               select
+                               Account_ID                      as Id,
+                               Account_FirstName       as FirstName,
+                               Account_LastName        as LastName,
+                               Account_Email           as EmailAddress
+                               from Accounts
+               </select>
+               
+               <select id="DynamicWithExtend"
+                               extends="DynamicAll"
+                               parameterClass="Account"
+                               resultClass="Account">
+                       <dynamic prepend="WHERE" >
+                       <isGreaterThan prepend="AND" property="Id" 
compareValue="0"  >
+                               Account_ID = #Id#
+                       </isGreaterThan>
+                       <isNotNull prepend="AND" property="Ids" >
+                               Account_ID in
+                               <iterate property="Ids" open="(" close=")"  
conjunction="," >
+                                       #Ids[]#
+                               </iterate>
+                       </isNotNull>
+                       <isNotEmpty prepend="AND" property="FirstName" >
+                               Account_FirstName = #FirstName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="LastName" >
+                               Account_LastName = #LastName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="EmailAddress" >
+                               <isEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = '[EMAIL PROTECTED]'
+                               </isEqual>
+                               <isNotEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = #EmailAddress#
+                               </isNotEqual>
+                       </isNotEmpty>
+                       </dynamic>
+               </select>
+                       
                <!-- IBATISNET-114: remapResults -->
                <statement  id="DynamicSqlOnColumnSelection" 
                                        parameterClass="Account" 

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/SqlClient/DynamicAccount.xml
 Wed Dec 14 10:05:16 2005
@@ -214,7 +214,17 @@
                        </iterate>
                </statement>
 
-
+               <select  id="DynamicAll"
+                                       parameterClass="Account"
+                                       resultClass="Account">
+                               select
+                               Account_ID                      as Id,
+                               Account_FirstName       as FirstName,
+                               Account_LastName        as LastName,
+                               Account_Email           as EmailAddress
+                               from Accounts
+               </select>
+               
                <statement id="DynamicQueryByExample"
                                        parameterClass="Account"
                                        resultClass="Account">
@@ -251,6 +261,37 @@
                        </dynamic>
                </statement>
 
+               <select id="DynamicWithExtend"
+                               extends="DynamicAll"
+                               parameterClass="Account"
+                               resultClass="Account">
+                       <dynamic prepend="WHERE" >
+                       <isGreaterThan prepend="AND" property="Id" 
compareValue="0"  >
+                               Account_ID = #Id#
+                       </isGreaterThan>
+                       <isNotNull prepend="AND" property="Ids" >
+                               Account_ID in
+                               <iterate property="Ids" open="(" close=")"  
conjunction="," >
+                                       #Ids[]#
+                               </iterate>
+                       </isNotNull>
+                       <isNotEmpty prepend="AND" property="FirstName" >
+                               Account_FirstName = #FirstName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="LastName" >
+                               Account_LastName = #LastName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="EmailAddress" >
+                               <isEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = '[EMAIL PROTECTED]'
+                               </isEqual>
+                               <isNotEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = #EmailAddress#
+                               </isNotEqual>
+                       </isNotEmpty>
+                       </dynamic>
+               </select>
+               
                <statement id="DynamicIterateWithPrepend1"
                                        parameterClass="list"
                                        resultClass="Account">
@@ -266,8 +307,8 @@
                                #[]#
                        </iterate>
                        </dynamic>
-               </statement>
-
+               </statement>    
+               
                <statement id="DynamicIterateWithPrepend2"
                                        parameterClass="list"
                                        resultClass="Account">

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/ByteFx/DynamicAccount.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/ByteFx/DynamicAccount.xml?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/ByteFx/DynamicAccount.xml
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/ByteFx/DynamicAccount.xml
 Wed Dec 14 10:05:16 2005
@@ -8,6 +8,48 @@
                        
        <statements>
        
+               <select  id="DynamicAll"
+                                       parameterClass="Account"
+                                       resultClass="Account">
+                               select
+                               Account_ID                      as Id,
+                               Account_FirstName       as FirstName,
+                               Account_LastName        as LastName,
+                               Account_Email           as EmailAddress
+                               from Accounts
+               </select>
+               
+               <select id="DynamicWithExtend"
+                               extends="DynamicAll"
+                               parameterClass="Account"
+                               resultClass="Account">
+                       <dynamic prepend="WHERE" >
+                       <isGreaterThan prepend="AND" property="Id" 
compareValue="0"  >
+                               Account_ID = #Id#
+                       </isGreaterThan>
+                       <isNotNull prepend="AND" property="Ids" >
+                               Account_ID in
+                               <iterate property="Ids" open="(" close=")"  
conjunction="," >
+                                       #Ids[]#
+                               </iterate>
+                       </isNotNull>
+                       <isNotEmpty prepend="AND" property="FirstName" >
+                               Account_FirstName = #FirstName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="LastName" >
+                               Account_LastName = #LastName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="EmailAddress" >
+                               <isEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = '[EMAIL PROTECTED]'
+                               </isEqual>
+                               <isNotEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = #EmailAddress#
+                               </isNotEqual>
+                       </isNotEmpty>
+                       </dynamic>
+               </select>
+                       
                <!-- IBATISNET-114: remapResults -->
                <statement  id="DynamicSqlOnColumnSelection" 
                                        parameterClass="Account" 

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/DynamicAccount.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/DynamicAccount.xml?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/DynamicAccount.xml
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MySql/MySql/DynamicAccount.xml
 Wed Dec 14 10:05:16 2005
@@ -8,6 +8,48 @@
                        
        <statements>
        
+               <select  id="DynamicAll"
+                                       parameterClass="Account"
+                                       resultClass="Account">
+                               select
+                               Account_ID                      as Id,
+                               Account_FirstName       as FirstName,
+                               Account_LastName        as LastName,
+                               Account_Email           as EmailAddress
+                               from Accounts
+               </select>
+               
+               <select id="DynamicWithExtend"
+                               extends="DynamicAll"
+                               parameterClass="Account"
+                               resultClass="Account">
+                       <dynamic prepend="WHERE" >
+                       <isGreaterThan prepend="AND" property="Id" 
compareValue="0"  >
+                               Account_ID = #Id#
+                       </isGreaterThan>
+                       <isNotNull prepend="AND" property="Ids" >
+                               Account_ID in
+                               <iterate property="Ids" open="(" close=")"  
conjunction="," >
+                                       #Ids[]#
+                               </iterate>
+                       </isNotNull>
+                       <isNotEmpty prepend="AND" property="FirstName" >
+                               Account_FirstName = #FirstName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="LastName" >
+                               Account_LastName = #LastName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="EmailAddress" >
+                               <isEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = '[EMAIL PROTECTED]'
+                               </isEqual>
+                               <isNotEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = #EmailAddress#
+                               </isNotEqual>
+                       </isNotEmpty>
+                       </dynamic>
+               </select>
+                       
                <!-- IBATISNET-114: remapResults -->
                <statement  id="DynamicSqlOnColumnSelection" 
                                        parameterClass="Account" 

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml
 Wed Dec 14 10:05:16 2005
@@ -7,7 +7,49 @@
        </alias>
                        
        <statements>
-       
+
+               <select  id="DynamicAll"
+                                       parameterClass="Account"
+                                       resultClass="Account">
+                               select
+                               Account_ID                      as Id,
+                               Account_FirstName       as FirstName,
+                               Account_LastName        as LastName,
+                               Account_Email           as EmailAddress
+                               from Accounts
+               </select>
+               
+               <select id="DynamicWithExtend"
+                               extends="DynamicAll"
+                               parameterClass="Account"
+                               resultClass="Account">
+                       <dynamic prepend="WHERE" >
+                       <isGreaterThan prepend="AND" property="Id" 
compareValue="0"  >
+                               Account_ID = #Id#
+                       </isGreaterThan>
+                       <isNotNull prepend="AND" property="Ids" >
+                               Account_ID in
+                               <iterate property="Ids" open="(" close=")"  
conjunction="," >
+                                       #Ids[]#
+                               </iterate>
+                       </isNotNull>
+                       <isNotEmpty prepend="AND" property="FirstName" >
+                               Account_FirstName = #FirstName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="LastName" >
+                               Account_LastName = #LastName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="EmailAddress" >
+                               <isEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = '[EMAIL PROTECTED]'
+                               </isEqual>
+                               <isNotEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = #EmailAddress#
+                               </isNotEqual>
+                       </isNotEmpty>
+                       </dynamic>
+               </select>
+                       
                <!-- IBATISNET-114: remapResults -->
                <statement  id="DynamicSqlOnColumnSelection" 
                                        parameterClass="Account" 

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml
 Wed Dec 14 10:05:16 2005
@@ -7,7 +7,49 @@
        </alias>
                        
        <statements>
-       
+
+               <select  id="DynamicAll"
+                                       parameterClass="Account"
+                                       resultClass="Account">
+                               select
+                               Account_ID                      as Id,
+                               Account_FirstName       as FirstName,
+                               Account_LastName        as LastName,
+                               Account_Email           as EmailAddress
+                               from Accounts
+               </select>
+               
+               <select id="DynamicWithExtend"
+                               extends="DynamicAll"
+                               parameterClass="Account"
+                               resultClass="Account">
+                       <dynamic prepend="WHERE" >
+                       <isGreaterThan prepend="AND" property="Id" 
compareValue="0"  >
+                               Account_ID = #Id#
+                       </isGreaterThan>
+                       <isNotNull prepend="AND" property="Ids" >
+                               Account_ID in
+                               <iterate property="Ids" open="(" close=")"  
conjunction="," >
+                                       #Ids[]#
+                               </iterate>
+                       </isNotNull>
+                       <isNotEmpty prepend="AND" property="FirstName" >
+                               Account_FirstName = #FirstName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="LastName" >
+                               Account_LastName = #LastName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="EmailAddress" >
+                               <isEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = '[EMAIL PROTECTED]'
+                               </isEqual>
+                               <isNotEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = #EmailAddress#
+                               </isNotEqual>
+                       </isNotEmpty>
+                       </dynamic>
+               </select>
+                       
                <!-- IBATISNET-114: remapResults -->
                <statement  id="DynamicSqlOnColumnSelection" 
                                        parameterClass="Account" 

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/DynamicAccount.xml
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/DynamicAccount.xml?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/DynamicAccount.xml
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/DynamicAccount.xml
 Wed Dec 14 10:05:16 2005
@@ -7,7 +7,49 @@
        </alias>
                        
        <statements>
-       
+
+               <select  id="DynamicAll"
+                                       parameterClass="Account"
+                                       resultClass="Account">
+                               select
+                               Account_ID                      as Id,
+                               Account_FirstName       as FirstName,
+                               Account_LastName        as LastName,
+                               Account_Email           as EmailAddress
+                               from Accounts
+               </select>
+               
+               <select id="DynamicWithExtend"
+                               extends="DynamicAll"
+                               parameterClass="Account"
+                               resultClass="Account">
+                       <dynamic prepend="WHERE" >
+                       <isGreaterThan prepend="AND" property="Id" 
compareValue="0"  >
+                               Account_ID = #Id#
+                       </isGreaterThan>
+                       <isNotNull prepend="AND" property="Ids" >
+                               Account_ID in
+                               <iterate property="Ids" open="(" close=")"  
conjunction="," >
+                                       #Ids[]#
+                               </iterate>
+                       </isNotNull>
+                       <isNotEmpty prepend="AND" property="FirstName" >
+                               Account_FirstName = #FirstName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="LastName" >
+                               Account_LastName = #LastName#
+                       </isNotEmpty>
+                       <isNotEmpty prepend="AND" property="EmailAddress" >
+                               <isEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = '[EMAIL PROTECTED]'
+                               </isEqual>
+                               <isNotEqual property="EmailAddress" 
compareValue="Joe">
+                               Account_Email = #EmailAddress#
+                               </isNotEqual>
+                       </isNotEmpty>
+                       </dynamic>
+               </select>
+                       
                <!-- IBATISNET-114: remapResults -->
                <statement  id="DynamicSqlOnColumnSelection" 
                                        parameterClass="Account" 

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/DynamicTest.cs
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/DynamicTest.cs?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/DynamicTest.cs
 (original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/DynamicTest.cs
 Wed Dec 14 10:05:16 2005
@@ -305,6 +305,21 @@
                }
 
                /// <summary>
+               /// Test Dynamic With Extend
+               /// </summary>
+               [Test]
+               public void TestDynamicWithExtend() 
+               {
+                       Account account = new Account();
+                       account.Id = -1;
+                       
+                       IList list = sqlMap.QueryForList("DynamicWithExtend", 
account);
+                       
+                       AssertAccount1((Account) list[0]);
+                       Assert.AreEqual(5, list.Count);
+               }
+
+               /// <summary>
                /// Test Multiple Iterate
                /// </summary>
                [Test]

Modified: 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs
URL: 
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs?rev=356821&r1=356820&r2=356821&view=diff
==============================================================================
--- 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs 
(original)
+++ 
ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Configuration/DomSqlMapBuilder.cs 
Wed Dec 14 10:05:16 2005
@@ -314,6 +314,7 @@
                {
                        _configScope = new ConfigurationScope();
                        _configScope.ValidateSqlMapConfig = 
validateSqlMapConfig;
+                       _deSerializerFactory = new 
DeSerializerFactory(_configScope);
                        _paramParser = new InlineParameterMapParser( 
_configScope.ErrorContext );
                }               
                #endregion 


Reply via email to