Author: roberto
Date: Sat Apr 1 22:10:28 2006
New Revision: 390782
URL: http://svn.apache.org/viewcvs?rev=390782&view=rev
Log:
~Updated C# DataMapper Oracle NUnit SqlMaps
Added:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Simple.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Simple.xml
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Category.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Enumeration.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/ParameterClass.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Category.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Enumeration.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/LineItem.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/ParameterClass.xml
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.csproj
Sat Apr 1 22:10:28 2006
@@ -722,6 +722,10 @@
BuildAction = "Content"
/>
<File
+ RelPath = "Maps\Oracle\OracleClient\Simple.xml"
+ BuildAction = "Content"
+ />
+ <File
RelPath = "Maps\PostgreSQL\Npgsql\Account.xml"
BuildAction = "Content"
/>
@@ -1166,6 +1170,10 @@
/>
<File
RelPath = "Scripts\Oracle\other-init.sql"
+ BuildAction = "Content"
+ />
+ <File
+ RelPath = "Scripts\Oracle\simple-init.sql"
BuildAction = "Content"
/>
<File
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml
Sat Apr 1 22:10:28 2006
@@ -312,7 +312,8 @@
</select>
<select id="GetAccountViaInlineParameters"
- resultMap="indexed-account-result">
+ resultMap="indexed-account-result"
+ parameterClass="Account">
select
Account_ID,
Account_FirstName,
@@ -664,24 +665,24 @@
============================================= -->
<parameterMaps>
- <parameterMap id="stored-proc-refcursor-param">
+ <parameterMap id="stored-proc-refcursor-param"
class="Hashtable">
<!--
<parameter direction="Output" column="P_ACCOUNTS"
dbType="RefCursor"/>
-->
<parameter property="P_ACCOUNTS" direction="Output"
column="P_ACCOUNTS" dbType="RefCursor"/>
</parameterMap>
- <parameterMap id="stored-proc-refcursor-param-with-input">
+ <parameterMap id="stored-proc-refcursor-param-with-input"
class="Hashtable">
<parameter property="P_ACCOUNTS" direction="Output"
column="P_ACCOUNTS" dbType="RefCursor"/>
<parameter property="P_ACCOUNT_ID" direction="Input"
column="P_ACCOUNT_ID" dbType="Int32"/>
</parameterMap>
- <parameterMap id="swap-params">
+ <parameterMap id="swap-params" class="Hashtable">
<parameter property="email1" column="p_First"
direction="InputOutput" dbType="Varchar2" size="64"/>
<parameter property="email2" column="p_Second"
direction="InputOutput" dbType="Varchar2" size="64"/>
</parameterMap>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="Account">
<parameter property="Id"/>
<parameter property="FirstName" dbType="Varchar2"
size="32"/>
<parameter property="LastName" dbType="Varchar2"
size="32"/>
@@ -690,14 +691,14 @@
<parameter property="CartOption"
column="Account_Cart_Option" typeHandler="HundredsBool"/>
</parameterMap>
- <parameterMap id="update-params">
+ <parameterMap id="update-params" class="Account">
<parameter property="FirstName" dbType="Varchar2"
size="32"/>
<parameter property="LastName" dbType="Varchar2"
size="32"/>
<parameter property="EmailAddress" dbType="Varchar2"
size="128" nullValue="[EMAIL PROTECTED]"/>
<parameter property="Id" dbType="Int32"/>
</parameterMap>
- <parameterMap id="update-params2">
+ <parameterMap id="update-params2" class="Account">
<parameter property="Id" dbType="Int32"/>
<parameter property="FirstName" dbType="Varchar2"
size="32" />
<parameter property="LastName" dbType="Varchar2"
size="32" />
@@ -705,7 +706,7 @@
<parameter property="Id" dbType="Int32"/>
</parameterMap>
- <parameterMap id="account-repeat-param">
+ <parameterMap id="account-repeat-param" class="Account">
<parameter property="Id" dbType="Int32"/>
<parameter property="Id" dbType="Int32"/>
<parameter property="FirstName" dbType="Varchar2"
size="32"/>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Category.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Category.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Category.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Category.xml
Sat Apr 1 22:10:28 2006
@@ -6,7 +6,24 @@
<typeAlias alias="Category"
type="IBatisNet.DataMapper.Test.Domain.Category, IBatisNet.DataMapper.Test"/>
</alias>
+ <resultMaps>
+ <resultMap id="Category-result" class="Category">
+ <result property="Id" column="Category_ID"/>
+ <result property="Name" column="Category_Name"/>
+ <result property="Guid" column="Category_Guid"
nullValue="00000000-0000-0000-0000-000000000000"/>
+ </resultMap>
+ </resultMaps >
+
<statements>
+
+ <select id="GetCategoryWithNullValueReplacementGuid"
resultMap="Category-result" >
+ select
+ Category_ID,
+ Category_Name,
+ Category_Guid
+ from Categories
+ where Category_ID = #value#
+ </select>
<select id="GetCategory" parameterClass="int"
resultClass="Category">
select
@@ -132,13 +149,13 @@
<parameterMaps>
- <parameterMap id="InsertCategoryViaInsertStatementParamMap">
+ <parameterMap id="InsertCategoryViaInsertStatementParamMap"
class="Category">
<parameter property="Id" column="p_Category_Id"
dbType="Int32" />
<parameter property="Name" column="p_Category_Name"
dbType="Varchar2" size="32"/>
<parameter property="GuidString"
column="p_Category_Guid" dbType="Varchar2" size="36"/>
</parameterMap>
- <parameterMap id="stored-proc-insert-params">
+ <parameterMap id="stored-proc-insert-params" class="Hashtable">
<parameter property="Name" direction="Input"
column="p_Category_Name" dbType="Varchar2" size="32"/>
<parameter property="GuidString" direction="Input"
column="p_Category_Guid" dbType="Varchar2" size="36"/>
<parameter property="Id" direction="Output"
column="p_Category_Id" dbType="Int32" />
@@ -157,24 +174,24 @@
property is already positioned as the first parameter in the
parameterMap
when it needs to be the last parameter in an UPDATE statement.
-->
- <parameterMap id="InsertParam">
+ <parameterMap id="InsertParam" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32" />
<parameter property="Name" column="Category_Name"
dbType="Varchar2" size="32"/>
<parameter property="GuidString" column="Category_Guid"
dbType="Varchar2" size="36"/>
</parameterMap>
- <parameterMap id="InsertParamWithoutId">
+ <parameterMap id="InsertParamWithoutId" class="Category">
<parameter property="Name" column="Category_Name"
dbType="Varchar2" size="32"/>
<parameter property="GuidString" column="Category_Guid"
dbType="Varchar2" size="36"/>
</parameterMap>
- <parameterMap id="insert-null-params">
+ <parameterMap id="insert-null-params" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32" />
<parameter property="Name" column="Category_Name"
dbType="Varchar2" size="32"/>
<parameter property="GuidString" column="Category_Guid"
nullValue="00000000-0000-0000-0000-000000000000" dbType="Varchar2" size="36"/>
</parameterMap>
- <parameterMap id="UpdateParam" extends="InsertParamWithoutId">
+ <parameterMap id="UpdateParam" extends="InsertParamWithoutId"
class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32"/>
</parameterMap>
@@ -192,27 +209,27 @@
property is already positioned as the first parameter in the
parameterMap
when it needs to be the last parameter in an UPDATE statement.
-->
- <parameterMap id="insert-generate-params">
+ <parameterMap id="insert-generate-params" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32" />
<parameter property="Name" column="Category_Name"/>
<parameter property="GuidString" column="Category_Guid"
dbType="Varchar2"/>
</parameterMap>
- <parameterMap id="insert-generate-params-without-id">
+ <parameterMap id="insert-generate-params-without-id"
class="Category">
<parameter property="Name" column="Category_Name"/>
<parameter property="GuidString" column="Category_Guid"
dbType="Varchar2"/>
</parameterMap>
- <parameterMap id="update-generate-params"
extends="insert-generate-params-without-id">
+ <parameterMap id="update-generate-params"
extends="insert-generate-params-without-id" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32"/>
</parameterMap>
- <parameterMap id="delete-generate-params">
+ <parameterMap id="delete-generate-params" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32"/>
<parameter property="Name" column="Category_Name"/>
</parameterMap>
- <parameterMap id="select-generate-params">
+ <parameterMap id="select-generate-params" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32"/>
</parameterMap>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Enumeration.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Enumeration.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Enumeration.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Enumeration.xml
Sat Apr 1 22:10:28 2006
@@ -49,7 +49,7 @@
</statements>
<parameterMaps>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="Enumeration">
<parameter property="Id" column="Enum_ID"
dbType="Int32"/>
<parameter property="Day" column="Enum_Day"
dbType="Int32"/>
<parameter property="Color" column="Enum_Color"
dbType="Int32"/>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.xml
Sat Apr 1 22:10:28 2006
@@ -193,7 +193,7 @@
<parameterMaps>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="LineItem">
<parameter property="Id" dbType="Int32" />
<parameter property="Order.Id" dbType="Int32" />
<parameter property="Code" dbType="Varchar2" size="32"
/>
@@ -201,7 +201,7 @@
<parameter property="Price" dbType="Decimal"
precision="18" scale="2" nullValue="-99.99"/>
</parameterMap>
- <parameterMap id="insert-params-picture">
+ <parameterMap id="insert-params-picture" class="LineItem">
<parameter property="Id" dbType="Int32" />
<parameter property="Order.Id" dbType="Int32" />
<parameter property="Code" dbType="Varchar2" size="32"
/>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml
Sat Apr 1 22:10:28 2006
@@ -441,7 +441,7 @@
<parameterMaps>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="Order">
<parameter property="Id" dbType="Int32"/>
<parameter property="Account.Id" dbType="Int32"/>
<parameter property="OrderDate" dbType="Date"
nullValue="01/01/0001 00:00:00" />
@@ -454,7 +454,7 @@
<parameter property="PostalCode" dbType="Varchar2"
size="32"/>
</parameterMap>
- <parameterMap id="params-parent"> <!-- 1043181 support request
-->
+ <parameterMap id="params-parent" class="Order"> <!-- 1043181
support request -->
<parameter property="Id" dbType="Int32"/>
<parameter property="Account.Id" dbType="Int32"/>
<parameter property="OrderDate" dbType="Date"
nullValue="01/01/0001 00:00:00" />
@@ -467,7 +467,7 @@
<parameter property="PostalCode" dbType="Varchar2"
size="32"/>
</parameterMap>
- <parameterMap id="insert-extend" extends="params-parent">
+ <parameterMap id="insert-extend" extends="params-parent"
class="Order">
</parameterMap>
</parameterMaps>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml
(original)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml
Sat Apr 1 22:10:28 2006
@@ -180,7 +180,7 @@
</statements>
<parameterMaps>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="Other">
<parameter property="Int" />
<parameter property="Long" />
<parameter property="Bool" typeHandler="OneZeroBool"/>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/ParameterClass.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/ParameterClass.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/ParameterClass.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/ParameterClass.xml
Sat Apr 1 22:10:28 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<sqlMap namespace="ParameterClass" xmlns="http://ibatis.apache.org/mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://ibatis.apache.org
http://ibatis.apache.org/xsd/SqlMap.xsd">
<statements>
- <select id="GetCountOfAccountsWithNullEmail">
+ <select id="GetCountOfAccountsWithNullEmail" resultClass="Int">
SELECT COUNT(*) FROM Accounts WHERE Account_Email IS
NULL
</select>
<update id="UpdateNullEmailToDBNull" parameterClass="Hashtable">
Added:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Simple.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Simple.xml?rev=390782&view=auto
==============================================================================
--- ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Simple.xml
(added)
+++ ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Simple.xml
Sat Apr 1 22:10:28 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<sqlMap namespace="Simple"
+xmlns="http://ibatis.apache.org/mapping"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<alias>
+ <typeAlias alias="Simple" type="IBatisNet.DataMapper.Test.Domain.Simple,
IBatisNet.DataMapper.Test"/>
+</alias>
+
+<statements>
+
+ <update id="UpdateSimple" parameterClass="Simple" >
+ update Simples
+ set
+ name = #Name#,
+ address = #Address#,
+ count = #Count#,
+ "date" = #Date#,
+ pay = #Pay#
+ where
+ id = #Id#
+ </update>
+
+
+ <delete id="DeleteSimple" parameterClass="int">
+ delete Simples
+ where
+ id = #value#
+ </delete>
+
+ <insert id="InsertSimple" parameterClass="Simple" >
+ insert into Simples ( name, address, count, "date", pay, id )
+ values
+ (#Name#, #Address#, #Count#, #Date#, #Pay#, #Id#)
+ </insert>
+
+</statements>
+</sqlMap>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml
Sat Apr 1 22:10:28 2006
@@ -54,11 +54,11 @@
<property name="Type" value="Weak"/>
</cacheModel>
+
<cacheModel id="rw-account-cache" implementation="FIFO"
serialize="true" readOnly="false">
<flushInterval hours="24"/>
<flushOnExecute
statement="UpdateAccountViaInlineParameters"/>
</cacheModel>
-
</cacheModels>
<alias>
@@ -161,7 +161,7 @@
resultMap="account-result"
cacheModel="rw-account-cache"
extends="GetCachedAccountsViaResultMap">
</select>
-
+
<select id="GetNoAccountWithCache"
parameterClass="Integer"
resultMap="account-hashtable-result"
@@ -450,6 +450,18 @@
<!-- Inline Parameters -->
+
+ <!-- Inline Parameters #EmailAddress:VarChar:[EMAIL PROTECTED]>
+ <update id="UpdateAccountViaInlineParameters"
+ parameterClass="Account">
+ update Accounts set
+ Account_FirstName = #FirstName#,
+ Account_LastName = #LastName#,
+ Account_Email =
#EmailAddress,type=string,dbType=Varchar,[EMAIL PROTECTED]
+ where
+ Account_ID = #Id#
+ </update>
+ <!--
<update id="UpdateAccountViaInlineParameters"
parameterClass="Account">
update Accounts set
@@ -459,6 +471,7 @@
where
Account_ID = #Id#
</update>
+ -->
<insert id="InsertAccountViaInlineParameters"
parameterClass="Account" >
@@ -631,24 +644,24 @@
============================================= -->
<parameterMaps>
- <parameterMap id="stored-proc-refcursor-param">
+ <parameterMap id="stored-proc-refcursor-param"
class="Hashtable">
<!--
<parameter direction="Output" column="P_ACCOUNTS"
dbType="RefCursor"/>
-->
<parameter property="P_ACCOUNTS" direction="Output"
column="P_ACCOUNTS" dbType="Cursor"/>
</parameterMap>
- <parameterMap id="stored-proc-refcursor-param-with-input">
+ <parameterMap id="stored-proc-refcursor-param-with-input"
class="Hashtable">
<parameter property="P_ACCOUNTS" direction="Output"
column="P_ACCOUNTS" dbType="Cursor"/>
<parameter property="P_ACCOUNT_ID" direction="Input"
column="P_ACCOUNT_ID" dbType="Int"/>
</parameterMap>
- <parameterMap id="swap-params">
+ <parameterMap id="swap-params" class="Hashtable">
<parameter property="email1" column="p_First" />
<parameter property="email2" column="p_Second" />
</parameterMap>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="Account">
<parameter property="Id" />
<parameter property="FirstName" />
<parameter property="LastName" />
@@ -657,14 +670,14 @@
<parameter property="CartOption"
column="Account_Cart_Option" typeHandler="HundredsBool"/>
</parameterMap>
- <parameterMap id="update-params">
+ <parameterMap id="update-params" class="Account">
<parameter property="FirstName" />
<parameter property="LastName" />
<parameter property="EmailAddress" nullValue="[EMAIL
PROTECTED]"/>
<parameter property="Id" />
</parameterMap>
- <parameterMap id="update-params2">
+ <parameterMap id="update-params2" class="Account">
<parameter property="Id" />
<parameter property="FirstName" />
<parameter property="LastName" />
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Category.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Category.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Category.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Category.xml
Sat Apr 1 22:10:28 2006
@@ -6,8 +6,25 @@
<typeAlias alias="Category"
type="IBatisNet.DataMapper.Test.Domain.Category, IBatisNet.DataMapper.Test"/>
</alias>
+ <resultMaps>
+ <resultMap id="Category-result" class="Category">
+ <result property="Id" column="Category_ID"/>
+ <result property="Name" column="Category_Name"/>
+ <result property="Guid" column="Category_Guid"
nullValue="00000000-0000-0000-0000-000000000000"/>
+ </resultMap>
+ </resultMaps >
+
<statements>
-
+
+ <select id="GetCategoryWithNullValueReplacementGuid"
resultMap="Category-result" >
+ select
+ Category_ID,
+ Category_Name,
+ Category_Guid
+ from Categories
+ where Category_ID = #value#
+ </select>
+
<select id="GetCategory" parameterClass="int"
resultClass="Category">
select
Category_ID as Id,
@@ -82,7 +99,7 @@
<!--
NOTE: Use parameterMap CLR "type" attribute to define OUT
parameter
-->
- <procedure id="InsertCategoryViaStoreProcedure"
parameterMap="insert-params">
+ <procedure id="InsertCategoryViaStoreProcedure"
parameterMap="insertMap-params">
prc_InsertCategory
</procedure>
@@ -132,7 +149,13 @@
</statements>
<parameterMaps>
- <parameterMap id="insert-params">
+ <parameterMap id="insertMap-params" class="Hashtable">
+ <parameter property="Name" column="p_Category_Name"/>
+ <parameter property="GuidString"
column="p_Category_Guid" dbType="VarChar"/>
+ <parameter property="Id" column="p_Category_Id"
dbType="Int32" type="Int"/>
+ </parameterMap>
+
+ <parameterMap id="insert-params" class="Category">
<parameter property="Name" column="p_Category_Name"/>
<parameter property="GuidString"
column="p_Category_Guid" dbType="VarChar"/>
<parameter property="Id" column="p_Category_Id"
dbType="Int32" type="Int"/>
@@ -151,24 +174,24 @@
property is already positioned as the first parameter in the
parameterMap
when it needs to be the last parameter in an UPDATE statement.
-->
- <parameterMap id="InsertParam">
+ <parameterMap id="InsertParam" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32" />
<parameter property="Name" column="Category_Name"/>
<parameter property="GuidString" column="Category_Guid"
dbType="VarChar"/>
</parameterMap>
- <parameterMap id="InsertParamWithoutId">
+ <parameterMap id="InsertParamWithoutId" class="Category">
<parameter property="Name" column="Category_Name"/>
<parameter property="GuidString" column="Category_Guid"
dbType="VarChar"/>
</parameterMap>
- <parameterMap id="insert-null-params">
+ <parameterMap id="insert-null-params" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32" />
<parameter property="Name" column="Category_Name"/>
<parameter property="GuidString" column="Category_Guid"
nullValue="00000000-0000-0000-0000-000000000000" dbType="VarChar"/>
</parameterMap>
- <parameterMap id="UpdateParam" extends="InsertParamWithoutId">
+ <parameterMap id="UpdateParam" extends="InsertParamWithoutId"
class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32"/>
</parameterMap>
@@ -186,27 +209,27 @@
property is already positioned as the first parameter in the
parameterMap
when it needs to be the last parameter in an UPDATE statement.
-->
- <parameterMap id="insert-generate-params">
+ <parameterMap id="insert-generate-params" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32" />
<parameter property="Name" column="Category_Name"/>
<parameter property="GuidString" column="Category_Guid"
dbType="VarChar"/>
</parameterMap>
- <parameterMap id="insert-generate-params-without-id">
+ <parameterMap id="insert-generate-params-without-id"
class="Category">
<parameter property="Name" column="Category_Name"/>
<parameter property="GuidString" column="Category_Guid"
dbType="VarChar"/>
</parameterMap>
- <parameterMap id="update-generate-params"
extends="insert-generate-params-without-id">
+ <parameterMap id="update-generate-params"
extends="insert-generate-params-without-id" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32"/>
</parameterMap>
- <parameterMap id="delete-generate-params">
+ <parameterMap id="delete-generate-params" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32"/>
<parameter property="Name" column="Category_Name"/>
</parameterMap>
- <parameterMap id="select-generate-params">
+ <parameterMap id="select-generate-params" class="Category">
<parameter property="Id" column="Category_Id"
dbType="Int32"/>
</parameterMap>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Enumeration.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Enumeration.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Enumeration.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Enumeration.xml
Sat Apr 1 22:10:28 2006
@@ -49,7 +49,7 @@
</statements>
<parameterMaps>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="Enumeration">
<parameter property="Id" column="Enum_ID" />
<parameter property="Day" column="Enum_Day"/>
<parameter property="Color" column="Enum_Color" />
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/LineItem.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/LineItem.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/LineItem.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/LineItem.xml
Sat Apr 1 22:10:28 2006
@@ -184,7 +184,7 @@
<parameterMaps>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="LineItem">
<parameter property="Id" />
<parameter property="Order.Id" />
<parameter property="Code" />
@@ -192,7 +192,7 @@
<parameter property="Price" nullValue="-99.99"/>
</parameterMap>
- <parameterMap id="insert-params-picture">
+ <parameterMap id="insert-params-picture" class="LineItem">
<parameter property="Id" />
<parameter property="Order.Id" />
<parameter property="Code" />
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml
Sat Apr 1 22:10:28 2006
@@ -423,7 +423,7 @@
<parameterMaps>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="Order">
<parameter property="Id" dbType="Int32"/>
<parameter property="Account.Id"/>
<parameter property="OrderDate" nullValue="01/01/0001
00:00:00" />
@@ -436,7 +436,7 @@
<parameter property="PostalCode" />
</parameterMap>
- <parameterMap id="params-parent"> <!-- 1043181 support request
-->
+ <parameterMap id="params-parent" class="Order"> <!-- 1043181
support request -->
<parameter property="Id" dbType="Int32"/>
<parameter property="Account.Id"/>
<parameter property="OrderDate" nullValue="01/01/0001
00:00:00" />
@@ -449,7 +449,7 @@
<parameter property="PostalCode" />
</parameterMap>
- <parameterMap id="insert-extend" extends="params-parent">
+ <parameterMap id="insert-extend" extends="params-parent"
class="Order">
</parameterMap>
</parameterMaps>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml
Sat Apr 1 22:10:28 2006
@@ -160,7 +160,7 @@
</statements>
<parameterMaps>
- <parameterMap id="insert-params">
+ <parameterMap id="insert-params" class="Other">
<parameter property="Int" />
<parameter property="Long" />
<parameter property="Bool" typeHandler="OneZeroBool"/>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/ParameterClass.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/ParameterClass.xml?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/ParameterClass.xml
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/ParameterClass.xml
Sat Apr 1 22:10:28 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<sqlMap namespace="ParameterClass" xmlns="http://ibatis.apache.org/mapping"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://ibatis.apache.org
http://ibatis.apache.org/xsd/SqlMap.xsd">
<statements>
- <select id="GetCountOfAccountsWithNullEmail">
+ <select id="GetCountOfAccountsWithNullEmail" resultClass="Int">
SELECT COUNT(*) FROM Accounts WHERE Account_Email IS
NULL
</select>
<update id="UpdateNullEmailToDBNull" parameterClass="Hashtable">
Added:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Simple.xml
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Simple.xml?rev=390782&view=auto
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Simple.xml
(added)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Simple.xml
Sat Apr 1 22:10:28 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<sqlMap namespace="Simple"
+xmlns="http://ibatis.apache.org/mapping"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<alias>
+ <typeAlias alias="Simple" type="IBatisNet.DataMapper.Test.Domain.Simple,
IBatisNet.DataMapper.Test"/>
+</alias>
+
+<statements>
+
+ <update id="UpdateSimple" parameterClass="Simple" >
+ update Simples
+ set
+ name = #Name#,
+ address = #Address#,
+ count = #Count#,
+ "date" = #Date#,
+ pay = #Pay#
+ where
+ id = #Id#
+ </update>
+
+
+ <delete id="DeleteSimple" parameterClass="int">
+ delete Simples
+ where
+ id = #value#
+ </delete>
+
+ <insert id="InsertSimple" parameterClass="Simple" >
+ insert into Simples ( name, address, count, "date", pay, id )
+ values
+ (#Name#, #Address#, #Count#, #Date#, #Pay#, #Id#)
+ </insert>
+
+</statements>
+</sqlMap>
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_ODP.config
Sat Apr 1 22:10:28 2006
@@ -40,7 +40,9 @@
<sqlMap resource="../../Maps/Oracle/ODP/Other.xml"/>
<sqlMap resource="../../Maps/Oracle/ODP/Document.xml"/>
<sqlMap resource="../../Maps/Oracle/ODP/ParameterClass.xml"/>
- <sqlMap resource="../../Maps/Oracle/ODP/ResultClass.xml"/>
+ <sqlMap resource="../../Maps/Oracle/ODP/ResultClass.xml"/>
+ <sqlMap resource="../../Maps/Oracle/ODP/Nullable.xml"/>
+ <sqlMap resource="../../Maps/Oracle/ODP/Simple.xml"/>
<!-- Rem : If used as embbeded Resources, use
<sqlMap embedded="Account.xml, IBatisNet.Test"/>
-->
Modified:
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
URL:
http://svn.apache.org/viewcvs/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config?rev=390782&r1=390781&r2=390782&view=diff
==============================================================================
---
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
(original)
+++
ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/bin/Debug/SqlMap_Oracle_OracleClient.config
Sat Apr 1 22:10:28 2006
@@ -5,12 +5,16 @@
<!-- Rem : If used via a DataAccess context, properties tag will be
ignored -->
<properties resource="../../Database.config"/>
<!-- <properties embedded="database.config, IBatisNet.Test"/> -->
-
<settings>
- <setting useStatementNamespaces="false"/>
+ <setting useStatementNamespaces="${useStatementNamespaces}"/>
<setting cacheModelsEnabled="true"/>
+ <setting validateSqlMap="false"/>
+ <!--
+ <setting useReflectionOptimizer="true"/>
+ -->
</settings>
-
+ <!-- Optional if resource -->
+ <providers resource="providers.config"/>
<!-- ==== OracleClient configuration ========= -->
<!-- Rem : If used via a DataAccess context, database tag will be
ignored -->
<database>
@@ -41,6 +45,8 @@
<sqlMap resource="../../Maps/Oracle/OracleClient/Document.xml"/>
<sqlMap
resource="../../Maps/Oracle/OracleClient/ParameterClass.xml"/>
<sqlMap
resource="../../Maps/Oracle/OracleClient/ResultClass.xml"/>
+ <sqlMap
resource="../../Maps/Oracle/OracleClient/Nullable.xml"/>
+ <sqlMap resource="../../Maps/Oracle/OracleClient/Simple.xml"/>
<!-- Rem : If used as embbeded Resources, use
<sqlMap embedded="Account.xml, IBatisNet.DataMapper.Test"/>
-->