[Nhibernate-commit] nhibernate/src/NHibernate ISession.cs,1.14,1.15

[Paul H. <pha...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv439/nhibernate/src/NHibernate

Modified Files:
	ISession.cs 
Log Message:
Revised ISession to comply with 2.1

Index: ISession.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/ISession.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ISession.cs	11 Feb 2005 21:26:21 -0000	1.14
--- ISession.cs	18 Mar 2005 23:33:19 -0000	1.15
***************
*** 214,217 ****
--- 214,225 ----
  
  		/// <summary>
+ 		/// Persist all reachable transient objects, reusing the current identifier 
+ 		/// values. Note that this will not trigger the Interceptor of the Session.
+ 		/// </summary>
+ 		/// <param name="obj"></param>
+ 		/// <param name="replicationMode"></param>
+ 		void Replicate( object obj, ReplicationMode replicationMode );
+ 
+ 		/// <summary>
  		/// Persist the given transient instance, first assigning a generated identifier.
  		/// </summary>
***************
*** 264,267 ****
--- 272,300 ----
  
  		/// <summary>
+ 		/// Copy the state of the given object onto the persistent object with the same
+ 		/// identifier. If there is no persistent instance currently associated with 
+ 		/// the session, it will be loaded. Return the persistent instance. If the 
+ 		/// given instance is unsaved or does not exist in the database, save it and 
+ 		/// return it as a newly persistent instance. Otherwise, the given instance
+ 		/// does not become associated with the session.
+ 		/// </summary>
+ 		/// <param name="obj">a transient instance with state to be copied</param>
+ 		/// <returns>an updated persistent instance</returns>
+ 		object SaveOrUpdateCopy( object obj );
+ 
+ 		/// <summary>
+ 		/// Copy the state of the given object onto the persistent object with the 
+ 		/// given identifier. If there is no persistent instance currently associated 
+ 		/// with the session, it will be loaded. Return the persistent instance. If
+ 		/// there is no database row with the given identifier, save the given instance
+ 		/// and return it as a newly persistent instance. Otherwise, the given instance
+ 		/// does not become associated with the session.
+ 		/// </summary>
+ 		/// <param name="obj">a persistent or transient instance with state to be copied</param>
+ 		/// <param name="id">the identifier of the instance to copy to</param>
+ 		/// <returns>an updated persistent instance</returns>
+ 		object SaveOrUpdateCopy( object obj, object id );
+ 
+ 		/// <summary>
  		/// Remove a persistent instance from the datastore.
  		/// </summary>
***************
*** 507,511 ****
  
  		/// <summary>
! 		/// Obtain an instance of <c>Query</c> for a named query string defined in the
  		/// mapping file.
  		/// </summary>
--- 540,544 ----
  
  		/// <summary>
! 		/// Obtain an instance of <c>IQuery</c> for a named query string defined in the
  		/// mapping file.
  		/// </summary>
***************
*** 513,516 ****
--- 546,567 ----
  		/// <returns>A queru</returns>
  		IQuery GetNamedQuery( string queryName );
+ 
+ 		/// <summary>
+ 		/// Create a new instance of <c>IQuery</c> for the given SQL string.
+ 		/// </summary>
+ 		/// <param name="sql">a query expressed in SQL</param>
+ 		/// <param name="returnAlias">a table alias that appears inside <tt>{}</tt> in the SQL string</param>
+ 		/// <param name="returnClass">the returned persistent class</param>
+ 		/// <returns></returns>
+ 		IQuery CreateSQLQuery( string sql, string returnAlias, System.Type returnClass );
+ 
+ 		/// <summary>
+ 		/// Create a new instance of <tt>Query</tt> for the given SQL string.
+ 		/// </summary>
+ 		/// <param name="sql">a query expressed in SQL</param>
+ 		/// <param name="returnAliases">an array of table aliases that appear inside <tt>{}</tt> in the SQL string</param>
+ 		/// <param name="returnClasses">the returned persistent classes</param>
+ 		/// <returns></returns>
+ 		IQuery CreateSQLQuery( string sql, string[] returnAliases, System.Type[] returnClasses );
  	}
  }
\ No newline at end of file