Thread: [Nhibernate-commit] nhibernate/src/NHibernate/Loader AbstractEntityLoader.cs,1.10,1.11 CollectionLoa

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	AbstractEntityLoader.cs CollectionLoader.cs CriteriaLoader.cs 
	EntityLoader.cs Loader.cs OneToManyLoader.cs 
	OuterJoinLoader.cs SimpleEntityLoader.cs 
Log Message:
NHibernate is now CLSCompliant

Index: AbstractEntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/AbstractEntityLoader.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AbstractEntityLoader.cs	28 Aug 2004 05:26:36 -0000	1.10
--- AbstractEntityLoader.cs	21 Nov 2004 22:56:29 -0000	1.11
***************
*** 14,23 ****
  	{
  		protected ILoadable persister;
! 		protected string alias;

  		public AbstractEntityLoader(ILoadable persister, ISessionFactoryImplementor factory) : base(factory.Dialect) 
  		{
  			this.persister = persister;
! 			alias = Alias(persister.ClassName, 0);
  		}

--- 14,28 ----
  	{
  		protected ILoadable persister;
! 		private string alias;

  		public AbstractEntityLoader(ILoadable persister, ISessionFactoryImplementor factory) : base(factory.Dialect) 
  		{
  			this.persister = persister;
! 			alias = ToAlias(persister.ClassName, 0);
! 		}
! 
! 		protected string Alias 
! 		{
! 			get { return alias; }
  		}

***************
*** 32,37 ****

  			int joins=associations.Count;
! 			suffixes = new string[joins+1];
! 			for (int i=0; i<=joins; i++) suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore;

  			JoinFragment ojf = OuterJoins(associations);
--- 37,42 ----

  			int joins=associations.Count;
! 			Suffixes = new string[joins+1];
! 			for (int i=0; i<=joins; i++) Suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore;

  			JoinFragment ojf = OuterJoins(associations);
***************
*** 39,43 ****
  			selectBuilder.SetSelectClause(
  				(joins==0 ? String.Empty : SelectString(associations) + ",") +
! 				SelectString(persister, alias, suffixes[joins] )
  				)
  				.SetFromClause
--- 44,48 ----
  			selectBuilder.SetSelectClause(
  				(joins==0 ? String.Empty : SelectString(associations) + ",") +
! 				SelectString(persister, alias, Suffixes[joins] )
  				)
  				.SetFromClause
***************
*** 77,87 ****

  			int joins=associations.Count;
! 			suffixes = new string[joins+1];
! 			for (int i=0; i<=joins; i++) suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore;

  			JoinFragment ojf = OuterJoins(associations);
  			sqlBuilder.SetSelectClause(
  				(joins==0 ? String.Empty : SelectString(associations) + ",") +
! 				SelectString(persister, alias, suffixes[joins] )
  				);

--- 82,92 ----

  			int joins=associations.Count;
! 			Suffixes = new string[joins+1];
! 			for (int i=0; i<=joins; i++) Suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore;

  			JoinFragment ojf = OuterJoins(associations);
  			sqlBuilder.SetSelectClause(
  				(joins==0 ? String.Empty : SelectString(associations) + ",") +
! 				SelectString(persister, alias, Suffixes[joins] )
  				);

***************
*** 105,109 ****
  			sqlBuilder.SetOrderByClause(orderBy);

! 			this.sqlString = sqlBuilder.ToSqlString();

  			classPersisters = new ILoadable[joins+1];
--- 110,114 ----
  			sqlBuilder.SetOrderByClause(orderBy);

! 			this.SqlString = sqlBuilder.ToSqlString();

  			classPersisters = new ILoadable[joins+1];

Index: SimpleEntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/SimpleEntityLoader.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SimpleEntityLoader.cs	30 Apr 2004 14:06:47 -0000	1.7
--- SimpleEntityLoader.cs	21 Nov 2004 22:56:29 -0000	1.8
***************
*** 34,40 ****
  		}

! 		public override SqlString SqlString 
  		{
! 			get {return sqlString;}
  		}

--- 34,41 ----
  		}

! 		protected internal override SqlString SqlString 
  		{
! 			get { return sqlString; }
! 			set { sqlString = value; }
  		}

***************
*** 50,53 ****
--- 51,55 ----
  		{
  			get { return NoSuffix; }
+ 			set { throw new NotSupportedException( "A SimpleEntityLoader has no Suffixes" ); }
  		}

Index: OneToManyLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OneToManyLoader.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** OneToManyLoader.cs	28 Aug 2004 05:26:36 -0000	1.10
--- OneToManyLoader.cs	21 Nov 2004 22:56:29 -0000	1.11
***************
*** 36,40 ****
  				((EntityType) collPersister.ElementType).PersistentClass);

