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/05/16 06:10:26 UTC

svn commit: r170296 - in /incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps: Oracle/ODP/ PostgreSQL/Npgsql/

Author: roberto
Date: Sun May 15 21:10:24 2005
New Revision: 170296

URL: http://svn.apache.org/viewcvs?rev=170296&view=rev
Log:
~Updated C# DataMapper NUnit ODP and Npgsql SqlMaps (cleaning)

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/Category.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/Enumeration.xml
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.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/PostgreSQL/Npgsql/Account.xml
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Category.xml
    incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/ResultClass.xml

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=170296&r1=170295&r2=170296&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 Sun May 15 21:10:24 2005
@@ -72,28 +72,28 @@
        
 	<resultMaps>                                    
 		<resultMap id="account-result"  class="Account" >
-			<result property="Id"           type="Int"		column="Account_ID"			dbType="Int32"/>
-			<result property="FirstName"    type="string"	column="Account_FirstName"	dbType="Varchar2"/>
-			<result property="LastName"     type="string"	column="Account_LastName"	dbType="Varchar2"/>
-			<result property="EmailAddress" type="string"	column="Account_Email"		dbType="Varchar2" nullValue="no_email@provided.com"/>
+			<result property="Id"           column="Account_ID"/>
+			<result property="FirstName"    column="Account_FirstName"/>
+			<result property="LastName"     column="Account_LastName"/>
+			<result property="EmailAddress" column="Account_Email" nullValue="no_email@provided.com"/>
 			<result property="BannerOption" column="Account_Banner_Option" dbType="Varchar2" type="bool"/>
 			<result property="CartOption"	column="Account_Cart_Option" typeHandler="HundredsBool"/>						
 		</resultMap>
 		<resultMap id="indexed-account-result" class="Account">
-			<result property="Id"           type="Int"		column="Account_ID"			dbType="Int32" columnIndex="0"/>
-			<result property="FirstName"    type="string"	column="Account_FirstName"	dbType="Varchar2" columnIndex="1"/>
-			<result property="LastName"     type="string"	column="Account_LastName"	dbType="Varchar2" columnIndex="2"/>
-			<result property="EmailAddress" type="string"	column="Account_Email"		dbType="Varchar2" columnIndex="3"	nullValue="no_email@provided.com"/>
+			<result property="Id"           column="Account_ID"			columnIndex="0"/>
+			<result property="FirstName"    column="Account_FirstName"	columnIndex="1"/>
+			<result property="LastName"     column="Account_LastName"	columnIndex="2"/>
+			<result property="EmailAddress" column="Account_Email"		columnIndex="3"	nullValue="no_email@provided.com"/>
 		</resultMap>
 		<resultMap id="account-result-nullable-email" class="Account">
-			<result property="Id"           type="Int"		column="Account_ID"			dbType="Int32"/>
-			<result property="FirstName"    type="string"	column="Account_FirstName"	dbType="Varchar2"/>
-			<result property="LastName"     type="string"	column="Account_LastName"	dbType="Varchar2"/>
-			<result property="EmailAddress" type="string"	column="Account_Email"		dbType="Varchar2"/>
+			<result property="Id"           column="Account_ID"/>
+			<result property="FirstName"    column="Account_FirstName"/>
+			<result property="LastName"     column="Account_LastName"/>
+			<result property="EmailAddress" column="Account_Email"/>
 		</resultMap>
 		
 		<resultMap id="email-result" class="string">
-			<result property="value" type="string"	column="Account_Email"/>
+			<result property="value" column="Account_Email"/>
 		</resultMap>
 		
 		<resultMap id="account-hashtable-result" class="Hashtable">
@@ -165,7 +165,7 @@
 						resultMap="account-hashtable-result">
 			select *
 			from Accounts
-			where Account_ID = #value:Int32#
+			where Account_ID = #value#
 		</select>
   
 		<select id="GetAllAccountsAsHashMapViaResultMap"
@@ -194,7 +194,7 @@
 			Account_LastName as LastName,
 			Account_Email as EmailAddress
 			from Accounts
-			where Account_ID = #value:Int32#
+			where Account_ID = #value#
 		</select>
   
 		<select id="GetAllAccountsAsHashtableViaResultClass"
