Fixed names on rename operation

Author: Marco Veglio

Code/Epic.Query/Relational/Operations/Rename.cs

@@ -44,8 +44,10 @@ public sealed class Rename: Relation, IEquatable<Rename>
         /// The new name given to the relation.
         /// </param>
         public Rename (Relation relation, string newRelationName): 
-            base(RelationType.BaseRelation, getDefaultName (relation, newRelationName))
+            base(RelationType.BaseRelation, getDefaultName (relation))
         {
+            if (String.IsNullOrEmpty (newRelationName))
+                throw new ArgumentNullException("newRelationName");
             this.relation = relation;
             this.newRelationName = newRelationName;
         }
@@ -114,7 +116,7 @@ public override bool Equals (Relation other)
         /// </returns>
         public override int GetHashCode ()
         {
-            return this.relation.GetHashCode () ^ this.newRelationName.GetHashCode ();
+            return this.relation.GetHashCode () ^ this.newRelationName.GetHashCode () ^ this.Name.GetHashCode ();
         }
 
         /// <summary>
@@ -149,17 +151,16 @@ public override TResult Accept<TResult> (IVisitor<TResult> visitor, IVisitContex
         public bool Equals (Rename other)
         {
             if (null == other) return false;
-            return this.relation.Equals (other.relation) && this.newRelationName.Equals (other.newRelationName);
+            return this.relation.Equals (other.relation) && this.newRelationName.Equals (other.newRelationName)
+                && this.Name.Equals (other.Name);
         }
         #endregion
 
-        private static string getDefaultName(Relation relation, string newRelationName)
+        private static string getDefaultName(Relation relation)
         {
             if(null == relation)
                 throw new ArgumentNullException("relation");
-            if(string.IsNullOrEmpty(newRelationName))
-                throw new ArgumentNullException("newRelationName");
-            return string.Format ("{0} as {1}", relation.Name, newRelationName);
+            return relation.Name;
         }
     }
 }

Code/UnitTests/Epic.Query.UnitTests/Relational/Operations/ProjectionQA.cs

@@ -75,6 +75,7 @@ public void Initialize_WithFakeArguments_Works()
             Assert.IsTrue (firstProjection.Attributes.SequenceEqual (attributes));
             Assert.IsTrue (firstProjection.Attributes.SequenceEqual (secondProjection.Attributes));
 
+            Assert.IsTrue (firstProjection.Name.Equals (table.Name));
             Assert.IsTrue (secondProjection.Name.Equals (operationName));
             Assert.IsFalse (firstProjection.Equals (secondProjection));
         }

Code/UnitTests/Epic.Query.UnitTests/Relational/Operations/RenameQA.cs

@@ -69,8 +69,9 @@ public void Initialize_WithFakeArguments_Works()
             Assert.IsTrue (firstRename.NewRelationName.Equals (newRelationName));
             Assert.IsTrue (firstRename.NewRelationName.Equals (secondRename.NewRelationName));
 
+            Assert.IsTrue (firstRename.Name.Equals (table.Name));
             Assert.IsTrue (secondRename.Name.Equals (operationName));
-            Assert.IsTrue (firstRename.Equals (secondRename));
+            Assert.IsFalse (firstRename.Equals (secondRename));
         }
 
         [Test]

Code/UnitTests/Epic.Query.UnitTests/Relational/Operations/SelectionQA.cs

@@ -70,6 +70,7 @@ public void Initialize_WithFakeArguments_Works()
             Assert.IsTrue (firstSelection.Condition.Equals (predicate));
             Assert.IsTrue (firstSelection.Condition.Equals (secondSelection.Condition));
 
+            Assert.IsTrue (firstSelection.Name.Equals (table.Name));
             Assert.IsTrue (secondSelection.Name.Equals (operationName));
             Assert.IsFalse (firstSelection.Equals (secondSelection));
         }