Default name for Function calls as {FunctionName}_{FieldName}

ThatRendle · ThatRendle · commit 8e6d19f80342 · 2011-10-03T17:37:33.000+01:00
diff --git a/Simple.Data.InMemoryTest/InMemoryTests.cs b/Simple.Data.InMemoryTest/InMemoryTests.cs
@@ -65,18 +65,54 @@ public void SelectShouldReturnSubsetOfColumns()
         }
 
         [Test]
-        public void SelectWithAggregateShouldReturnAggregates()
+        public void SelectWithAverageShouldReturnAverage()
+        {
+            var db = CreateAggregateTestDb();
+            var records = db.Test.All().Select(db.Test.Name, db.Test.Age.Average().As("AverageAge")).ToList();
+            Assert.AreEqual(2, records.Count);
+            Assert.AreEqual(25, records[0].AverageAge);
+            Assert.AreEqual(45, records[1].AverageAge);
+        }
+
+        [Test]
+        public void SelectWithSumShouldReturnSum()
+        {
+            var db = CreateAggregateTestDb();
+            var records = db.Test.All().Select(db.Test.Name, db.Test.Age.Sum().As("SumAge")).ToList();
+            Assert.AreEqual(2, records.Count);
+            Assert.AreEqual(50, records[0].SumAge);
+            Assert.AreEqual(90, records[1].SumAge);
+        }
+
+        [Test]
+        public void SelectWithMinShouldReturnMin()
+        {
+            var db = CreateAggregateTestDb();
+            var records = db.Test.All().Select(db.Test.Name, db.Test.Age.Min().As("MinAge")).ToList();
+            Assert.AreEqual(2, records.Count);
+            Assert.AreEqual(20, records[0].MinAge);
+            Assert.AreEqual(40, records[1].MinAge);
+        }
+
+        [Test]
+        public void SelectWithMaxShouldReturnMax()
+        {
+            var db = CreateAggregateTestDb();
+            var records = db.Test.All().Select(db.Test.Name, db.Test.Age.Max().As("MaxAge")).ToList();
+            Assert.AreEqual(2, records.Count);
+            Assert.AreEqual(30, records[0].MaxAge);
+            Assert.AreEqual(50, records[1].MaxAge);
+        }
+
+        private static dynamic CreateAggregateTestDb()
         {
             Database.UseMockAdapter(new InMemoryAdapter());
             var db = Database.Open();
             db.Test.Insert(Id: 1, Name: "Alice", Age: 20);
             db.Test.Insert(Id: 2, Name: "Alice", Age: 30);
             db.Test.Insert(Id: 3, Name: "Bob", Age: 40);
             db.Test.Insert(Id: 4, Name: "Bob", Age: 50);
-            var records = db.Test.All().Select(db.Test.Name, db.Test.Age.Average().As("AverageAge")).ToList();
-            Assert.AreEqual(2, records.Count);
-            Assert.AreEqual(25, records[0].AverageAge);
-            Assert.AreEqual(45, records[1].AverageAge);
+            return db;
         }
 
         [Test]
diff --git a/Simple.Data/FunctionReference.cs b/Simple.Data/FunctionReference.cs
@@ -50,7 +50,7 @@ public FunctionReference As(string alias)
 
         public override string GetAliasOrName()
         {
-            return GetAlias() ?? _name;
+            return GetAlias() ?? _name + "_" + _argument.GetAliasOrName();
         }
 
         public bool IsAggregate

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public FunctionReference As(string alias)`
`50`	`50`
`51`	`51`	`public override string GetAliasOrName()`
`52`	`52`	`{`
`53`		`- return GetAlias() ?? _name;`
	`53`	`+ return GetAlias() ?? _name + "_" + _argument.GetAliasOrName();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public bool IsAggregate`