[Nhibernate-commit] SF.net SVN: nhibernate:[3987] trunk/nhibernate/src/NHibernate/SqlCommand/ InformixJoinFragment.cs

[<fab...@us...>]

Revision: 3987
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3987&view=rev
Author:   fabiomaulo
Date:     2009-01-10 15:13:26 +0000 (Sat, 10 Jan 2009)

Log Message:
-----------
Removed compilation warning

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/SqlCommand/InformixJoinFragment.cs

Modified: trunk/nhibernate/src/NHibernate/SqlCommand/InformixJoinFragment.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/SqlCommand/InformixJoinFragment.cs	2009-01-10 15:10:34 UTC (rev 3986)
+++ trunk/nhibernate/src/NHibernate/SqlCommand/InformixJoinFragment.cs	2009-01-10 15:13:26 UTC (rev 3987)
@@ -1,113 +1,101 @@
 using System;
-using System.Text;
-using Iesi.Collections;
 using NHibernate.Util;
 
 namespace NHibernate.SqlCommand
 {
-    /// <summary>
-    /// An Informix-style (theta) Join
-    /// </summary>
-    public class InformixJoinFragment : JoinFragment
-    {
-        private SqlStringBuilder afterFrom = new SqlStringBuilder();
-        private SqlStringBuilder afterWhere = new SqlStringBuilder();
+	/// <summary>
+	/// An Informix-style (theta) Join
+	/// </summary>
+	public class InformixJoinFragment : JoinFragment
+	{
+		private readonly SqlStringBuilder afterFrom = new SqlStringBuilder();
+		private readonly SqlStringBuilder afterWhere = new SqlStringBuilder();
 
-        public override void AddJoin(string tableName, string alias, string[] fkColumns, string[] pkColumns, JoinType joinType)
-        {
-            string joinString;
-            switch (joinType)
-            {
-                case JoinType.InnerJoin:
-                    AddCrossJoin(tableName, alias);
-                    break;
-                case JoinType.LeftOuterJoin:
-                    afterFrom.Add(StringHelper.CommaSpace)
-                             .Add("outer ")
-                             .Add(tableName)
-                             .Add(" ")
-                             .Add(alias);
-                    break;
-                case JoinType.RightOuterJoin:
-                    int i = GetPrevTableInsertPoint(afterFrom.ToSqlString());
-                    afterFrom.Insert(i, "outer ");
-                    break;
-                case JoinType.FullJoin:
-                    throw new NotSupportedException("join type not supported by Informix");
-                default:
-                    throw new AssertionFailure("undefined join type");
-            }
+		public override void AddJoin(string tableName, string alias, string[] fkColumns, string[] pkColumns, JoinType joinType)
+		{
+			switch (joinType)
+			{
+				case JoinType.InnerJoin:
+					AddCrossJoin(tableName, alias);
+					break;
+				case JoinType.LeftOuterJoin:
+					afterFrom.Add(StringHelper.CommaSpace).Add("outer ").Add(tableName).Add(" ").Add(alias);
+					break;
+				case JoinType.RightOuterJoin:
+					int i = GetPrevTableInsertPoint(afterFrom.ToSqlString());
+					afterFrom.Insert(i, "outer ");
+					break;
+				case JoinType.FullJoin:
+					throw new NotSupportedException("join type not supported by Informix");
+				default:
+					throw new AssertionFailure("undefined join type");
+			}
 
-            for (int j = 0; j < fkColumns.Length; j++)
-            {
-                //HasThetaJoins = true;
-                afterWhere.Add(" and " + fkColumns[j]);
-                afterWhere.Add("=" + alias + StringHelper.Dot + pkColumns[j]);
-            }
-        }
+			for (int j = 0; j < fkColumns.Length; j++)
+			{
+				//HasThetaJoins = true;
+				afterWhere.Add(" and " + fkColumns[j]);
+				afterWhere.Add("=" + alias + StringHelper.Dot + pkColumns[j]);
+			}
+		}
 
-        public override void AddJoin(string tableName, string alias, string[] fkColumns, string[] pkColumns, JoinType joinType,
-                                     string on)
-        {
-            //arbitrary on clause ignored!!
-            AddJoin(tableName, alias, fkColumns, pkColumns, joinType);
-            AddCondition(on);
-        }
+		public override void AddJoin(string tableName, string alias, string[] fkColumns, string[] pkColumns, JoinType joinType,
+		                             string on)
+		{
+			//arbitrary on clause ignored!!
+			AddJoin(tableName, alias, fkColumns, pkColumns, joinType);
+			AddCondition(on);
+		}
 
-        public override SqlString ToFromFragmentString
-        {
-            get { return afterFrom.ToSqlString(); }
-        }
+		public override SqlString ToFromFragmentString
+		{
+			get { return afterFrom.ToSqlString(); }
+		}
 
-        public override SqlString ToWhereFragmentString
-        {
-            get { return afterWhere.ToSqlString(); }
-        }
+		public override SqlString ToWhereFragmentString
+		{
+			get { return afterWhere.ToSqlString(); }
+		}
 
-        public override void AddJoins(SqlString fromFragment, SqlString whereFragment)
-        {
-            afterFrom.Add(fromFragment);
-            afterWhere.Add(whereFragment);
-        }
+		public override void AddJoins(SqlString fromFragment, SqlString whereFragment)
+		{
+			afterFrom.Add(fromFragment);
+			afterWhere.Add(whereFragment);
+		}
 
-        public override void AddCrossJoin(string tableName, string alias)
-        {
-            afterFrom.Add(StringHelper.CommaSpace)
-                     .Add(tableName)
-                     .Add(" ")
-                     .Add(alias);
-        }
+		public override void AddCrossJoin(string tableName, string alias)
+		{
+			afterFrom.Add(StringHelper.CommaSpace).Add(tableName).Add(" ").Add(alias);
+		}
 
-        public override bool AddCondition(string condition)
-        {
-            return AddCondition(afterWhere, condition);
-        }
+		public override bool AddCondition(string condition)
+		{
+			return AddCondition(afterWhere, condition);
+		}
 
-        public override bool AddCondition(SqlString condition)
-        {
-            return AddCondition(afterWhere, condition);
-        }
+		public override bool AddCondition(SqlString condition)
+		{
+			return AddCondition(afterWhere, condition);
+		}
 
-        public override void AddFromFragmentString(SqlString fromFragmentString)
-        {
-            afterFrom.Add(fromFragmentString);
-        }
+		public override void AddFromFragmentString(SqlString fromFragmentString)
+		{
+			afterFrom.Add(fromFragmentString);
+		}
 
-        private static int GetPrevTableInsertPoint(SqlString text)
-        {
-            int i, j;
-
-            i = text.LastIndexOfCaseInsensitive("from");
-            j = text.LastIndexOfCaseInsensitive(",");
-            if (i == -1 && j == -1)
-            {
-                return -1;
-            }
-            if (j > i)
-            {
-                return j + 1;
-            }
-            return i + 5;
-        }
-    }
-}
+		private static int GetPrevTableInsertPoint(SqlString text)
+		{
+			int i = text.LastIndexOfCaseInsensitive("from");
+			int j = text.LastIndexOfCaseInsensitive(",");
+			if (i == -1 && j == -1)
+			{
+				return -1;
+			}
+			if (j > i)
+			{
+				return j + 1;
+			}
+			return i + 5;
+		}
+	}
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.