! 			string alias = Alias(collectionPersister.QualifiedTableName, 0);

  			SqlString whereSqlString = null;
--- 36,40 ----
  				((EntityType) collPersister.ElementType).PersistentClass);

! 			string alias = ToAlias(collectionPersister.QualifiedTableName, 0);

  			SqlString whereSqlString = null;
***************
*** 46,51 ****

  			int joins=associations.Count;
! 			suffixes = new string[joins+1];
! 			for (int i=0; i<=joins; i++) suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore;

--- 46,51 ----

  			int joins=associations.Count;
! 			Suffixes = new string[joins+1];
! 			for (int i=0; i<=joins; i++) Suffixes[i] = (joins==0) ? String.Empty : i.ToString() + StringHelper.Underscore;

***************
*** 58,62 ****
  				(joins==0 ? String.Empty : "," + SelectString(associations) ) +
  				", " +
! 				SelectString( persister, alias, suffixes[joins] )
  				);

--- 58,62 ----
  				(joins==0 ? String.Empty : "," + SelectString(associations) ) +
  				", " +
! 				SelectString( persister, alias, Suffixes[joins] )
  				);

***************
*** 80,84 ****
  			if(collectionPersister.HasOrdering) selectBuilder.SetOrderByClause( collectionPersister.GetSQLOrderByString(alias) );

! 			this.sqlString = selectBuilder.ToSqlString();

--- 80,84 ----
  			if(collectionPersister.HasOrdering) selectBuilder.SetOrderByClause( collectionPersister.GetSQLOrderByString(alias) );

! 			this.SqlString = selectBuilder.ToSqlString();

Index: CollectionLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CollectionLoader.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CollectionLoader.cs	20 Aug 2004 17:39:02 -0000	1.9
--- CollectionLoader.cs	21 Nov 2004 22:56:29 -0000	1.10
***************
*** 24,28 ****
  			idType = persister.KeyType;

! 			string alias = Alias( persister.QualifiedTableName, 0);

  			//TODO: H2.0.3 the whereString is appended with the " and " - I don't think
--- 24,28 ----
  			idType = persister.KeyType;

! 			string alias = ToAlias( persister.QualifiedTableName, 0);

  			//TODO: H2.0.3 the whereString is appended with the " and " - I don't think
***************
*** 36,41 ****

  			int joins = associations.Count;
! 			suffixes = new string[joins];
! 			for (int i=0; i<joins; i++) suffixes[i] = i.ToString() + StringHelper.Underscore;

  			JoinFragment ojf = OuterJoins(associations);
--- 36,41 ----

  			int joins = associations.Count;
! 			Suffixes = new string[joins];
! 			for (int i=0; i<joins; i++) Suffixes[i] = i.ToString() + StringHelper.Underscore;

  			JoinFragment ojf = OuterJoins(associations);
***************
*** 54,58 ****
  			if(persister.HasOrdering) selectBuilder.SetOrderByClause(persister.GetSQLOrderByString(alias));

! 			this.sqlString = selectBuilder.ToSqlString();

  			classPersisters = new ILoadable[joins];
--- 54,58 ----
  			if(persister.HasOrdering) selectBuilder.SetOrderByClause(persister.GetSQLOrderByString(alias));

! 			this.SqlString = selectBuilder.ToSqlString();

  			classPersisters = new ILoadable[joins];

Index: OuterJoinLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/OuterJoinLoader.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** OuterJoinLoader.cs	28 Aug 2004 05:26:36 -0000	1.14
--- OuterJoinLoader.cs	21 Nov 2004 22:56:29 -0000	1.15
***************
*** 32,37 ****
  		protected LockMode[] lockModeArray;

! 		protected SqlString sqlString;
! 		protected string[] suffixes;

--- 32,37 ----
  		protected LockMode[] lockModeArray;

! 		private SqlString sqlString;
! 		private string[] suffixes;

***************
*** 136,140 ****
  				assoc.Subpersister = subpersister;
  				assoc.ForeignKeyColumns = columns;
! 				string subalias = Alias(subpersister.ClassName, associations.Count);
  				assoc.Subalias = subalias;

--- 136,140 ----
  				assoc.Subpersister = subpersister;
  				assoc.ForeignKeyColumns = columns;
! 				string subalias = ToAlias(subpersister.ClassName, associations.Count);
  				assoc.Subalias = subalias;

***************
*** 374,383 ****
  		}

! 		public override SqlString SqlString 
  		{
! 			get { return sqlString;}
  		}

- 
  		public override ILoadable[] Persisters 
  		{
--- 374,383 ----
  		}

