[Nhibernate-commit] nhibernate/src/NHibernate/Hql FilterTranslator.cs,1.7,1.8 PathExpressionParser.cs,1.17,1.18 QueryTranslator.cs,1.47,1.48

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

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

Modified Files:
	FilterTranslator.cs PathExpressionParser.cs QueryTranslator.cs 
Log Message:
NHibernate is now CLSCompliant

Index: QueryTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/QueryTranslator.cs,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** QueryTranslator.cs	31 Oct 2004 04:30:59 -0000	1.47
--- QueryTranslator.cs	21 Nov 2004 22:56:28 -0000	1.48
***************
*** 69,73 ****
  		private string queryString;
  		private bool distinct = false;
! 		protected bool compiled;
  		private SqlCommand.SqlString sqlString;
  		private System.Type holderClass;
--- 69,73 ----
  		private string queryString;
  		private bool distinct = false;
! 		private bool compiled; //protected 
  		private SqlCommand.SqlString sqlString;
  		private System.Type holderClass;
***************
*** 117,121 ****
  		public void Compile(ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) 
  		{
! 			if (!compiled) 
  			{
  				this.factory = factory;
--- 117,121 ----
  		public void Compile(ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) 
  		{
! 			if (!Compiled) 
  			{
  				this.factory = factory;
***************
*** 254,259 ****
  		}
  
! 		public override SqlString SqlString
  		{
  			get 
  			{
--- 254,260 ----
  		}
  
! 		protected internal override SqlString SqlString
  		{
+ 			// this needs internal access because the WhereParser needs to be able to "get" it.
  			get 
  			{
***************
*** 261,264 ****
--- 262,271 ----
  				return sqlString;
  			}
+ 			set 
+ 			{ 
+ 				throw new NotSupportedException( "SqlString can not be set by class outside of QueryTranslator" );
+ 				//sqlString = value; }
+ 			}
+ 
  		}
  
***************
*** 834,841 ****
  		protected override string[] Suffixes 
  		{
! 			get 
! 			{ 
! 				return suffixes; 
! 			}
  		}
  
--- 841,846 ----
  		protected override string[] Suffixes 
  		{
! 			get { return suffixes; }
! 			set { suffixes = value; }
  		}
  

Index: PathExpressionParser.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/PathExpressionParser.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** PathExpressionParser.cs	20 Aug 2004 17:39:02 -0000	1.17
--- PathExpressionParser.cs	21 Nov 2004 22:56:28 -0000	1.18
***************
*** 44,48 ****
  		protected string[] columns;
  		protected string[] collectionElementColumns;
! 		protected string collectionName;
  		private string collectionOwnerName;
  		private string collectionRole;
--- 44,48 ----
  		protected string[] columns;
  		protected string[] collectionElementColumns;
! 		private string collectionName; //protected
  		private string collectionOwnerName;
  		private string collectionRole;

Index: FilterTranslator.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Hql/FilterTranslator.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FilterTranslator.cs	30 Apr 2004 08:34:25 -0000	1.7
--- FilterTranslator.cs	21 Nov 2004 22:56:28 -0000	1.8
***************
*** 21,25 ****
  		public void Compile(string collectionRole, ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) 
  		{
! 			if (!compiled) 
  			{
  				this.factory = factory; // yick!
--- 21,25 ----
  		public void Compile(string collectionRole, ISessionFactoryImplementor factory, string queryString, IDictionary replacements, bool scalar) 
  		{
! 			if (!Compiled) 
  			{
  				this.factory = factory; // yick!