You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by ro...@apache.org on 2005/04/28 08:37:31 UTC
svn commit: r165105 - in
/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test:
Maps/Oracle/ODP/ Maps/Oracle/OracleClient/ Scripts/Oracle/
Author: roberto
Date: Wed Apr 27 23:37:29 2005
New Revision: 165105
URL: http://svn.apache.org/viewcvs?rev=165105&view=rev
Log:
~ Updated C# DataMapper Oracle NUnit Maps and SQL
Modified:
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml
incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/Oracle/other-init.sql
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml?rev=165105&r1=165104&r2=165105&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Account.xml Wed Apr 27 23:37:29 2005
@@ -135,6 +135,22 @@
from Accounts
order by Account_ID
</select>
+
+ <select id="GetNoAccountWithCache"
+ parameterClass="Integer"
+ resultMap="account-hashtable-result"
+ cacheModel="account-cache">
+ select *
+ from Accounts
+ where Account_ID = #value#
+ </select>
+
+ <select id="SelectWithProperty"
+ resultMap="account-result">
+ select *
+ from Accounts
+ where Account_FirstName = ${accountName}
+ </select>
<select id="GetAccountAsHashtable"
parameterClass="Integer"
@@ -346,8 +362,8 @@
select *
from Accounts
where
- Account_FirstName = '$Account.FirstName$'
- And Account_LastName = '$Order.City$'
+ Account_FirstName = #Account.FirstName#
+ And Account_LastName = #Order.City#
</select>
<select id="GetDynamicOrderedEmailAddressesViaResultMap"
@@ -403,7 +419,7 @@
insert into Accounts
(Account_ID, Account_FirstName, Account_LastName, Account_Email)
values
- (#Id:Int32#, '$FirstName$', '$LastName$', '$EmailAddress$')
+ (#Id:Int32#, #FirstName#, #LastName#, #EmailAddress#)
</insert>
@@ -445,7 +461,7 @@
insert into Accounts
(Account_ID, Account_FirstName, Account_LastName, Account_Email)
values
- (#Id:Int32#, '$FirstName$', '$LastName$', #EmailAddress:VarChar2:no_email@provided.com#
+ (#Id:Int32#, #FirstName#, #LastName#, #EmailAddress:VarChar2:no_email@provided.com#
)
</insert>
@@ -454,14 +470,14 @@
insert into Accounts
(Account_ID, Account_FirstName, Account_LastName, Account_Email)
values
- ( #Id:Int32#, '$FirstName$', '$LastName$', '$EmailAddress$' )
+ ( #Id:Int32#, #FirstName#, #LastName#, #EmailAddress# )
</insert>
<insert id="InsertAccountUknownParameterClass">
insert into Accounts
(Account_ID, Account_FirstName, Account_LastName, Account_Email)
values
- ( #Id:Int32#, '$FirstName$', '$LastName$', '$EmailAddress$' )
+ ( #Id:Int32#, #FirstName#, #LastName#, #EmailAddress# )
</insert>
<delete id="DeleteAccount"
@@ -499,6 +515,31 @@
resultMap="account-result">
where Account_ID between #lowID:Int32# and #hightID:Int32#
</select>
+
+ <select id="SelectAccountJIRA29" parameterClass="map" resultClass="Account">
+ select
+ Account_ID as Id,
+ Account_FirstName as FirstName,
+ Account_LastName as LastName,
+ Account_Email as EmailAddress
+ from Accounts
+ where Account_FirstName = '##$AccountName$##'
+ </select>
+
+ <select id="SelectAccountJIRA29-2"
+ parameterClass="Hashtable"
+ resultClass="Account">
+ select
+ Account_ID as Id,
+ Account_FirstName as FirstName,
+ Account_LastName as LastName,
+ Account_Email as EmailAddress
+ from Accounts
+ where 1=1
+ <isNotEmpty prepend="AND" property="Foo">
+ (Account_FirstName = '##$Foo$##')
+ </isNotEmpty>
+ </select>
<!--
NOTE:
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml?rev=165105&r1=165104&r2=165105&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/DynamicAccount.xml Wed Apr 27 23:37:29 2005
@@ -46,7 +46,7 @@
Account_Email as EmailAddress
from Accounts
<isNotEmpty>
- where Account_FirstName = '$value$'
+ where Account_FirstName = #value#
</isNotEmpty>
</statement>
@@ -247,17 +247,17 @@
</iterate>
</isNotNull>
<isNotEmpty prepend="AND" property="FirstName" >
- Account_FirstName = '$FirstName$'
+ Account_FirstName = #FirstName#
</isNotEmpty>
<isNotEmpty prepend="AND" property="LastName" >
- Account_LastName = '$LastName$'
+ Account_LastName = #LastName#
</isNotEmpty>
<isNotEmpty prepend="AND" property="EmailAddress" >
<isEqual property="EmailAddress" compareValue="Joe">
Account_Email = 'clinton.begin@ibatis.com'
</isEqual>
<isNotEqual property="EmailAddress" compareValue="Joe">
- Account_Email = '$EmailAddress$'
+ Account_Email = #EmailAddress#
</isNotEqual>
</isNotEmpty>
</dynamic>
@@ -333,10 +333,10 @@
Account_ID = #Id:Int32#
</isNotEmpty>
<isNotEmpty prepend="and" property="FirstName" >
- Account_FirstName = '$FirstName$'
+ Account_FirstName = #FirstName#
</isNotEmpty>
<isNotEmpty prepend="and" property="LastName" >
- Account_LastName = '$LastName$'
+ Account_LastName = #LastName#
</isNotEmpty>
</isParameterPresent>
</dynamic>
@@ -358,16 +358,18 @@
</dynamic>
<dynamic prepend="and">
<isNotEmpty prepend="BLAH!" property="FirstName" >
- Account_FirstName = '$FirstName$'
+ Account_FirstName = #FirstName#
</isNotEmpty>
<isNotEmpty prepend="and" property="LastName" >
- Account_LastName = '$LastName$'
+ Account_LastName = #LastName#
</isNotEmpty>
</dynamic>
</statement>
+ <!--
+ cacheModel="account-cache"
+ -->
<statement id="ComplexDynamicStatement"
- cacheModel="account-cache"
resultClass="Account"
parameterClass="Account">
select
@@ -378,9 +380,9 @@
from Accounts
<dynamic prepend="WHERE">
<isNotNull prepend="AND" property="FirstName">
- (Account_FirstName = '$FirstName$'
+ (Account_FirstName = #FirstName#
<isNotNull prepend="OR" property="LastName">
- Account_LastName = '$LastName$'
+ Account_LastName = #LastName#
</isNotNull>
)
</isNotNull>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml?rev=165105&r1=165104&r2=165105&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Order.xml Wed Apr 27 23:37:29 2005
@@ -284,6 +284,18 @@
select * from Orders where Order_ID = #value:Int32#
</select>
+ <select id="GetAccountJIRA45"
+ parameterClass="int"
+ resultMap="Account.account-result">
+ select
+ Account_ID,
+ Account_FirstName,
+ Account_LastName,
+ Account_Email
+ from Accounts
+ where Account_ID = #value#
+ </select>
+
</statements>
<parameterMaps>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml?rev=165105&r1=165104&r2=165105&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Other.xml Wed Apr 27 23:37:29 2005
@@ -33,6 +33,25 @@
</dynamic>
</statement>
+ <statement id="DynamicSelectByBool"
+ parameterClass="Other"
+ resultMap="other-result">
+ select
+ Other_Int,
+ Other_Long,
+ Other_Bit
+ from Others
+ Where Other_Bit = #Bool#
+ </statement>
+
+ <statement id="InsertBool"
+ parameterClass="Other">
+ Insert into Others
+ ( Other_Int, Other_Long, Other_Bit )
+ values
+ ( #Int#, #Long#, #Bool#)
+ </statement>
+
</statements>
</sqlMap>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml?rev=165105&r1=165104&r2=165105&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Account.xml Wed Apr 27 23:37:29 2005
@@ -135,6 +135,15 @@
order by Account_ID
</select>
+ <select id="GetNoAccountWithCache"
+ parameterClass="Integer"
+ resultMap="account-hashtable-result"
+ cacheModel="account-cache">
+ select *
+ from Accounts
+ where Account_ID = #value#
+ </select>
+
<select id="SelectWithProperty"
resultMap="account-result">
select *
@@ -482,6 +491,31 @@
resultMap="account-result">
where Account_ID between #lowID# and #hightID#
</select>
+
+ <select id="SelectAccountJIRA29" parameterClass="map" resultClass="Account">
+ select
+ Account_ID as Id,
+ Account_FirstName as FirstName,
+ Account_LastName as LastName,
+ Account_Email as EmailAddress
+ from Accounts
+ where Account_FirstName = '##$AccountName$##'
+ </select>
+
+ <select id="SelectAccountJIRA29-2"
+ parameterClass="Hashtable"
+ resultClass="Account">
+ select
+ Account_ID as Id,
+ Account_FirstName as FirstName,
+ Account_LastName as LastName,
+ Account_Email as EmailAddress
+ from Accounts
+ where 1=1
+ <isNotEmpty prepend="AND" property="Foo">
+ (Account_FirstName = '##$Foo$##')
+ </isNotEmpty>
+ </select>
<procedure id="InsertAccountViaStoreProcedure" parameterMap="insert-params">
prc_InsertAccount
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml?rev=165105&r1=165104&r2=165105&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/DynamicAccount.xml Wed Apr 27 23:37:29 2005
@@ -367,8 +367,10 @@
</dynamic>
</statement>
+ <!--
+ cacheModel="account-cache"
+ -->
<statement id="ComplexDynamicStatement"
- cacheModel="account-cache"
resultClass="Account"
parameterClass="Account">
select
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml?rev=165105&r1=165104&r2=165105&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Order.xml Wed Apr 27 23:37:29 2005
@@ -284,6 +284,18 @@
select * from Orders where Order_ID = #value#
</select>
+ <select id="GetAccountJIRA45"
+ parameterClass="int"
+ resultMap="Account.account-result">
+ select
+ Account_ID,
+ Account_FirstName,
+ Account_LastName,
+ Account_Email
+ from Accounts
+ where Account_ID = #value#
+ </select>
+
</statements>
<parameterMaps>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml?rev=165105&r1=165104&r2=165105&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/OracleClient/Other.xml Wed Apr 27 23:37:29 2005
@@ -32,6 +32,25 @@
</isNotEqual>
</dynamic>
</statement>
+
+ <statement id="DynamicSelectByBool"
+ parameterClass="Other"
+ resultMap="other-result">
+ select
+ Other_Int,
+ Other_Long,
+ Other_Bit
+ from Others
+ Where Other_Bit = #Bool#
+ </statement>
+
+ <statement id="InsertBool"
+ parameterClass="Other">
+ Insert into Others
+ ( Other_Int, Other_Long, Other_Bit )
+ values
+ ( #Int#, #Long#, #Bool#)
+ </statement>
</statements>
Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/Oracle/other-init.sql
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/Oracle/other-init.sql?rev=165105&r1=165104&r2=165105&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/Oracle/other-init.sql (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Scripts/Oracle/other-init.sql Wed Apr 27 23:37:29 2005
@@ -2,11 +2,12 @@
CREATE TABLE OTHERS (
OTHER_INT INT NULL ,
- OTHER_LONG NUMBER NULL
+ OTHER_LONG NUMBER NULL ,
+ OTHER_BIT SMALLINT DEFAULT 0 NOT NULL
)
NOLOGGING
NOCACHE
NOPARALLEL;
-INSERT INTO OTHERS VALUES(1, 8888888);
-INSERT INTO OTHERS VALUES(2, 9999999999);
\ No newline at end of file
+INSERT INTO OTHERS VALUES(1, 8888888, 0);
+INSERT INTO OTHERS VALUES(2, 9999999999, 1);
\ No newline at end of file