[Nhibernate-commit] SF.net SVN: nhibernate:[3915] trunk/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 3915
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3915&view=rev
Author:   fabiomaulo
Date:     2008-11-17 20:42:16 +0000 (Mon, 17 Nov 2008)

Log Message:
-----------
fix NH-1573

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
    trunk/nhibernate/src/NHibernate/Loader/Loader.cs
    trunk/nhibernate/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs
    trunk/nhibernate/src/NHibernate/nhibernate-mapping.xsd

Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs	2008-11-17 13:59:23 UTC (rev 3914)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/Hbm.generated.cs	2008-11-17 20:42:16 UTC (rev 3915)
@@ -1353,11 +1353,11 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public bool collable;
+        public bool callable;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlIgnoreAttribute()]
-        public bool collableSpecified;
+        public bool callableSpecified;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]

Modified: trunk/nhibernate/src/NHibernate/Loader/Loader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2008-11-17 13:59:23 UTC (rev 3914)
+++ trunk/nhibernate/src/NHibernate/Loader/Loader.cs	2008-11-17 20:42:16 UTC (rev 3915)
@@ -1111,7 +1111,7 @@
 
 			sqlString = PreprocessSQL(sqlString, queryParameters, dialect);
 
-			// TODO NH: Collable for SP -> PrepareCallableQueryCommand
+			// TODO NH: Callable for SP -> PrepareCallableQueryCommand
 			IDbCommand command =
 				session.Batcher.PrepareQueryCommand(CommandType.Text, sqlString,
 				                                    GetParameterTypes(queryParameters, useLimit, useOffset));
@@ -1347,7 +1347,7 @@
 			try
 			{
 				log.Info(st.CommandText);
-				// TODO NH: Collable
+				// TODO NH: Callable
 				rs = session.Batcher.ExecuteReader(st);
 				rs = WrapResultSetIfEnabled(rs, session);
 

Modified: trunk/nhibernate/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs	2008-11-17 13:59:23 UTC (rev 3914)
+++ trunk/nhibernate/src/NHibernate/Persister/Collection/AbstractCollectionPersister.cs	2008-11-17 20:42:16 UTC (rev 3915)
@@ -1866,7 +1866,7 @@
 		public abstract bool IsOneToMany { get; }
 
 		protected object PerformInsert(object ownerId, IPersistentCollection collection, IExpectation expectation,
-		                               object entry, int index, bool useBatch, bool collable, ISessionImplementor session)
+		                               object entry, int index, bool useBatch, bool callable, ISessionImplementor session)
 		{
 			object entryId = null;
 			int offset = 0;

Modified: trunk/nhibernate/src/NHibernate/nhibernate-mapping.xsd
===================================================================
--- trunk/nhibernate/src/NHibernate/nhibernate-mapping.xsd	2008-11-17 13:59:23 UTC (rev 3914)
+++ trunk/nhibernate/src/NHibernate/nhibernate-mapping.xsd	2008-11-17 20:42:16 UTC (rev 3915)
@@ -1669,7 +1669,7 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="customSQL" mixed="true">
-		<xs:attribute name="collable" type="xs:boolean" />
+		<xs:attribute name="callable" type="xs:boolean" />
 		<xs:attribute name="check" type="customSQLCheck" use="optional" />
 	</xs:complexType>
 	<xs:simpleType name="versionGeneration">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.