Supports SQLLogicalExpression. Closes #66.

DatabaseObjects.MonoTouch.csproj

@@ -163,6 +163,7 @@
     <Compile Include="SQL\Views\SQLCreateView.cs" />
     <Compile Include="SQL\Views\SQLDropView.cs" />
     <Compile Include="SQL\Views\SQLViewExists.cs" />
+    <Compile Include="SQL\Expressions\SQLLogicalExpression.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" />

DatabaseObjects.csproj

@@ -192,6 +192,7 @@
     <Compile Include="Misc\AssemblyInfo.cs" />
     <Compile Include="SQL\Amend\SQLInsertFromSelect.cs" />
     <Compile Include="SQL\Amend\SQLUpdateField.cs" />
+    <Compile Include="SQL\Expressions\SQLLogicalExpression.cs" />
     <Compile Include="SQL\Expressions\SQLStringConcatExpression.cs" />
     <Compile Include="SQL\Expressions\SQLAggregateExpression.cs" />
     <Compile Include="SQL\Expressions\SQLAllFieldsExpression.cs" />

SQL/Expressions/SQLLogicalExpression.cs

@@ -0,0 +1,87 @@
+// ___________________________________________________
+//
+//  © Hi-Integrity Systems 2010. All rights reserved.
+//  www.hisystems.com.au - Toby Wicks
+// ___________________________________________________
+//
+
+using System.Collections;
+using System;
+using System.Data;
+
+namespace DatabaseObjects.SQL
+{
+	public enum LogicalOperator
+	{
+		@And,
+		@Or
+	}
+
+	public class SQLLogicalExpression : SQLExpression
+	{
+		private SQLExpression left;
+		private LogicalOperator @operator;
+		private SQLExpression right;
+
+		public SQLLogicalExpression()
+		{
+		}
+
+		public SQLLogicalExpression(SQLExpression leftExpression, LogicalOperator @operator, SQLExpression rightExpression)
+		{
+			this.LeftExpression = leftExpression;
+			this.@operator = @operator;
+			this.RightExpression = rightExpression;
+		}
+
+		public SQLExpression LeftExpression
+		{
+			get
+			{
+				return this.left;
+			}
+
+			set
+			{
+				if (value == null)
+					throw new ArgumentNullException();
+
+				this.left = value;
+			}
+		}
+
+		public SQLExpression RightExpression
+		{
+			get
+			{
+				return this.right;
+			}
+
+			set
+			{
+				if (value == null)
+					throw new ArgumentNullException();
+
+				this.right = value;
+			}
+		}
+
+		public LogicalOperator Operator
+		{
+			get
+			{
+				return this.@operator;
+			}
+
+			set
+			{
+				this.@operator = value;
+			}
+		}
+
+		internal override string SQL(Serializers.Serializer serializer)
+		{
+			return serializer.SerializeLogicalExpression(this);
+		}
+	}
+}

SQL/SQL.cs

@@ -256,12 +256,6 @@ public enum ComparisonOperator
 		NotLike
 	}
 
-	public enum LogicalOperator
-	{
-		@And,
-		@Or
-	}
-
 	public enum FieldValueAutoAssignmentType
 	{
 		/// <summary>

SQL/Serializers/Serializer.cs

@@ -387,6 +387,16 @@ public virtual string SerializeArithmeticExpression(SQLArithmeticExpression arit
 
 			return "(" + arithmeticExpression.LeftExpression.SQL(this) + " " + SerializeArithmeticOperator(arithmeticExpression.Operator) + " " + arithmeticExpression.RightExpression.SQL(this) + ")";
 		}
+
+		public virtual string SerializeLogicalExpression(SQLLogicalExpression logicalExpression)
+		{
+			if (logicalExpression.LeftExpression == null)
+				throw new ArgumentNullException(logicalExpression.GetType().Name + ".LeftExpression");
+			else if (logicalExpression.RightExpression == null)
+				throw new ArgumentNullException(logicalExpression.GetType().Name + ".RightExpression");
+
+			return "(" + logicalExpression.LeftExpression.SQL(this) + " " + SerializeLogicalOperator(logicalExpression.Operator) + " " + logicalExpression.RightExpression.SQL(this) + ")";
+		}
 
 		public virtual string SerializeAggregateExpression(SQLAggregateExpression aggregateExpression)
 		{