! 		protected internal override SqlString SqlString 
  		{
! 			get { return sqlString; }
! 			set { sqlString = value; }
  		}

  		public override ILoadable[] Persisters 
  		{
***************
*** 433,444 ****
  		{
  			get { return suffixes; }
  		}

! 		protected string Alias(string tableName, int n) 
  		{
! 			tableName = StringHelper.Unqualify(tableName); //TODO: this is broken if we have quoted identifier with a "."

  			//TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed...
! 			return (new Alias(10, n.ToString() + StringHelper.Underscore)).ToAliasString(tableName, dialect);
  		}

--- 433,449 ----
  		{
  			get { return suffixes; }
+ 			set { suffixes = value; }
  		}

! 		protected string ToAlias(string tableName, int n) 
  		{
! 			// H2.0.3 - was called Alias, but changed it to ToAlias because I wanted to have
! 			// a protected property named Alias
! 		
! 			//TODO: this is broken if we have quoted identifier with a "."
! 			tableName = StringHelper.Unqualify(tableName); 

  			//TODO: H2.0.3 - changes tableName to lower case - don't know why it is needed...
! 			return ( new Alias(10, n.ToString() + StringHelper.Underscore) ).ToAliasString( tableName, dialect );
  		}

Index: EntityLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/EntityLoader.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EntityLoader.cs	20 Aug 2004 17:39:02 -0000	1.5
--- EntityLoader.cs	21 Nov 2004 22:56:29 -0000	1.6
***************
*** 24,31 ****

  			SqlSelectBuilder selectBuilder = new SqlSelectBuilder(factory);
! 			selectBuilder.SetWhereClause(alias, persister.IdentifierColumnNames, persister.IdentifierType);

  			RenderStatement(selectBuilder, factory);
! 			this.sqlString = selectBuilder.ToSqlString();

  			PostInstantiate();
--- 24,31 ----

  			SqlSelectBuilder selectBuilder = new SqlSelectBuilder(factory);
! 			selectBuilder.SetWhereClause( Alias, persister.IdentifierColumnNames, persister.IdentifierType );

  			RenderStatement(selectBuilder, factory);
! 			this.SqlString = selectBuilder.ToSqlString();

  			PostInstantiate();

Index: Loader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/Loader.cs,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Loader.cs	8 Nov 2004 02:53:55 -0000	1.39
--- Loader.cs	21 Nov 2004 22:56:29 -0000	1.40
***************
*** 35,39 ****
  		/// The SqlString to be called; implemented by all subclasses
  		/// </summary>
! 		public abstract SqlString SqlString {get;}

  		/// <summary>
--- 35,40 ----
  		/// The SqlString to be called; implemented by all subclasses
  		/// </summary>
! 		/// <remarks>TODO: add something about internal</remarks>
! 		protected internal abstract SqlString SqlString {get; set;}

  		/// <summary>
***************
*** 47,51 ****
  		/// implemented by all subclasses
  		/// </summary>
! 		protected abstract string[] Suffixes { get; }

  		/// <summary>
--- 48,53 ----
  		/// implemented by all subclasses
  		/// </summary>
! 		/// added set
! 		protected abstract string[] Suffixes { get; set; }

  		/// <summary>
***************
*** 540,551 ****
  		}

- //		[Obsolete("use QueryParameters instead.")]
- //		protected virtual IDbCommand PrepareCommand(SqlString sqlString, object[] values, IType[] types, IDictionary namedParams, RowSelection selection, bool scroll, ISessionImplementor session) 
- //		{
- //			QueryParameters qp = new QueryParameters( types, values, namedParams, null, selection );
- //			return PrepareCommand( sqlString, qp, scroll, session );
- // 
- //		}
- 
  		/// <summary>
  		/// Creates an IDbCommand object and populates it with the values necessary to execute it against the 
--- 542,545 ----

Index: CriteriaLoader.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Loader/CriteriaLoader.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CriteriaLoader.cs	31 Oct 2004 04:31:00 -0000	1.9
--- CriteriaLoader.cs	21 Nov 2004 22:56:29 -0000	1.10
***************
*** 44,51 ****
  				commaNeeded = true;

! 				orderByBuilder.Append(ord.ToStringForSql(factory, criteria.PersistentClass, alias));
  			} 

! 			RenderStatement(criteria.Expression.ToSqlString(factory, criteria.PersistentClass, alias), orderByBuilder.ToString(), factory);

  			PostInstantiate();
--- 44,51 ----
  				commaNeeded = true;

! 				orderByBuilder.Append(ord.ToStringForSql(factory, criteria.PersistentClass, Alias));
  			} 

! 			RenderStatement(criteria.Expression.ToSqlString(factory, criteria.PersistentClass, Alias), orderByBuilder.ToString(), factory);

  			PostInstantiate();

Thread: [Nhibernate-commit] nhibernate/src/NHibernate/Loader AbstractEntityLoader.cs,1.10,1.11 CollectionLoa

nhibernate-commit