Allow alias on MathReference (fix issue ThatRendle#209)

ThatRendle · ThatRendle · commit a57167083e18 · 2012-07-12T15:52:11.000+01:00
diff --git a/Simple.Data.Ado/SimpleReferenceFormatter.cs b/Simple.Data.Ado/SimpleReferenceFormatter.cs
@@ -77,10 +77,10 @@ private string TryFormatAsMathReference(MathReference mathReference, bool exclud
                                      FormatObject(mathReference.RightOperand));
             }
 
-            return string.Format("{0} {1} {2} AS {3}", FormatObject(mathReference.LeftOperand),
+            return string.Format("({0} {1} {2}) AS {3}", FormatObject(mathReference.LeftOperand),
                                  MathOperatorToString(mathReference.Operator),
                                  FormatObject(mathReference.RightOperand),
-                                 mathReference.GetAlias());
+                                 _schema.QuoteObjectName(mathReference.GetAlias()));
 
         }
 
diff --git a/Simple.Data.BehaviourTest/Query/QueryTest.cs b/Simple.Data.BehaviourTest/Query/QueryTest.cs
@@ -71,6 +71,15 @@ public void SpecifyingColumnWithAliasShouldAddAsClause()
                 .ToList();
             GeneratedSqlIs("select [dbo].[users].[name],[dbo].[users].[password] as [supersecretpassword] from [dbo].[users]");
         }
+        
+        [Test]
+        public void SpecifyingColumnMathsWithAliasShouldAddAsClause()
+        {
+            _db.Users.All()
+                .Select(_db.Users.Name, (_db.Users.Id + _db.Users.Age).As("Nonsense"))
+                .ToList();
+            GeneratedSqlIs("select [dbo].[users].[name],([dbo].[users].[id] + [dbo].[users].[age]) as [nonsense] from [dbo].[users]");
+        }
 
         [Test]
         public void SpecifyingColumnsFromOtherTablesShouldAddJoin()
diff --git a/Simple.Data/MathReference.cs b/Simple.Data/MathReference.cs
@@ -18,6 +18,13 @@ public MathReference(object leftOperand, object rightOperand, MathOperator @oper
             _operator = @operator;
         }
 
+        private MathReference(object leftOperand, object rightOperand, MathOperator @operator, string alias) : base(alias)
+        {
+            _leftOperand = leftOperand;
+            _rightOperand = rightOperand;
+            _operator = @operator;
+        }
+
         public MathOperator Operator
         {
             get { return _operator; }
@@ -33,6 +40,11 @@ public object LeftOperand
             get { return _leftOperand; }
         }
 
+        public MathReference As(string alias)
+        {
+            return new MathReference(_leftOperand, _rightOperand, _operator, alias);
+        }
+
         /// <summary>
         /// Implements the operator == to create a <see cref="SimpleExpression"/> with the type <see cref="SimpleExpressionType.Equal"/>.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -77,10 +77,10 @@ private string TryFormatAsMathReference(MathReference mathReference, bool exclud`
`77`	`77`	`FormatObject(mathReference.RightOperand));`
`78`	`78`	`}`
`79`	`79`
`80`		`- return string.Format("{0} {1} {2} AS {3}", FormatObject(mathReference.LeftOperand),`
	`80`	`+ return string.Format("({0} {1} {2}) AS {3}", FormatObject(mathReference.LeftOperand),`
`81`	`81`	`MathOperatorToString(mathReference.Operator),`
`82`	`82`	`FormatObject(mathReference.RightOperand),`
`83`		`- mathReference.GetAlias());`
	`83`	`+ _schema.QuoteObjectName(mathReference.GetAlias()));`
`84`	`84`
`85`	`85`	`}`
`86`	`86`