nhibernate-commit — CVS Commits

[Nhibernate-commit] nhibernate/src/NHibernate/Util ReflectHelper.cs,1.6,1.7

[Peter S. <sz...@us...>]

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

Modified Files:
	ReflectHelper.cs 
Log Message:
Made another fix in incrementgenerator. Made a few fixes in hbm2net. Added new abcproxytest, and ignored it because of proxy problems.


Index: ReflectHelper.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Util/ReflectHelper.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ReflectHelper.cs	9 Mar 2004 16:46:10 -0000	1.6
--- ReflectHelper.cs	6 Apr 2004 10:51:41 -0000	1.7
***************
*** 89,93 ****
  
  			//PropertyInfo property = type.GetProperty(propertyName);
! 			PropertyInfo property = type.GetProperty(propertyName, BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
  
  			if (property != null) {
--- 89,93 ----
  
  			//PropertyInfo property = type.GetProperty(propertyName);
! 			PropertyInfo property = type.GetProperty(propertyName, BindingFlags.IgnoreCase|BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
  
  			if (property != null) {
***************
*** 115,119 ****
  
  			//PropertyInfo property = type.GetProperty(propertyName);
! 			PropertyInfo property = type.GetProperty(propertyName, BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
  
  			if (property != null) {
--- 115,119 ----
  
  			//PropertyInfo property = type.GetProperty(propertyName);
! 			PropertyInfo property = type.GetProperty(propertyName, BindingFlags.IgnoreCase|BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic);
  
  			if (property != null) {

[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel A.cs,NONE,1.1 ABC.hbm.xml,NONE,1.1 ABCProxy.hbm.xml,NONE,1.1 B.cs,NONE,1.1 C1.cs,NONE,1.1 C2.cs,NONE,1.1 D.cs,NONE,1.1 NHibernate.DomainModel-1.1.csproj,1.3,1.4

[Peter S. <sz...@us...>]

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

Modified Files:
	NHibernate.DomainModel-1.1.csproj 
Added Files:
	A.cs ABC.hbm.xml ABCProxy.hbm.xml B.cs C1.cs C2.cs D.cs 
Log Message:
Made another fix in incrementgenerator. Made a few fixes in hbm2net. Added new abcproxytest, and ignored it because of proxy problems.


Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NHibernate.DomainModel-1.1.csproj	24 Mar 2004 19:55:30 -0000	1.3
--- NHibernate.DomainModel-1.1.csproj	6 Apr 2004 10:51:42 -0000	1.4
***************
*** 85,88 ****
--- 85,101 ----
              <Include>
                  <File
+                     RelPath = "A.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "ABC.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
+                     RelPath = "ABCProxy.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
                      RelPath = "AssemblyInfo.cs"
                      SubType = "Code"
***************
*** 95,98 ****
--- 108,116 ----
                  />
                  <File
+                     RelPath = "B.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "BasicClass.cs"
                      SubType = "Code"
***************
*** 104,107 ****
--- 122,135 ----
                  />
                  <File
+                     RelPath = "C1.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "C2.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Child.cs"
                      SubType = "Code"
***************
*** 127,130 ****
--- 155,163 ----
                  />
                  <File
+                     RelPath = "D.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "JoinedSubclass.hbm.xml"
                      BuildAction = "EmbeddedResource"

--- NEW FILE: C1.cs ---
//------------------------------------------------------------------------------
// <autogenerated>
//     This code was generated by a tool.
//     Runtime Version: v1.1.4322
//
//     Changes to this file may cause incorrect behavior and will be lost if 
//     the code is regenerated.
// </autogenerated>
//------------------------------------------------------------------------------

using System;

namespace NHibernate.DomainModel
{

 /// <summary>
 /// POJO for C1
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class C1 : B
 {

	#region Fields
	/// <summary>
	/// Holder for address
	/// </summary>
	private String _address;
	
	/// <summary>
	/// Holder for d
	/// </summary>
	private NHibernate.DomainModel.D _d;
	
	#endregion

	#region Constructors
	/// <summary>
	/// Default constructor for class C1
	/// </summary>
	public C1()
	{
	}
	
	/// <summary>
	/// Constructor for class C1
	/// </summary>
	/// <param name="name">Initial name value</param>
	/// <param name="count">Initial count value</param>
	/// <param name="map">Initial map value</param>
	/// <param name="address">Initial address value</param>
	/// <param name="d">Initial d value</param>
	public C1(String name, Int32 count, System.Collections.IDictionary map, String address, NHibernate.DomainModel.D d)
		: base(name, count, map)
	{
		this._address = address;
		this._d = d;
	}
	
	/// <summary>
	/// Minimal constructor for class C1
	/// </summary>
	/// <param name="map">Initial map value</param>
	public C1(System.Collections.IDictionary map)
		: base(map)
	{
	}
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for address
	/// </summary>
	public String address
	{
		get
		{
			return this._address;
		}
		set
		{
			this._address = value;
		}
	}
	
	/// <summary>
	/// Get/set for d
	/// </summary>
	public NHibernate.DomainModel.D d
	{
		get
		{
			return this._d;
		}
		set
		{
			this._d = value;
		}
	}
	
	#endregion
 }
}
--- NEW FILE: B.cs ---
//------------------------------------------------------------------------------
// <autogenerated>
//     This code was generated by a tool.
//     Runtime Version: v1.1.4322
//
//     Changes to this file may cause incorrect behavior and will be lost if 
//     the code is regenerated.
// </autogenerated>
//------------------------------------------------------------------------------

using System;

namespace NHibernate.DomainModel
{

 /// <summary>
 /// POJO for B
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class B : A
 {

	#region Fields
	/// <summary>
	/// Holder for count
	/// </summary>
	private Int32 _count;
	
	/// <summary>
	/// Holder for map
	/// </summary>
	private System.Collections.IDictionary _map;
	
	#endregion

	#region Constructors
	/// <summary>
	/// Default constructor for class B
	/// </summary>
	public B()
	{
	}
	
	/// <summary>
	/// Constructor for class B
	/// </summary>
	/// <param name="name">Initial name value</param>
	/// <param name="count">Initial count value</param>
	/// <param name="map">Initial map value</param>
	public B(String name, Int32 count, System.Collections.IDictionary map)
		: base(name)
	{
		this._count = count;
		this._map = map;
	}
	
	/// <summary>
	/// Minimal constructor for class B
	/// </summary>
	/// <param name="map">Initial map value</param>
	public B(System.Collections.IDictionary map)
	{
		this._map = map;
	}
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for count
	/// </summary>
	public Int32 count
	{
		get
		{
			return this._count;
		}
		set
		{
			this._count = value;
		}
	}
	
	/// <summary>
	/// Get/set for map
	/// </summary>
	public System.Collections.IDictionary map
	{
		get
		{
			return this._map;
		}
		set
		{
			this._map = value;
		}
	}
	
	#endregion
 }
}
--- NEW FILE: ABC.hbm.xml ---
<?xml version="1.0"?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">

	<class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0">
		<id name = "id" unsaved-value = "null">
			<generator class="increment"/>
		</id>
		<discriminator column="clazz" type="Int32" not-null="false"/>
		<property name="name"/>
		<subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="-1">
			<property name="count" column="count_" type="Int32"/>
			<subclass name="NHibernate.DomainModel.C1, NHibernate.DomainModel" discriminator-value="null">
				<property name="address" column="c1"/>
				<one-to-one name="d" class="NHibernate.DomainModel.D, NHibernate.DomainModel"/>
			</subclass>
			<subclass name="NHibernate.DomainModel.C2, NHibernate.DomainModel" discriminator-value="2">
				<property name="address" column="c2"/>
			</subclass>
		</subclass>
	</class>

	<class name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" proxy="NHibernate.DomainModel.D">
		<id name = "id" unsaved-value = "null">
			<generator class="assigned"/>
		</id>
		<property name="amount" type="Double"/>
	</class>
	
</hibernate-mapping>
--- NEW FILE: D.cs ---
//------------------------------------------------------------------------------
// <autogenerated>
//     This code was generated by a tool.
//     Runtime Version: v1.1.4322
//
//     Changes to this file may cause incorrect behavior and will be lost if 
//     the code is regenerated.
// </autogenerated>
//------------------------------------------------------------------------------

using System;

namespace NHibernate.DomainModel
{

 /// <summary>
 /// POJO for D
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class D
 {

	#region Fields
	/// <summary>
	/// Holder for id
	/// </summary>
	private Int64 _id;
	
	/// <summary>
	/// Holder for amount
	/// </summary>
	private Double _amount;
	
	#endregion

	#region Constructors
	/// <summary>
	/// Default constructor for class D
	/// </summary>
	public D()
	{
	}
	
	/// <summary>
	/// Constructor for class D
	/// </summary>
	/// <param name="id">Initial id value</param>
	/// <param name="amount">Initial amount value</param>
	public D(Int64 id, Double amount)
	{
		this._id = id;
		this._amount = amount;
	}
	
	/// <summary>
	/// Minimal constructor for class D
	/// </summary>
	/// <param name="id">Initial id value</param>
	public D(Int64 id)
	{
		this._id = id;
	}
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for id
	/// </summary>
	public Int64 id
	{
		get
		{
			return this._id;
		}
		set
		{
			this._id = value;
		}
	}
	
	/// <summary>
	/// Get/set for amount
	/// </summary>
	public Double amount
	{
		get
		{
			return this._amount;
		}
		set
		{
			this._amount = value;
		}
	}
	
	#endregion
 }
}
--- NEW FILE: ABCProxy.hbm.xml ---
<?xml version="1.0" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">
	<class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0"
		proxy="NHibernate.DomainModel.A, NHibernate.DomainModel">
		<id name="id" unsaved-value="null" type="Int64">
			<generator class="increment">
				<param name="table">A</param>
				<param name="column">id</param>
			</generator>
		</id>
		<discriminator column="clazz" type="Int32" force="true" not-null="false" />
		<property name="name" />
		<subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="null"
			proxy="NHibernate.DomainModel.B, NHibernate.DomainModel">
			<property name="count" column="count_" type="Int32" />
			<map name="map">
				<key column="BID" />
				<index column="MAPKEY" type="String" />
				<element column="MAPVAL" type="Int32" />
			</map>
			<subclass name="NHibernate.DomainModel.C1, NHibernate.DomainModel" discriminator-value="1"
				proxy="NHibernate.DomainModel.C1, NHibernate.DomainModel">
				<property name="address" column="c1" />
				<one-to-one name="d" class="NHibernate.DomainModel.D, NHibernate.DomainModel" />
			</subclass>
			<subclass name="NHibernate.DomainModel.C2, NHibernate.DomainModel" discriminator-value="2"
				proxy="NHibernate.DomainModel.C2, NHibernate.DomainModel">
				<property name="address" column="c2" />
			</subclass>
		</subclass>
	</class>
	<class name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0"
		proxy="NHibernate.DomainModel.D, NHibernate.DomainModel">
		<id name="id" unsaved-value="null" type="Int64">
			<generator class="assigned" />
		</id>
		<property name="amount" type="Double" />
	</class>
</hibernate-mapping>
--- NEW FILE: A.cs ---
//------------------------------------------------------------------------------
// <autogenerated>
//     This code was generated by a tool.
//     Runtime Version: v1.1.4322
//
//     Changes to this file may cause incorrect behavior and will be lost if 
//     the code is regenerated.
// </autogenerated>
//------------------------------------------------------------------------------

using System;

namespace NHibernate.DomainModel
{

 /// <summary>
 /// POJO for A
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class A
 {

	#region Fields
	/// <summary>
	/// Holder for id
	/// </summary>
	private Int64 _id;
	
	/// <summary>
	/// Holder for name
	/// </summary>
	private String _name;
	
	#endregion

	#region Constructors
	/// <summary>
	/// Default constructor for class A
	/// </summary>
	public A()
	{
	}
	
	/// <summary>
	/// Constructor for class A
	/// </summary>
	/// <param name="name">Initial name value</param>
	public A(String name)
	{
		this._name = name;
	}
	
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for id
	/// </summary>
	public Int64 id
	{
		get
		{
			return this._id;
		}
		set
		{
			this._id = value;
		}
	}
	
	/// <summary>
	/// Get/set for name
	/// </summary>
	public String name
	{
		get
		{
			return this._name;
		}
		set
		{
			this._name = value;
		}
	}
	
	#endregion
 }
}
--- NEW FILE: C2.cs ---
//------------------------------------------------------------------------------
// <autogenerated>
//     This code was generated by a tool.
//     Runtime Version: v1.1.4322
//
//     Changes to this file may cause incorrect behavior and will be lost if 
//     the code is regenerated.
// </autogenerated>
//------------------------------------------------------------------------------

using System;

namespace NHibernate.DomainModel
{

 /// <summary>
 /// POJO for C2
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class C2 : B
 {

	#region Fields
	/// <summary>
	/// Holder for address
	/// </summary>
	private String _address;
	
	#endregion

	#region Constructors
	/// <summary>
	/// Default constructor for class C2
	/// </summary>
	public C2()
	{
	}
	
	/// <summary>
	/// Constructor for class C2
	/// </summary>
	/// <param name="name">Initial name value</param>
	/// <param name="count">Initial count value</param>
	/// <param name="map">Initial map value</param>
	/// <param name="address">Initial address value</param>
	public C2(String name, Int32 count, System.Collections.IDictionary map, String address)
		: base(name, count, map)
	{
		this._address = address;
	}
	
	/// <summary>
	/// Minimal constructor for class C2
	/// </summary>
	/// <param name="map">Initial map value</param>
	public C2(System.Collections.IDictionary map)
		: base(map)
	{
	}
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for address
	/// </summary>
	public String address
	{
		get
		{
			return this._address;
		}
		set
		{
			this._address = value;
		}
	}
	
	#endregion
 }
}

[Nhibernate-commit] nhibernate/src/NHibernate/Tool/hbm2net ClassMapping.cs,1.9,1.10 FieldProperty.cs,1.6,1.7 convert.vm,1.5,1.6

[Peter S. <sz...@us...>]

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

Modified Files:
	ClassMapping.cs FieldProperty.cs convert.vm 
Log Message:
Made another fix in incrementgenerator. Made a few fixes in hbm2net. Added new abcproxytest, and ignored it because of proxy problems.


Index: convert.vm
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Tool/hbm2net/convert.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** convert.vm	5 Apr 2004 10:09:59 -0000	1.5
--- convert.vm	6 Apr 2004 10:51:41 -0000	1.6
***************
*** 9,12 ****
--- 9,13 ----
  //------------------------------------------------------------------------------
  
+ using System;
  ${classimports}
  ${javaTool.getPackageDeclaration($clazz)}
***************
*** 35,39 ****
  	/// Holder for $field.fieldName
  	/// </summary>
! 	$field.FieldScope() $field.FullyQualifiedTypeName $field.fieldName;
  	
  #end
--- 36,40 ----
  	/// Holder for $field.fieldName
  	/// </summary>
! 	$field.FieldScope() $field.FullyQualifiedTypeName $field.fieldcase;
  	
  #end
***************
*** 62,66 ****
  	{
  #foreach($field in $clazz.LocalFieldsForFullConstructor())  
! 		this.$field.fieldName = $field.fieldName;
  #end
  	}
--- 63,67 ----
  	{
  #foreach($field in $clazz.LocalFieldsForFullConstructor())  
! 		this.$field.fieldcase = $field.fieldName;
  #end
  	}
***************
*** 79,83 ****
  	{
  #foreach($field in $clazz.LocalFieldsForMinimalConstructor())  
! 		this.$field.fieldName = $field.fieldName;
  #end
  	}
--- 80,84 ----
  	{
  #foreach($field in $clazz.LocalFieldsForMinimalConstructor())  
! 		this.$field.fieldcase = $field.fieldName;
  #end
  	}
***************
*** 96,108 ****
  	/// </summary>
  #end
! 	$field.PropertyGetScope() $field.FullyQualifiedTypeName $field.fieldName
  	{
  		get
  		{
! 			return this.$field.fieldName;
  		}
  		set
  		{
! 			this.$field.fieldName = value;
  		}
  	}
--- 97,109 ----
  	/// </summary>
  #end
! 	$field.PropertyGetScope() $field.FullyQualifiedTypeName $field.propcase
  	{
  		get
  		{
! 			return this.$field.fieldcase;
  		}
  		set
  		{
! 			this.$field.fieldcase = value;
  		}
  	}
***************
*** 122,126 ****
  	/// </summary>
  #end
! 	$field.PropertyGetScope() $field.FullyQualifiedTypeName $field.fieldName
  	{
  		get;
--- 123,127 ----
  	/// </summary>
  #end
! 	$field.PropertyGetScope() $field.FullyQualifiedTypeName $field.propcase
  	{
  		get;

Index: FieldProperty.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Tool/hbm2net/FieldProperty.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FieldProperty.cs	2 Apr 2004 11:40:25 -0000	1.6
--- FieldProperty.cs	6 Apr 2004 10:51:41 -0000	1.7
***************
*** 9,12 ****
--- 9,30 ----
  	public class FieldProperty:MappingElement
  	{
+ 		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+ 
+ 		public string fieldcase
+ 		{
+ 			get
+ 			{
+ 				if (fieldName.Substring(0,1) == fieldName.Substring(0,1).ToLower())
+ 					return "_" + fieldName;
+ 				return fieldName.Substring(0,1).ToLower() + fieldName.Substring(1);
+ 			}
+ 		}
+ 		public string propcase
+ 		{
+ 			get
+ 			{
+ 				return fieldName;
+ 			}
+ 		}
  		virtual public System.String FieldName
  		{
***************
*** 227,230 ****
--- 245,250 ----
  			this.foreignKeys = foreignKeys;
  			MetaAttribs = metaattribs;
+ 			if (fieldName.Substring(0,1) == fieldName.Substring(0,1).ToLower())
+ 				log.Warn("Nonstandard naming convention found on " + fieldName);
  		}
  		

Index: ClassMapping.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Tool/hbm2net/ClassMapping.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ClassMapping.cs	5 Apr 2004 10:09:47 -0000	1.9
--- ClassMapping.cs	6 Apr 2004 10:51:41 -0000	1.10
***************
*** 425,429 ****
--- 425,433 ----
  			XmlAttribute att = classElement.Attributes["proxy"];
  			if (att != null)
+ 			{
  				proxyClass = att.Value;
+ 				if (proxyClass.IndexOf(",")>0)
+ 					proxyClass = proxyClass.Substring(0, proxyClass.IndexOf(","));
+ 			}
  			
  			Element id = classElement["id"];

[Nhibernate-commit] nhibernate/src/NHibernate/Persister EntityPersister.cs,1.12,1.13

[Peter S. <sz...@us...>]

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

Modified Files:
	EntityPersister.cs 
Log Message:
Made another fix in incrementgenerator. Made a few fixes in hbm2net. Added new abcproxytest, and ignored it because of proxy problems.


Index: EntityPersister.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Persister/EntityPersister.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** EntityPersister.cs	18 Mar 2004 18:36:09 -0000	1.12
--- EntityPersister.cs	6 Apr 2004 10:51:41 -0000	1.13
***************
*** 835,839 ****
  			if (idProp!=null) InitPropertyPaths( idProp, IdentifierType, IdentifierColumnNames, mapping );
  			if ( hasEmbeddedIdentifier ) InitPropertyPaths( null, IdentifierType, IdentifierColumnNames, mapping );
! 			InitPropertyPaths( PathExpressionParser.EntityID, IdentifierType, IdentifierColumnNames, mapping );
  		
  			if ( IsPolymorphic ) {
--- 835,840 ----
  			if (idProp!=null) InitPropertyPaths( idProp, IdentifierType, IdentifierColumnNames, mapping );
  			if ( hasEmbeddedIdentifier ) InitPropertyPaths( null, IdentifierType, IdentifierColumnNames, mapping );
! 			if (PathExpressionParser.EntityID != idProp)
! 				InitPropertyPaths( PathExpressionParser.EntityID, IdentifierType, IdentifierColumnNames, mapping );
  		
  			if ( IsPolymorphic ) {

[Nhibernate-commit] nhibernate/src/NHibernate.Test ABCProxyTest.cs,NONE,1.1 NHibernate.Test-1.1.csproj,1.9,1.10

[Peter S. <sz...@us...>]

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

Modified Files:
	NHibernate.Test-1.1.csproj 
Added Files:
	ABCProxyTest.cs 
Log Message:
Made another fix in incrementgenerator. Made a few fixes in hbm2net. Added new abcproxytest, and ignored it because of proxy problems.


--- NEW FILE: ABCProxyTest.cs ---
using System;
using NUnit.Framework;
using NHibernate;
using NHibernate.DomainModel;
using System.Collections;

namespace NHibernate.Test
{
	[TestFixture]
	public class ABCProxyTest : TestCase
	{
		[SetUp]
		public void SetUp()
		{
			ExportSchema(new string[] { "ABCProxy.hbm.xml"});
		}

		[Test]
		[Ignore("Test will fail because of proxy initalization problems")]
		public void Subclassing()
		{
			ISession s = sessions.OpenSession();
			ITransaction t = s.BeginTransaction();
			C1 c1 = new C1();
			D d = new D();
			d.amount =213.34f;
			c1.address = "foo bar";
			c1.count = 23432;
			c1.name = "c1";
			c1.d = d;
			s.Save(c1);
			d.id = c1.id;
			s.Save(d);
			t.Commit();
			s.Close();
		
			s = sessions.OpenSession();
			t = s.BeginTransaction();
			// Test won't run after this line because of proxy initalization problems
			A c1a = (A) s.Load(typeof(A), c1.id );
			Assert.IsFalse( NHibernate.IsInitialized(c1a) );
			Assert.IsTrue( c1a.name.Equals("c1") );
			t.Commit();
			s.Close();
		
			s = sessions.OpenSession();
			t = s.BeginTransaction();
			B c1b = (B) s.Load( typeof(B), c1.id );
			Assert.IsTrue(
				(c1b.count==23432) &&
				c1b.name.Equals("c1")
				);
			t.Commit();
			s.Close();
		
/*			s = sessions.openSession();
			t = s.beginTransaction();
			c1 = (C1) s.load( C1.class, c1.getId() );
			assertTrue(
				c1.getAddress().equals("foo bar") &&
				(c1.getCount()==23432) &&
				c1.getName().equals("c1") &&
				c1.getD().getAmount()>213.3f
				);
			t.commit();
			s.close();
		
			s = sessions.openSession();
			t = s.beginTransaction();
			c1a = (A) s.load( A.class, c1.getId() );
			assertTrue( c1a.getName().equals("c1") );
			c1 = (C1) s.load( C1.class, c1.getId() );
			assertTrue(
				c1.getAddress().equals("foo bar") &&
				(c1.getCount()==23432) &&
				c1.getName().equals("c1") &&
				c1.getD().getAmount()>213.3f
				);
			c1b = (B) s.load( B.class, c1.getId() );
			assertTrue(
				(c1b.getCount()==23432) &&
				c1b.getName().equals("c1")
				);
			assertTrue( c1a.getName().equals("c1") );
			t.commit();
			s.close();
		
			s = sessions.openSession();
			t = s.beginTransaction();
			c1a = (A) s.load( A.class, c1.getId() );
			assertTrue( c1a.getName().equals("c1") );
			c1 = (C1) s.load( C1.class, c1.getId(), LockMode.UPGRADE );
			assertTrue(
				c1.getAddress().equals("foo bar") &&
				(c1.getCount()==23432) &&
				c1.getName().equals("c1") &&
				c1.getD().getAmount()>213.3f
				);
			c1b = (B) s.load( B.class, c1.getId(), LockMode.UPGRADE );
			assertTrue(
				(c1b.getCount()==23432) &&
				c1b.getName().equals("c1")
				);
			assertTrue( c1a.getName().equals("c1") );
			t.commit();
			s.close();
		
			s = sessions.openSession();
			t = s.beginTransaction();
			c1a = (A) s.load( A.class, c1.getId() );
			c1 = (C1) s.load( C1.class, c1.getId() );
			c1b = (B) s.load( B.class, c1.getId() );
			assertTrue( c1a.getName().equals("c1") );
			assertTrue(
				c1.getAddress().equals("foo bar") &&
				(c1.getCount()==23432) &&
				c1.getName().equals("c1") &&
				c1.getD().getAmount()>213.3f
				);
			assertTrue(
				(c1b.getCount()==23432) &&
				c1b.getName().equals("c1")
				);
			System.out.println( s.delete("from a in class A") );
			t.commit();
			s.close();
		
			s = sessions.openSession();
			t = s.beginTransaction();
			s.save( new B() );
			s.save( new A() );
			assertTrue( s.find("from b in class B").size()==1 );
			assertTrue( s.find("from a in class A").size()==2 );
			s.delete("from a in class A");
			t.commit();
			s.close();
*/
		}

		[Test]
		public void SubclassMap()
		{
			//Test is converted, but the original didn't check anything
			ISession s = sessions.OpenSession();
			ITransaction t = s.BeginTransaction();
			B b = new B();
			s.Save(b);
			Hashtable map = new Hashtable();
			map.Add("3", 1 ); 
			b.map = map;
			s.Flush();
			s.Delete(b);
			t.Commit();
		
			s = sessions.OpenSession();
			t = s.BeginTransaction();
			map = new Hashtable();
			map.Add("3", 1); 
			b = new B();
			b.map = map;
			s.Save(b);
			s.Flush();
			s.Delete(b);
			t.Commit();
		}
	}
}

Index: NHibernate.Test-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/NHibernate.Test-1.1.csproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NHibernate.Test-1.1.csproj	24 Mar 2004 19:57:06 -0000	1.9
--- NHibernate.Test-1.1.csproj	6 Apr 2004 10:51:42 -0000	1.10
***************
*** 116,119 ****
--- 116,124 ----
              <Include>
                  <File
+                     RelPath = "ABCProxyTest.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "App.config"
                      BuildAction = "None"

[Nhibernate-commit] nhibernate/src/NHibernate/Id IncrementGenerator.cs,1.3,1.4

[Peter S. <sz...@us...>]

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

Modified Files:
	IncrementGenerator.cs 
Log Message:
Made another fix in incrementgenerator. Made a few fixes in hbm2net. Added new abcproxytest, and ignored it because of proxy problems.


Index: IncrementGenerator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Id/IncrementGenerator.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IncrementGenerator.cs	6 Apr 2004 10:18:50 -0000	1.3
--- IncrementGenerator.cs	6 Apr 2004 10:51:40 -0000	1.4
***************
*** 61,66 ****
--- 61,70 ----
  		{
  			string table = PropertiesHelper.GetString("table", parms, (string)parms[IncrementGenerator.Table]);
+ 			if(table == null || table == string.Empty)
+ 				throw new MappingException("param named \"table\" is required for incrementgeneration strategy");
  
  			string column = PropertiesHelper.GetString("column", parms, (string)parms[IncrementGenerator.PK]);
+ 			if(column == null || column == string.Empty)
+ 				throw new MappingException("param named \"column\" is required for incrementgeneration strategy");
  
  			string schema = (string) parms[Schema];
***************
*** 89,97 ****
  				if(rs.Read()) 
  				{
! 					next = rs.GetInt64(0) + 1;
! 				}
! 				else 
! 				{
! 					next = 1;
  				}
  				sql = null;
--- 93,100 ----
  				if(rs.Read()) 
  				{
! 					if (rs.IsDBNull(0))
! 						next = 1;
! 					else
! 						next = rs.GetInt64(0) + 1;
  				}
  				sql = null;

[Nhibernate-commit] nhibernate/src/NHibernate/Id IncrementGenerator.cs,1.2,1.3

[Peter S. <sz...@us...>]

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

Modified Files:
	IncrementGenerator.cs 
Log Message:
Had to do an ugly hack, now it executes itself in parent transaction, this won't work under multithreaded conditions!


Index: IncrementGenerator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Id/IncrementGenerator.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IncrementGenerator.cs	6 Apr 2004 08:48:23 -0000	1.2
--- IncrementGenerator.cs	6 Apr 2004 10:18:50 -0000	1.3
***************
*** 9,12 ****
--- 9,14 ----
  using NHibernate.Util;
  
+ #warning Hack to run tests, should rework transaction handling
+ 
  namespace NHibernate.Id
  {
***************
*** 46,50 ****
  			if(sql!=null) 
  			{
! 				GetNext( session.Connection );
  			}
  
--- 48,52 ----
  			if(sql!=null) 
  			{
! 				GetNext( session.Connection, session.Transaction as Transaction.Transaction );
  			}
  
***************
*** 70,74 ****
  		#endregion
  
! 		private void GetNext(IDbConnection conn) 
  		{
  			log.Debug("fetching initial value: " + sql);
--- 72,76 ----
  		#endregion
  
! 		private void GetNext(IDbConnection conn, Transaction.Transaction transaction) 
  		{
  			log.Debug("fetching initial value: " + sql);
***************
*** 77,80 ****
--- 79,83 ----
  			cmd.CommandType = CommandType.Text;
  			cmd.CommandText = sql;
+ 			cmd.Transaction = transaction.AdoTransaction;
  			cmd.Prepare();
  

[Nhibernate-commit] nhibernate/src/NHibernate/Id IncrementGenerator.cs,1.1,1.2

[Peter S. <sz...@us...>]

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

Modified Files:
	IncrementGenerator.cs 
Log Message:
Fixed many small problems with incrementgenerator - code can compile now.


Index: IncrementGenerator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Id/IncrementGenerator.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IncrementGenerator.cs	6 Apr 2004 00:53:20 -0000	1.1
--- IncrementGenerator.cs	6 Apr 2004 08:48:23 -0000	1.2
***************
*** 6,9 ****
--- 6,11 ----
  using NHibernate.Dialect;
  using NHibernate.Engine;
+ using NHibernate.Type;
+ using NHibernate.Util;
  
  namespace NHibernate.Id
***************
*** 56,66 ****
  		public void Configure(IType type, System.Collections.IDictionary parms, Dialect.Dialect d)
  		{
! 			string table = parms["table"];
! 			if(table==null) table = parms[IncrementGenerator.Table);
  
! 			string column = parms["column"];
! 			if(column==null) parms[IncrementGenerator.PK];
  
! 			string schema = parms[IncrementGenerator.Schema];
  
  			sql = "select max(" + column + ") from " + ( schema==null ? table : schema + ":" + table );
--- 58,66 ----
  		public void Configure(IType type, System.Collections.IDictionary parms, Dialect.Dialect d)
  		{
! 			string table = PropertiesHelper.GetString("table", parms, (string)parms[IncrementGenerator.Table]);
  
! 			string column = PropertiesHelper.GetString("column", parms, (string)parms[IncrementGenerator.PK]);
  
! 			string schema = (string) parms[Schema];
  
  			sql = "select max(" + column + ") from " + ( schema==null ? table : schema + ":" + table );
***************
*** 86,90 ****
  				if(rs.Read()) 
  				{
! 					next = rs[0] + 1;
  				}
  				else 
--- 86,90 ----
  				if(rs.Read()) 
  				{
! 					next = rs.GetInt64(0) + 1;
  				}
  				else 

[Nhibernate-commit] nhibernate/src/NHibernate/Expression Junction.cs,1.3,1.4

[Michael T. <mt...@us...>]

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

Modified Files:
	Junction.cs 
Log Message:
fixed AllEq function

Index: Junction.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Expression/Junction.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Junction.cs	28 Mar 2004 06:05:09 -0000	1.3
--- Junction.cs	6 Apr 2004 04:11:33 -0000	1.4
***************
*** 40,44 ****
  			}
  		
! 			return (TypedValue[]) typedValues.ToArray( typeof (TypedValue[]) );
  
  		}
--- 40,44 ----
  			}
  		
! 			return (TypedValue[]) typedValues.ToArray( typeof (TypedValue) );
  
  		}

[Nhibernate-commit] nhibernate/src/NHibernate/Expression Expression.cs,1.7,1.8

[Michael T. <mt...@us...>]

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

Modified Files:
	Expression.cs 
Log Message:
fixed AllEq function

Index: Expression.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Expression/Expression.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Expression.cs	28 Mar 2004 06:05:09 -0000	1.7
--- Expression.cs	6 Apr 2004 04:11:19 -0000	1.8
***************
*** 252,256 ****
  			Conjunction conj = Conjunction();
  
! 			foreach ( IDictionaryEnumerator item in propertyNameValues ) {
  				conj.Add( Eq( item.Key.ToString(), item.Value ) );
  			}
--- 252,256 ----
  			Conjunction conj = Conjunction();
  
! 			foreach ( DictionaryEntry item in propertyNameValues ) {
  				conj.Add( Eq( item.Key.ToString(), item.Value ) );
  			}

[Nhibernate-commit] nhibernate/src/NHibernate/Impl CriteriaImpl.cs,1.5,1.6

[Michael T. <mt...@us...>]

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

Modified Files:
	CriteriaImpl.cs 
Log Message:
fixed enum can't be null error

Index: CriteriaImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CriteriaImpl.cs	28 Mar 2004 06:17:11 -0000	1.5
--- CriteriaImpl.cs	6 Apr 2004 03:07:48 -0000	1.6
***************
*** 106,110 ****
  		public FetchMode GetFetchMode(string path) 
  		{
! 			return (FetchMode)fetchModes[path];
  		}
  
--- 106,117 ----
  		public FetchMode GetFetchMode(string path) 
  		{
! 			if (fetchModes.Contains(path))
! 			{
! 				return (FetchMode)fetchModes[path];
! 			}
! 			else
! 			{
! 			    return FetchMode.Default;
! 			}
  		}
  

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.13,1.14

[Michael D. <mik...@us...>]

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

Modified Files:
	NHibernate-1.1.csproj 
Log Message:
Added IncrementGenerator to csproj for JIRA NH-23

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NHibernate-1.1.csproj	6 Apr 2004 00:31:07 -0000	1.13
--- NHibernate-1.1.csproj	6 Apr 2004 02:31:32 -0000	1.14
***************
*** 849,852 ****
--- 849,857 ----
                  />
                  <File
+                     RelPath = "Id\IncrementGenerator.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Id\IPersistentIdentifierGenerator.cs"
                      SubType = "Code"

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect QueryFunctionStandard.cs,NONE,1.1

[Michael D. <mik...@us...>]

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

Added Files:
	QueryFunctionStandard.cs 
Log Message:
Added QueryFunctionStandard to Dialect namespace - part of JIRA NH-46

--- NEW FILE: QueryFunctionStandard.cs ---
using System;

using NHibernate.Engine;
using NHibernate.Hql;
using NHibernate.Type;

namespace NHibernate.Dialect
{
	/// <summary>
	/// Provides a standard implementation that supports the majority of the HQL
	/// functions that are translated to SQL.
	/// </summary>
	/// <remarks>
	/// The Dialect and its sub-classes use this class to provide details required
	/// for processing of the associated function.
	/// </remarks>
	public class QueryFunctionStandard : IQueryFunctionInfo
	{
		private IType returnType = null;

		public QueryFunctionStandard()
		{
		}

		public QueryFunctionStandard(IType returnType) 
		{
			this.returnType = returnType;
		}

		#region IQueryFunctionInfo Members

		public IType QueryFunctionType(IType columnType, IMapping mapping)
		{
			if(returnType==null) return columnType;

			return returnType;
		}

		public bool IsFunctionArgs
		{
			get{ return true;}
		}

		public bool IsFunctionNoArgsUseParanthesis
		{
			get	{ return true;}
		}

		#endregion
	}
}

[Nhibernate-commit] nhibernate/src/NHibernate/Id IncrementGenerator.cs,NONE,1.1 IdentifierGeneratorFactory.cs,1.7,1.8

[Michael D. <mik...@us...>]

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

Modified Files:
	IdentifierGeneratorFactory.cs 
Added Files:
	IncrementGenerator.cs 
Log Message:
Added IncrementGenerator for JIRA NH-23

--- NEW FILE: IncrementGenerator.cs ---
using System;
using System.Collections;
using System.Data;
using System.Runtime.CompilerServices;

using NHibernate.Dialect;
using NHibernate.Engine;

namespace NHibernate.Id
{
	/// <summary>
	/// An <see cref="IIdentifierGenerator"/> that returns an Int64, constructed
	/// by counting from the maximum primary key value at startup.
	/// </summary>
	/// <remarks>
	/// <para>
	/// Not safe for use in a cluster!
	/// </para>
	/// <para>
	/// Mapping parameters supported (but not usually needed) are: <c>table</c>, <c>column</c>
	/// </para>
	/// </remarks>
	/// 
	public class IncrementGenerator : IIdentifierGenerator, IConfigurable
	{
		private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(IncrementGenerator));
		
		private static readonly string Schema = "schema";
		private static readonly string Table = "target_table";
		private static readonly string PK = "target_column";

		private long next;
		private string sql;

		public IncrementGenerator()
		{
		}

		#region IIdentifierGenerator Members

		[MethodImpl(MethodImplOptions.Synchronized)]
		public object Generate(ISessionImplementor session, object obj)
		{
			if(sql!=null) 
			{
				GetNext( session.Connection );
			}

			return next++;
		}

		#endregion

		#region IConfigurable Members

		public void Configure(IType type, System.Collections.IDictionary parms, Dialect.Dialect d)
		{
			string table = parms["table"];
			if(table==null) table = parms[IncrementGenerator.Table);

			string column = parms["column"];
			if(column==null) parms[IncrementGenerator.PK];

			string schema = parms[IncrementGenerator.Schema];

			sql = "select max(" + column + ") from " + ( schema==null ? table : schema + ":" + table );

		}

		#endregion

		private void GetNext(IDbConnection conn) 
		{
			log.Debug("fetching initial value: " + sql);

			IDbCommand cmd = conn.CreateCommand();
			cmd.CommandType = CommandType.Text;
			cmd.CommandText = sql;
			cmd.Prepare();

			IDataReader rs = null;

			try 
			{
				rs = cmd.ExecuteReader();
				if(rs.Read()) 
				{
					next = rs[0] + 1;
				}
				else 
				{
					next = 1;
				}
				sql = null;
				log.Debug("first free id: " + next);
			}
			finally 
			{
				if(rs!=null) rs.Close();
				cmd.Dispose();
			}
		}
	}
}

Index: IdentifierGeneratorFactory.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Id/IdentifierGeneratorFactory.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** IdentifierGeneratorFactory.cs	28 Mar 2004 06:06:40 -0000	1.7
--- IdentifierGeneratorFactory.cs	6 Apr 2004 00:53:20 -0000	1.8
***************
*** 54,59 ****
  			idgenerators.Add("seqhilo", typeof(SequenceHiLoGenerator));
  			idgenerators.Add("vm", typeof(CounterGenerator));
! 			//TODO: no Increment Generator
! 			//idgenerators.Add("increment", typeof(IncrementGenerator));
  			idgenerators.Add("foreign", typeof(ForeignGenerator));
  			idgenerators.Add("guid", typeof(GuidGenerator));
--- 54,58 ----
  			idgenerators.Add("seqhilo", typeof(SequenceHiLoGenerator));
  			idgenerators.Add("vm", typeof(CounterGenerator));
! 			idgenerators.Add("increment", typeof(IncrementGenerator));
  			idgenerators.Add("foreign", typeof(ForeignGenerator));
  			idgenerators.Add("guid", typeof(GuidGenerator));

[Nhibernate-commit] nhibernate/src/NHibernate NHibernate-1.1.csproj,1.12,1.13

[Michael D. <mik...@us...>]

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

Modified Files:
	NHibernate-1.1.csproj 
Log Message:
Added IQueryFunctionInfo to HQL and some implementations to the Dialect.  Resolves JIRA NH-46

Index: NHibernate-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/NHibernate-1.1.csproj,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NHibernate-1.1.csproj	29 Mar 2004 04:07:03 -0000	1.12
--- NHibernate-1.1.csproj	6 Apr 2004 00:31:07 -0000	1.13
***************
*** 481,484 ****
--- 481,489 ----
                  />
                  <File
+                     RelPath = "Dialect\QueryFunctionStandard.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Dialect\SybaseDialect.cs"
                      SubType = "Code"
***************
*** 754,757 ****
--- 759,767 ----
                  />
                  <File
+                     RelPath = "Hql\IQueryFunctionInfo.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Hql\OrderByParser.cs"
                      SubType = "Code"

[Nhibernate-commit] nhibernate/src/NHibernate/Hql IQueryFunctionInfo.cs,NONE,1.1

[Michael D. <mik...@us...>]

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

Added Files:
	IQueryFunctionInfo.cs 
Log Message:
Added IQueryFunctionInfo to HQL and some implementations to the Dialect.  Resolves JIRA NH-46

--- NEW FILE: IQueryFunctionInfo.cs ---
using System;

using NHibernate.Engine;
using NHibernate.Type;

namespace NHibernate.Hql
{
	/// <summary>
	/// Provides support routines for the HQL functions as used in the various
	/// SQL Dialects.
	/// </summary>
	/// <remarks>
	/// Provides an interface for supporting various HQL functions that are translated
	/// to SQL.  The Dialect and its sub-classes use this interface to
	/// provide details required for processing of the function.
	/// </remarks>
	public interface IQueryFunctionInfo
	{
		IType QueryFunctionType(IType columnType, IMapping mapping);

		bool IsFunctionArgs { get; }

		bool IsFunctionNoArgsUseParanthesis { get; } 
	}
}

[Nhibernate-commit] nhibernate/src/NHibernate/Dialect Dialect.cs,1.17,1.18

[Michael D. <mik...@us...>]

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

Modified Files:
	Dialect.cs 
Log Message:
Added IQueryFunctionInfo to HQL and some implementations to the Dialect.  Resolves JIRA NH-46

Index: Dialect.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Dialect/Dialect.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Dialect.cs	2 Apr 2004 15:13:05 -0000	1.17
--- Dialect.cs	6 Apr 2004 00:31:07 -0000	1.18
***************
*** 4,10 ****
--- 4,13 ----
  using System.Text;
  
+ using NHibernate.Engine;
+ using NHibernate.Hql;
  using NHibernate.Sql;
  using NHibernate.SqlCommand;
  using NHibernate.SqlTypes;
+ using NHibernate.Type;
  using NHibernate.Util;
  
***************
*** 30,34 ****
  		static Dialect() 
  		{
! 			//TODO: H2.0.3 - add QueryFunctions in here
  		}
  
--- 33,41 ----
  		static Dialect() 
  		{
! 			aggregateFunctions["count"] = new Dialect.CountQueryFunctionInfo();
! 			aggregateFunctions["avg"] = new Dialect.CountQueryFunctionInfo();
! 			aggregateFunctions["max"] = new QueryFunctionStandard();
! 			aggregateFunctions["min"] = new QueryFunctionStandard();
! 			aggregateFunctions["sum"] = new QueryFunctionStandard();
  		}
  
***************
*** 705,708 ****
--- 712,781 ----
  		}
  
+ 		public class CountQueryFunctionInfo : IQueryFunctionInfo 
+ 		{
+ 			#region IQueryFunctionInfo Members
+ 
+ 			public IType QueryFunctionType(IType columnType, IMapping mapping)
+ 			{
+ 				return NHibernate.Int32;
+ 			}
+ 
+ 			public bool IsFunctionArgs
+ 			{
+ 				get { return true;}
+ 			}
+ 
+ 			public bool IsFunctionNoArgsUseParanthesis
+ 			{
+ 				get { return true;}
+ 			}
+ 
+ 			#endregion
+ 		}
+ 
+ 		public class AvgQueryFunctionInfo : IQueryFunctionInfo
+ 		{
+ 			#region IQueryFunctionInfo Members
+ 
+ 			public IType QueryFunctionType(IType columnType, IMapping mapping)
+ 			{
+ 				SqlType[] sqlTypes;
+ 				try 
+ 				{
+ 					sqlTypes = columnType.SqlTypes(mapping);
+ 				}
+ 				catch (MappingException me) 
+ 				{
+ 					throw new QueryException(me);
+ 				}
+ 
+ 				if(sqlTypes.Length!=1) throw new QueryException("multi-column type can not be in avg()");
+ 				
+ 				SqlType sqlType = sqlTypes[0];
+ 
+ 				if(sqlType.DbType==DbType.Int16 || sqlType.DbType==DbType.Int32 || sqlType.DbType==DbType.Int64)
+ 				{
+ 					return NHibernate.Single;
+ 				}
+ 				else 
+ 				{
+ 					return columnType;
+ 				}
+ 			}
+ 
+ 			public bool IsFunctionArgs
+ 			{
+ 				get { return true; }
+ 			}
+ 
+ 			public bool IsFunctionNoArgsUseParanthesis
+ 			{
+ 				get { return true; }
+ 			}
+ 
+ 			#endregion
+ 		}
+ 
+ 
  	}
  }

[Nhibernate-commit] nhibernate readme.html,1.8,1.9

[Michael D. <mik...@us...>]

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

Modified Files:
	readme.html 
Log Message:
syncmail should now be working and I am subscribed so I can verify.

Index: readme.html
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/readme.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** readme.html	5 Apr 2004 15:52:15 -0000	1.8
--- readme.html	5 Apr 2004 15:55:53 -0000	1.9
***************
*** 35,39 ****
    <li>log4net</li>
  </ul>
- <b>test-more test-yet again why won't this work!</b>
  </body>
  </html>
\ No newline at end of file
--- 35,38 ----

[Nhibernate-commit] nhibernate readme.html,1.7,1.8

[Michael D. <mik...@us...>]

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

Modified Files:
	readme.html 
Log Message:
changed syncmail script to sourceforge's file.

Index: readme.html
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/readme.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** readme.html	5 Apr 2004 15:42:01 -0000	1.7
--- readme.html	5 Apr 2004 15:52:15 -0000	1.8
***************
*** 35,39 ****
    <li>log4net</li>
  </ul>
! <b>test-more test</b>
  </body>
  </html>
\ No newline at end of file
--- 35,39 ----
    <li>log4net</li>
  </ul>
! <b>test-more test-yet again why won't this work!</b>
  </body>
  </html>
\ No newline at end of file