@@ -363,7 +363,7 @@
 		<delete id="DeleteAccountViaInlineParameters">
 			delete from Accounts 
 			where
-			Account_ID = #Id:Int32#
+			Account_ID = #Id#
 		</delete>
 		
 		<select id="GetAccountComplexMapping"
@@ -429,7 +429,7 @@
 			insert into Accounts 
 				(Account_ID, Account_FirstName, Account_LastName, Account_Email) 
 			values 
-				(#Id:Int32#, #FirstName#, #LastName#, #EmailAddress#)
+				(#Id#, #FirstName#, #LastName#, #EmailAddress#)
 		</insert>
 		
 		<!-- Inline Parameters -->
@@ -448,7 +448,7 @@
 			insert into Accounts 
 				(Account_ID, Account_FirstName, Account_LastName, Account_Email) 
 			values 
-				(#Id:Int32#, #FirstName#, #LastName#, #EmailAddress:Varchar2:no_email@provided.com#
+				(#Id#, #FirstName#, #LastName#, #EmailAddress:Varchar2:no_email@provided.com#
 			)
 		</insert>
 
@@ -457,20 +457,20 @@
 			insert into Accounts 
 				(Account_ID, Account_FirstName, Account_LastName, Account_Email) 
 			values 
-				( #Id:Int32#, #FirstName#, #LastName#, #EmailAddress# )
+				( #Id#, #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#, #FirstName#, #LastName#, #EmailAddress# )
 		</insert>
   
 		<delete id="DeleteAccount"
 			parameterClass="Account">
 			delete from Accounts
-			where Account_ID = #Id:Int32#
+			where Account_ID = #Id#
 		</delete>
 		
 		<!-- Extends statement -->
@@ -493,14 +493,14 @@
 		<select id="GetOneAccount"
 			extends="GetAllAccounts"
 			resultMap="indexed-account-result">
-			where Account_ID = #value:Int32#
+			where Account_ID = #value#
 		</select>
 		
 		<select id="GetSomeAccount"
 			extends="GetAllAccounts"
 			parameterClass="Hashtable"
 			resultMap="indexed-account-result">
-			where Account_ID between #lowID:Int32# and #hightID:Int32#
+			where Account_ID between #lowID# and #hightID#
 		</select>
 		
 		<select id="SelectAccountJIRA29" parameterClass="map" resultClass="Account">
@@ -627,7 +627,7 @@
 		</parameterMap>
 		
 		<parameterMap id="insert-params">
-			<parameter property="Id" dbType="Int32"/>
+			<parameter property="Id"/>
 			<parameter property="FirstName" dbType="Varchar2" size="32"/>
 			<parameter property="LastName" dbType="Varchar2" size="32"/>			
 			<parameter property="EmailAddress" dbType="Varchar2" size="128" nullValue="no_email@provided.com"/>
@@ -660,4 +660,4 @@
 		
 	</parameterMaps>
 	
-</sqlMap>
\ No newline at end of file
+</sqlMap>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Category.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Category.xml?rev=170296&r1=170295&r2=170296&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Category.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Category.xml Sun May 15 21:10:24 2005
@@ -14,7 +14,7 @@
 			Category_Name as Name,
 			Category_Guid as GuidString
 			from Categories  
-			where Category_ID = #value:Int32# 
+			where Category_ID = #value# 
 		</select>
 		
 		<select id="GetCategoryGuid" parameterClass="Integer" resultClass="guid">
@@ -31,7 +31,7 @@
 			insert into Categories  
 				(Category_Id, Category_Name, Category_Guid) 
 			values 
-				(#Id:Int32#, #Name#, #GuidString:Varchar2#)
+				(#Id#, #Name#, #GuidString:Varchar2#)
 		</insert>
 		
 		<!--  

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=170296&r1=170295&r2=170296&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 Sun May 15 21:10:24 2005
@@ -32,7 +32,7 @@
 			Account_Email		as EmailAddress
 			from Accounts
 			<isParameterPresent >
-			where Account_ID = #value:Int32#
+			where Account_ID = #value#
 			</isParameterPresent>
 		</statement>
 
@@ -153,7 +153,7 @@
 			from Accounts
 			WHERE Account_ID IN
 			<iterate open="(" close=")" conjunction=",">
-				#[]:Int32#
+				#[]#
 			</iterate>
 			ORDER BY Account_Id ASC			
 		</statement>
@@ -169,7 +169,7 @@
 			from Accounts
 			WHERE Account_ID IN
 			<iterate property="Ids" open="(" close=")"  conjunction="," >
-				#Ids[]:Int32#
+				#Ids[]#
 			</iterate>
 			ORDER BY Account_Id ASC			
 		</statement>
@@ -217,11 +217,11 @@
 			from Accounts
 			WHERE Account_ID IN
 			<iterate open="(" close=")" conjunction=",">
-				#[]:Int32#
+				#[]#
 			</iterate>
 				and Account_ID IN
 			<iterate open="(" close=")" conjunction=",">
-				#[]:Int32#
+				#[]#
 			</iterate>
 			ORDER BY Account_Id ASC			
 		</statement>
@@ -238,12 +238,12 @@
 			from Accounts
 			<dynamic prepend="WHERE" >
 			<isGreaterThan prepend="AND" property="Id" compareValue="0"  >
-				Account_ID = #Id:Int32#
+				Account_ID = #Id#
 			</isGreaterThan>
 			<isNotNull prepend="AND" property="Ids" >
 				Account_ID in
 				<iterate property="Ids" open="(" close=")"  conjunction="," >
-					#Ids[]:Int32#
+					#Ids[]#
 				</iterate>
 			</isNotNull>
 			<isNotEmpty prepend="AND" property="FirstName" >
@@ -276,7 +276,7 @@
 			<dynamic prepend="where" >
 			Account_ID IN
 			<iterate open="(" close=")" conjunction=",">
-				#[]:Int32#
+				#[]#
 			</iterate>
 			</dynamic>
 			ORDER BY Account_Id ASC
@@ -293,7 +293,7 @@
 			from Accounts
 			<dynamic prepend="where" >
 			<iterate open="(" close=")" conjunction="OR">
-				Account_ID = #[]:Int32#
+				Account_ID = #[]#
 			</iterate>
 			</dynamic>
 			ORDER BY Account_Id ASC
@@ -311,7 +311,7 @@
 			<dynamic prepend="where" >
 				<isParameterPresent prepend="BLAH!" >
 					<iterate open="(" close=")" conjunction="OR">
-						Account_ID = #[]:Int32#
+						Account_ID = #[]#
 					</iterate>
 				</isParameterPresent>
 			</dynamic>
@@ -330,7 +330,7 @@
 			<dynamic prepend="where">
 				<isParameterPresent>
 					<isNotEmpty prepend="and" property="Id" >
-					Account_ID = #Id:Int32#
+					Account_ID = #Id#
 					</isNotEmpty>
 					<isNotEmpty prepend="and" property="FirstName" >
 					Account_FirstName = #FirstName#
@@ -353,7 +353,7 @@
 			from Accounts
 			<dynamic prepend="where">
 				<isNotEmpty prepend="BLAH!" property="Id" >
-				Account_ID = #Id:Int32#
+				Account_ID = #Id#
 				</isNotEmpty>
 			</dynamic>
 			<dynamic prepend="and">
@@ -390,7 +390,7 @@
 					Account_Email like '%$EmailAddress$%'
 				</isNotNull>
 				<isGreaterThan prepend="AND" property="Id" compareValue="0">
-					Account_ID = #Id:Int32#
+					Account_ID = #Id#
 				</isGreaterThan>
 			</dynamic>
 			order by Account_LastName
@@ -407,8 +407,8 @@
 			from Accounts
 			<dynamic prepend="where">
 				<isNotNull prepend="and" property="NumberSearch">
-					((Account_ID $Operande$ #NumberSearch:Int32#) or 
-					(Account_ID $Operande$ #NumberSearch:Int32#)) 
+					((Account_ID $Operande$ #NumberSearch#) or 
+					(Account_ID $Operande$ #NumberSearch#)) 
 				</isNotNull>
 				<isEqual prepend="and" property="StartDate" compareValue="12/25/2004">
 						<![CDATA[Account_FirstName >= TO_CHAR(#StartDate#, 'mm/dd/yyyy') ]]>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Enumeration.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Enumeration.xml?rev=170296&r1=170295&r2=170296&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Enumeration.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/Enumeration.xml Sun May 15 21:10:24 2005
@@ -26,7 +26,7 @@
 				Enum_Color,
 				Enum_Month
 			from Enumerations  
-			where Enum_ID = #value:Int32# 
+			where Enum_ID = #value# 
 		</select>
 		
 		<select id="GetEnumeration" parameterClass="Integer" resultClass="Enumeration">
@@ -36,7 +36,7 @@
 				Enum_Color as Color,
 				Enum_Month as Month
 			from Enumerations  
-			where Enum_ID = #value:Int32# 
+			where Enum_ID = #value# 
 		</select>
 		
 		<insert id="InsertEnumViaParameterMap" parameterMap="insert-params" >

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.xml?rev=170296&r1=170295&r2=170296&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/Oracle/ODP/LineItem.xml Sun May 15 21:10:24 2005
@@ -117,7 +117,7 @@
 				LineItem_Quantity,
 				LineItem_Price
 				from LineItems
-				where LineItem_ID =  #value:Int32#
+				where LineItem_ID =  #value#
 		</statement>
 		
 		<statement id="InsertLineItem" 
@@ -211,4 +211,4 @@
 		</parameterMap>
 		
 	</parameterMaps>
-</sqlMap>
\ No newline at end of file
+</sqlMap>

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=170296&r1=170295&r2=170296&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 Sun May 15 21:10:24 2005
@@ -159,7 +159,7 @@
 		<statement id="GetOrderLiteByColumnName"
 					parameterClass="Int"
 					resultMap="lite-order-result-by-name" >
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderLiteByColumnIndex"
@@ -175,25 +175,25 @@
 			Order_City,
 			Order_Province,
 			Order_PostalCode
-			from Orders where Order_ID = #value:Int32#
+			from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderWithTypes"
 					parameterClass="Int"
 					resultMap="order-with-types-result" >
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderWithLineItems"
 					parameterClass="Integer"
 					resultMap="order-with-lines-result" >
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderWithLineItemsUsingStatementNamespaces"
 					parameterClass="Integer"
 					resultMap="order-with-lines-result-statement-namespaces" >
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</statement>		
 
 		<statement id="GetAllOrderWithLineItems"
@@ -206,19 +206,19 @@
 					resultClass="date">
 			select
 			Order_Date
-			from Orders where Order_ID = #value:Int32#
+			from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderWithAccount"
 					parameterClass="int"
 					resultMap="order-with-account-result" >
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderWithLineItemsCollection"
 					parameterClass="Integer"
 					resultMap="order-with-collection-result" >
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</statement>
 		
 		 <statement id="GetOrderJoinedFavourite"
@@ -227,31 +227,31 @@
 			select * from Orders, LineItems
 			where Orders.Order_ID = LineItems.Order_ID
 			and Order_FavouriteLineItem = LineItems.LineItem_ID
-			and Orders.Order_ID = #value:Int32#
+			and Orders.Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderWithFavouriteLineItem"
 					parameterClass="int"
 					resultMap="order-with-favourite-line-item" >
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderWithLineItemCollection"
 					parameterClass="int"
 					resultMap="order-with-lines-collection" >
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderAsHastable"
 					parameterClass="Integer"
 					resultMap="lite-order-map-result" >
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetOrderWithLineItemArray"
 				parameterClass="int"
 				resultMap="order-with-lines-array">
-				select * from Orders where Order_ID = #value:Int32#
+				select * from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetAllCreditCardNumbersFromOrders"
@@ -300,7 +300,7 @@
 		<select id="GetOrderWithDynFavouriteLineItem"
 				parameterClass="Integer"
 				resultMap="order-with-dyn-favourite-line-item">
-			select * from Orders where Order_ID = #value:Int32#
+			select * from Orders where Order_ID = #value#
 		</select>			
 		
 		<select id="GetAccountJIRA45"
@@ -350,4 +350,4 @@
 		
 	</parameterMaps>
 
-</sqlMap>
\ No newline at end of file
+</sqlMap>

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=170296&r1=170295&r2=170296&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 Sun May 15 21:10:24 2005
@@ -29,7 +29,7 @@
 			from Others  
 			<dynamic prepend="WHERE"> 
 				<isNotEqual prepend="AND" property="year" compareValue="0"> 
-				Other_Int = #year:Int32#  
+				Other_Int = #year#  
 				</isNotEqual> 
 				 
 				<isNotEqual prepend="AND" property="areaid" compareValue="0"> 

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Account.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Account.xml?rev=170296&r1=170295&r2=170296&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Account.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Account.xml Sun May 15 21:10:24 2005
@@ -396,7 +396,7 @@
 			update Accounts set
 			Account_FirstName = #FirstName#,
 			Account_LastName = #LastName#,
-			Account_Email = #EmailAddress:text:no_email@provided.com#
+			Account_Email = #EmailAddress:Text:no_email@provided.com#
 			where
 			Account_ID = #Id#
 		</update>
@@ -406,7 +406,7 @@
 			insert into Accounts 
 				(Account_ID, Account_FirstName, Account_LastName, Account_Email) 
 			values 
-				(#Id#, #FirstName#, #LastName#, #EmailAddress:text:no_email@provided.com#
+				(#Id#, #FirstName#, #LastName#, #EmailAddress:Text:no_email@provided.com#
 			)
 		</insert>
 
@@ -415,14 +415,14 @@
 			insert into Accounts 
 				(Account_ID, Account_FirstName, Account_LastName, Account_Email) 
 			values 
-				( #Id#, #FirstName#, #LastName#, #EmailAddress:text# )
+				( #Id#, #FirstName#, #LastName#, #EmailAddress:Text# )
 		</insert>
 
 		<insert id="InsertAccountUknownParameterClass">
 			insert into Accounts 
 				(Account_ID, Account_FirstName, Account_LastName, Account_Email) 
 			values 
-				( #Id#, #FirstName#, #LastName#, #EmailAddress:text# )
+				( #Id#, #FirstName#, #LastName#, #EmailAddress:Text# )
 		</insert>
   
 		<delete id="DeleteAccount"

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Category.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Category.xml?rev=170296&r1=170295&r2=170296&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Category.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/Category.xml Sun May 15 21:10:24 2005
@@ -33,7 +33,7 @@
   			insert into Categories  
 				(Category_Name, Category_Guid) 
 			values 
-				(#Name#, #GuidString:text#);
+				(#Name#, #GuidString:Text#);
 		</insert>
 		
 		<!--  -->
@@ -45,7 +45,7 @@
             insert into Categories  
 				(Category_Name, Category_Guid) 
 			values 
-				(#Name#, #GuidString:text#)
+				(#Name#, #GuidString:Text#)
 		</insert>
 
 		<insert id="InsertCategoryViaParameterMap" parameterMap="InsertParam">
@@ -112,11 +112,11 @@
 			select
 			Category_ID as Id,
 			Category_Name as Name,
-			Category_Guid as Guid
+			Category_Guid as GuidString
 			from Categories  
 			<dynamic prepend="where">
 				<isNotEqual prepend="and" property="Guid" compareProperty="EmptyGuid">
-					Category_Guid=#GuidString:text#
+					Category_Guid=#GuidString:Text#
 				</isNotEqual>
 			</dynamic>
 		</statement>

Modified: incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/ResultClass.xml
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/ResultClass.xml?rev=170296&r1=170295&r2=170296&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/ResultClass.xml (original)
+++ incubator/ibatis/trunk/cs/mapper/IBatisNet.DataMapper.Test/Maps/PostgreSQL/Npgsql/ResultClass.xml Sun May 15 21:10:24 2005
@@ -19,13 +19,13 @@
 		<statement id="GetChar"
 					parameterClass="Int"
 					resultClass="char" >
-			select cast('a' as char) from Orders where Order_ID = #value#
+			select 'a' from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetDate"
 					parameterClass="Int"
 					resultClass="date" >
-			select cast('2003-02-15 8:15:00' as timestamp) from Orders where Order_ID  = #value#
+			select '2003-02-15 8:15:00' from Orders where Order_ID  = #value#
 		</statement>
 									
 		<statement id="GetDecimal"
@@ -43,7 +43,7 @@
 		<statement id="GetGuid"
 					parameterClass="Int"
 					resultClass="guid" >
-			select cast('CD5ABF17-4BBC-4C86-92F1-257735414CF4' as text) from Orders where Order_ID = #value#
+			select 'CD5ABF17-4BBC-4C86-92F1-257735414CF4' from Orders where Order_ID = #value#
 		</statement>
 		
 		<statement id="GetInt16"