You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by gb...@apache.org on 2005/03/01 19:19:59 UTC
svn commit: r155808 -
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope
Author: gbayon
Date: Tue Mar 1 10:19:54 2005
New Revision: 155808
URL: http://svn.apache.org/viewcvs?view=rev&rev=155808
Log:
- Added unit tests for subMap/Oledb + subMap/Odbc
Added:
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/Document.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/document.xml
Modified:
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/LineItem.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/LineItem.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/RequestScope.cs
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj?view=diff&r1=155807&r2=155808
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj Tue Mar 1 10:19:54 2005
@@ -310,6 +310,10 @@
BuildAction = "Content"
/>
<File
+ RelPath = "Maps\MSSQL\Odbc\Document.xml"
+ BuildAction = "Content"
+ />
+ <File
RelPath = "Maps\MSSQL\Odbc\DynamicAccount.xml"
BuildAction = "Content"
/>
@@ -343,6 +347,10 @@
/>
<File
RelPath = "Maps\MSSQL\OleDb\Complex.xml"
+ BuildAction = "Content"
+ />
+ <File
+ RelPath = "Maps\MSSQL\OleDb\document.xml"
BuildAction = "Content"
/>
<File
Added: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/Document.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/Document.xml?view=auto&rev=155808
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/Document.xml (added)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/Document.xml Tue Mar 1 10:19:54 2005
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<sqlMap namespace="Document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+
+ <alias>
+ <typeAlias alias="Document" type="IBatisNet.DataMapper.Test.Domain.Document, IBatisNet.DataMapper.Test" />
+ <typeAlias alias="Book" type="IBatisNet.DataMapper.Test.Domain.Book, IBatisNet.DataMapper.Test" />
+ <typeAlias alias="Newspaper" type="IBatisNet.DataMapper.Test.Domain.Newspaper, IBatisNet.DataMapper.Test" />
+ <typeAlias alias="MyFormula" type="IBatisNet.DataMapper.Test.Domain.MyFormula, IBatisNet.DataMapper.Test" />
+ </alias>
+
+ <resultMaps>
+ <resultMap id="document" class="Document">
+ <result property="Id" column="Document_ID"/>
+ <result property="Title" column="Document_Title"/>
+ <discriminator column="Document_Type" />
+ <subMap value="Book" resultMapping="book" />
+ <subMap value="Newspaper" resultMapping="newspaper" />
+ </resultMap>
+
+ <resultMap id="document-custom-formula" class="Document">
+ <result property="Id" column="Document_ID"/>
+ <result property="Title" column="Document_Title"/>
+ <discriminator formula="MyFormula" />
+ <subMap value="Book" resultMapping="book" />
+ <subMap value="Newspaper" resultMapping="newspaper" />
+ </resultMap>
+
+ <resultMap id="book" class="Book" extends="document">
+ <result property="PageNumber" column="Document_PageNumber"/>
+ </resultMap>
+
+ <resultMap id="newspaper" class="Newspaper" extends="document">
+ <result property="City" column="Document_City"/>
+ </resultMap>
+
+ </resultMaps>
+
+ <statements>
+
+ <statement id="GetAllDocument"
+ resultMap="document">
+ select
+ *
+ from Documents
+ order by Document_Type, Document_Id
+ </statement>
+
+ <statement id="GetAllDocumentWithFormula"
+ resultMap="document-custom-formula">
+ select
+ *
+ from Documents
+ order by Document_Type, Document_Id
+ </statement>
+
+ </statements>
+
+
+</sqlMap>
\ No newline at end of file
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/LineItem.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/LineItem.xml?view=diff&r1=155807&r2=155808
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/LineItem.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/Odbc/LineItem.xml Tue Mar 1 10:19:54 2005
@@ -163,6 +163,14 @@
(#Id#, #Order.Id#, #Code#, #Quantity#, #Price:Decimal#)
</insert>
+ <!-- JIRA 23 -->
+ <delete id="DeleteWithComments" >
+ <!-- Delete LineItems -->
+ delete from LineItems where Order_ID = 10
+ <!-- Delete LineItems -->
+ delete from LineItems where Order_ID = 9
+ </delete>
+
</statements>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/LineItem.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/LineItem.xml?view=diff&r1=155807&r2=155808
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/LineItem.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/LineItem.xml Tue Mar 1 10:19:54 2005
@@ -163,6 +163,14 @@
(#Id#, #Order.Id#, #Code#, #Quantity#, #Price:Decimal#)
</insert>
+ <!-- JIRA 23 -->
+ <delete id="DeleteWithComments" >
+ <!-- Delete LineItems -->
+ delete from LineItems where Order_ID = 10
+ <!-- Delete LineItems -->
+ delete from LineItems where Order_ID = 9
+ </delete>
+
</statements>
Added: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/document.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/document.xml?view=auto&rev=155808
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/document.xml (added)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/MSSQL/OleDb/document.xml Tue Mar 1 10:19:54 2005
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<sqlMap namespace="Document" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="SqlMap.xsd">
+
+ <alias>
+ <typeAlias alias="Document" type="IBatisNet.DataMapper.Test.Domain.Document, IBatisNet.DataMapper.Test" />
+ <typeAlias alias="Book" type="IBatisNet.DataMapper.Test.Domain.Book, IBatisNet.DataMapper.Test" />
+ <typeAlias alias="Newspaper" type="IBatisNet.DataMapper.Test.Domain.Newspaper, IBatisNet.DataMapper.Test" />
+ <typeAlias alias="MyFormula" type="IBatisNet.DataMapper.Test.Domain.MyFormula, IBatisNet.DataMapper.Test" />
+ </alias>
+
+ <resultMaps>
+ <resultMap id="document" class="Document">
+ <result property="Id" column="Document_ID"/>
+ <result property="Title" column="Document_Title"/>
+ <discriminator column="Document_Type" />
+ <subMap value="Book" resultMapping="book" />
+ <subMap value="Newspaper" resultMapping="newspaper" />
+ </resultMap>
+
+ <resultMap id="document-custom-formula" class="Document">
+ <result property="Id" column="Document_ID"/>
+ <result property="Title" column="Document_Title"/>
+ <discriminator formula="MyFormula" />
+ <subMap value="Book" resultMapping="book" />
+ <subMap value="Newspaper" resultMapping="newspaper" />
+ </resultMap>
+
+ <resultMap id="book" class="Book" extends="document">
+ <result property="PageNumber" column="Document_PageNumber"/>
+ </resultMap>
+
+ <resultMap id="newspaper" class="Newspaper" extends="document">
+ <result property="City" column="Document_City"/>
+ </resultMap>
+
+ </resultMaps>
+
+ <statements>
+
+ <statement id="GetAllDocument"
+ resultMap="document">
+ select
+ *
+ from Documents
+ order by Document_Type, Document_Id
+ </statement>
+
+ <statement id="GetAllDocumentWithFormula"
+ resultMap="document-custom-formula">
+ select
+ *
+ from Documents
+ order by Document_Type, Document_Id
+ </statement>
+
+ </statements>
+
+
+</sqlMap>
\ No newline at end of file
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config?view=diff&r1=155807&r2=155808
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/IBatisNet.DataMapper.Test.dll.config Tue Mar 1 10:19:54 2005
@@ -17,7 +17,7 @@
<!-- To test MySql via ByteFx value="ByteFx" -->
<!-- To test via OleDb provider (any database) value="OleDb" -->
<!-- To test via Odbc provider (any database) value="Odbc" -->
- <add key="providerType" value="SqlClient"/>
+ <add key="providerType" value="OleDb"/>
</appSettings>
<!-- This section contains the log4net configuration settings -->
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config?view=diff&r1=155807&r2=155808
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_Odbc.config Tue Mar 1 10:19:54 2005
@@ -12,7 +12,7 @@
<database>
<provider name="Odbc1.1"/>
<!-- You can't use ${propertie} because the string Driver={SQL Server} interfer with the ${propertie} syntax analyser-->
- <dataSource name="iBatisNet" connectionString="Driver={SQL Server};Server=(local)\NetSDK;Database=IBatisNet;Uid=IBatisNet;Pwd=test;"/>
+ <dataSource name="iBatisNet" connectionString="Driver={SQL Server};Server=TOMATE;Database=IBatisNet;Uid=IBatisNet;Pwd=test;"/>
</database>
<alias>
@@ -29,6 +29,7 @@
<sqlMap resource="Maps\MSSQL\Odbc\Enumeration.xml"/>
<sqlMap resource="Maps\MSSQL\Odbc\Other.xml"/>
<sqlMap resource="Maps/MSSQL/SqlClient/ResultClass.xml"/>
+ <sqlMap resource="Maps/MSSQL/SqlClient/Document.xml"/>
</sqlMaps>
</sqlMapConfig>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config?view=diff&r1=155807&r2=155808
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_MSSQL_OleDb.config Tue Mar 1 10:19:54 2005
@@ -29,6 +29,7 @@
<sqlMap resource="Maps\MSSQL\OleDb\Enumeration.xml"/>
<sqlMap resource="Maps\MSSQL\OleDb\Other.xml"/>
<sqlMap resource="Maps/MSSQL/SqlClient/ResultClass.xml"/>
+ <sqlMap resource="Maps/MSSQL/SqlClient/Document.xml"/>
</sqlMaps>
</sqlMapConfig>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/RequestScope.cs
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/RequestScope.cs?view=diff&r1=155807&r2=155808
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/RequestScope.cs (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper/Scope/RequestScope.cs Tue Mar 1 10:19:54 2005
@@ -92,13 +92,13 @@
#region Method
/// <summary>
- /// Check if the ResultMap is well set, process case of subMap resultMap
+ /// Check if the ResultMap is well set, process case of subMap resultMap.
/// </summary>
/// <param name="dataReader">The current IDataReader</param>
public void SetResultMap(IDataReader dataReader)
{
_initialResultMap = _resultMap;
- if (_resultMap != null && _resultMap.Discriminator != null)
+ if (_resultMap.Discriminator != null)
{
_resultMap = _resultMap.Discriminator.GetResultMap(dataReader);
if (_resultMap==null)