From: Kevin W. <kev...@us...> - 2004-12-31 17:54:30
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Expression In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22649 Modified Files: InsensitiveLikeExpression.cs Junction.cs LeExpression.cs Log Message: fixing xml comments and letting ReSharper do reformatting Index: InsensitiveLikeExpression.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Expression/InsensitiveLikeExpression.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InsensitiveLikeExpression.cs 28 Mar 2004 06:05:09 -0000 1.3 --- InsensitiveLikeExpression.cs 31 Dec 2004 17:54:19 -0000 1.4 *************** *** 1,11 **** - using System; - using System.Text; - using NHibernate.Dialect; using NHibernate.Engine; - using NHibernate.SqlCommand; using NHibernate.Persister; using NHibernate.Type; - using NHibernate.Util; namespace NHibernate.Expression --- 1,7 ---- using NHibernate.Dialect; using NHibernate.Engine; using NHibernate.Persister; + using NHibernate.SqlCommand; using NHibernate.Type; namespace NHibernate.Expression *************** *** 16,69 **** /// </summary> //TODO:H2.0.3 renamed this to ILikeExpression ! public class InsensitiveLikeExpression: Expression { - private readonly string propertyName; private readonly object expressionValue; ! internal InsensitiveLikeExpression(string propertyName, object expressionValue) ! { this.propertyName = propertyName; this.expressionValue = expressionValue; } ! public override SqlString ToSqlString(ISessionFactoryImplementor factory, System.Type persistentClass, string alias) { //TODO: add default capacity SqlStringBuilder sqlBuilder = new SqlStringBuilder(); ! IType propertyType = ((IQueryable)factory.GetPersister(persistentClass)).GetPropertyType(propertyName); ! string[] columnNames = GetColumns(factory, persistentClass, propertyName, alias); ! string[] paramColumnNames = GetColumns(factory, persistentClass, propertyName , null); ! Parameter[] parameters = Parameter.GenerateParameters(factory, alias, paramColumnNames, propertyType); ! ! if(factory.Dialect is PostgreSQLDialect) { ! sqlBuilder.Add(columnNames[0]); ! sqlBuilder.Add(" ilike "); } ! else { ! sqlBuilder.Add(factory.Dialect.LowercaseFunction) ! .Add("(") ! .Add(columnNames[0]) ! .Add(")") ! .Add(" like "); } ! sqlBuilder.Add(parameters[0]); return sqlBuilder.ToSqlString(); } ! ! public override TypedValue[] GetTypedValues(ISessionFactoryImplementor sessionFactory, System.Type persistentClass) { ! return new TypedValue[] { Expression.GetTypedValue( sessionFactory, persistentClass, propertyName, expressionValue.ToString().ToLower() ) }; } ! ! public override string ToString() { return propertyName + " ilike " + expressionValue; --- 12,81 ---- /// </summary> //TODO:H2.0.3 renamed this to ILikeExpression ! public class InsensitiveLikeExpression : Expression { private readonly string propertyName; private readonly object expressionValue; ! /// <summary> ! /// ! /// </summary> ! /// <param name="propertyName"></param> ! /// <param name="expressionValue"></param> ! internal InsensitiveLikeExpression( string propertyName, object expressionValue ) ! { this.propertyName = propertyName; this.expressionValue = expressionValue; } ! /// <summary> ! /// ! /// </summary> ! /// <param name="factory"></param> ! /// <param name="persistentClass"></param> ! /// <param name="alias"></param> ! /// <returns></returns> ! public override SqlString ToSqlString( ISessionFactoryImplementor factory, System.Type persistentClass, string alias ) { //TODO: add default capacity SqlStringBuilder sqlBuilder = new SqlStringBuilder(); ! IType propertyType = ( ( IQueryable ) factory.GetPersister( persistentClass ) ).GetPropertyType( propertyName ); ! string[ ] columnNames = GetColumns( factory, persistentClass, propertyName, alias ); ! string[ ] paramColumnNames = GetColumns( factory, persistentClass, propertyName, null ); ! Parameter[ ] parameters = Parameter.GenerateParameters( factory, alias, paramColumnNames, propertyType ); ! ! if( factory.Dialect is PostgreSQLDialect ) { ! sqlBuilder.Add( columnNames[ 0 ] ); ! sqlBuilder.Add( " ilike " ); } ! else { ! sqlBuilder.Add( factory.Dialect.LowercaseFunction ) ! .Add( "(" ) ! .Add( columnNames[ 0 ] ) ! .Add( ")" ) ! .Add( " like " ); } ! sqlBuilder.Add( parameters[ 0 ] ); return sqlBuilder.ToSqlString(); } ! /// <summary> ! /// ! /// </summary> ! /// <param name="sessionFactory"></param> ! /// <param name="persistentClass"></param> ! /// <returns></returns> ! public override TypedValue[ ] GetTypedValues( ISessionFactoryImplementor sessionFactory, System.Type persistentClass ) { ! return new TypedValue[ ] {Expression.GetTypedValue( sessionFactory, persistentClass, propertyName, expressionValue.ToString().ToLower() )}; } ! /// <summary></summary> ! public override string ToString() { return propertyName + " ilike " + expressionValue; Index: LeExpression.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Expression/LeExpression.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LeExpression.cs 28 Mar 2004 06:05:09 -0000 1.3 --- LeExpression.cs 31 Dec 2004 17:54:19 -0000 1.4 *************** *** 1,18 **** ! using System; ! ! namespace NHibernate.Expression { ! ! public class LeExpression : SimpleExpression { ! ! internal LeExpression(string propertyName, object value) : base (propertyName, value) { } ! protected override string Op { get { return " <= "; } } } ! } --- 1,21 ---- ! namespace NHibernate.Expression { ! /// <summary></summary> ! public class LeExpression : SimpleExpression { ! /// <summary> ! /// ! /// </summary> ! /// <param name="propertyName"></param> ! /// <param name="value"></param> ! internal LeExpression( string propertyName, object value ) : base( propertyName, value ) { } ! /// <summary></summary> ! protected override string Op { get { return " <= "; } } } ! } \ No newline at end of file Index: Junction.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Expression/Junction.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Junction.cs 28 Jun 2004 18:35:57 -0000 1.5 --- Junction.cs 31 Dec 2004 17:54:19 -0000 1.6 *************** *** 1,11 **** using System; - using System.Text; using System.Collections; - using NHibernate.Engine; using NHibernate.SqlCommand; - using NHibernate.Util; ! namespace NHibernate.Expression { /// <summary> --- 1,8 ---- using System; using System.Collections; using NHibernate.Engine; using NHibernate.SqlCommand; ! namespace NHibernate.Expression { /// <summary> *************** *** 13,80 **** /// logical operator. /// </summary> ! public abstract class Junction : Expression { - private IList expressions = new ArrayList(); ! public Junction Add(Expression expression) { ! expressions.Add(expression); return this; } protected abstract String Op { get; } ! public override TypedValue[] GetTypedValues( ISessionFactoryImplementor sessionFactory, System.Type persistentClass ) { - ArrayList typedValues = new ArrayList(); ! foreach ( Expression expression in expressions ) { ! TypedValue[] subvalues = expression.GetTypedValues(sessionFactory, persistentClass); ! for ( int i=0; i<subvalues.Length; i++ ) { ! typedValues.Add( subvalues[i] ); } } ! ! return (TypedValue[]) typedValues.ToArray( typeof (TypedValue) ); } ! public override SqlString ToSqlString(ISessionFactoryImplementor factory, System.Type persistentClass, string alias) { - //TODO: add default capacity SqlStringBuilder sqlBuilder = new SqlStringBuilder(); ! ! if(expressions.Count==0) { ! return new SqlString(new object[] {"1=1"}); } - - sqlBuilder.Add("("); ! for(int i = 0; i < expressions.Count - 1; i++) { sqlBuilder.Add( ! ((Expression)expressions[i]).ToSqlString(factory, persistentClass, alias)); ! sqlBuilder.Add(Op); } sqlBuilder.Add( ! ((Expression)expressions[expressions.Count - 1]).ToSqlString(factory, persistentClass, alias)); ! sqlBuilder.Add(")"); return sqlBuilder.ToSqlString(); } ! public override string ToString() { ! return '(' + String.Join( Op, (string[]) expressions ) + ')'; } } --- 10,94 ---- /// logical operator. /// </summary> ! public abstract class Junction : Expression { private IList expressions = new ArrayList(); ! /// <summary> ! /// ! /// </summary> ! /// <param name="expression"></param> ! /// <returns></returns> ! public Junction Add( Expression expression ) { ! expressions.Add( expression ); return this; } + /// <summary></summary> protected abstract String Op { get; } ! /// <summary> ! /// ! /// </summary> ! /// <param name="sessionFactory"></param> ! /// <param name="persistentClass"></param> ! /// <returns></returns> ! public override TypedValue[ ] GetTypedValues( ISessionFactoryImplementor sessionFactory, System.Type persistentClass ) { ArrayList typedValues = new ArrayList(); ! foreach( Expression expression in expressions ) { ! TypedValue[ ] subvalues = expression.GetTypedValues( sessionFactory, persistentClass ); ! for( int i = 0; i < subvalues.Length; i++ ) { ! typedValues.Add( subvalues[ i ] ); } } ! ! return ( TypedValue[ ] ) typedValues.ToArray( typeof( TypedValue ) ); } ! /// <summary> ! /// ! /// </summary> ! /// <param name="factory"></param> ! /// <param name="persistentClass"></param> ! /// <param name="alias"></param> ! /// <returns></returns> ! public override SqlString ToSqlString( ISessionFactoryImplementor factory, System.Type persistentClass, string alias ) { //TODO: add default capacity SqlStringBuilder sqlBuilder = new SqlStringBuilder(); ! ! if( expressions.Count == 0 ) { ! return new SqlString( new object[ ] {"1=1"} ); } ! sqlBuilder.Add( "(" ); ! ! for( int i = 0; i < expressions.Count - 1; i++ ) { sqlBuilder.Add( ! ( ( Expression ) expressions[ i ] ).ToSqlString( factory, persistentClass, alias ) ); ! sqlBuilder.Add( Op ); } sqlBuilder.Add( ! ( ( Expression ) expressions[ expressions.Count - 1 ] ).ToSqlString( factory, persistentClass, alias ) ); ! sqlBuilder.Add( ")" ); return sqlBuilder.ToSqlString(); } ! /// <summary></summary> ! public override string ToString() { ! return '(' + String.Join( Op, ( string[ ] ) expressions ) + ')'; } } |