Merge pull request #377 from angelcolmenares/master

mythz · mythz · commit c313f7c3201a · 2014-04-29T23:45:00.000-04:00
Update OrmLiteCountTests.cs
diff --git a/src/ServiceStack.OrmLite.MySql.Tests/Expressions/OrmLiteCountTests.cs b/src/ServiceStack.OrmLite.MySql.Tests/Expressions/OrmLiteCountTests.cs
@@ -64,26 +64,24 @@ public void CanDoCountWithInterfaceAndPredicate()
             }
         }
 
-        long Count<T>(IDbConnection db) where T : IHasId<int>, new()
+        long Count<T>(IDbConnection db) where T : IHasId<int>
         {
-            T request = new T();
-            return db.Scalar<T, long>(e => Sql.Count(request.Id));
+            return db.Scalar<T, long>(e => Sql.Count(e.Id));
         }
 
 
-        long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn, new()
+        long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn
         {
-            T request = new T();
-            return db.Scalar<T, long?>(e => Sql.Count(request.CountColumn)).Value;
+            return db.Scalar<T, long?>(e => Sql.Count(e.CountColumn)).Value;
         }
 
 
-        int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>, new()
+        int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>
         {
             return db.Scalar<T, int>(e => Sql.Count(e.Id), predicate);
         }
 
-        int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn, new()
+        int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn
         {
             return db.Scalar<T, int?>(e => Sql.Count(e.CountColumn), predicate).Value;
         }
@@ -109,4 +107,4 @@ public CountTestTable() { }
         public int? CountColumn { get; set; }
         #endregion
     }
-}
+}
diff --git a/src/ServiceStack.OrmLite.PostgreSQL.Tests/Expressions/OrmLiteCountTests.cs b/src/ServiceStack.OrmLite.PostgreSQL.Tests/Expressions/OrmLiteCountTests.cs
@@ -65,26 +65,24 @@ public void CanDoCountWithInterfaceAndPredicate()
             }
         }
 
-        long Count<T>(IDbConnection db) where T : IHasId<int>, new()
+        long Count<T>(IDbConnection db) where T : IHasId<int>
         {
-            T request = new T();
-            return db.Scalar<T, long>(e => Sql.Count(request.Id));
+            return db.Scalar<T, long>(e => Sql.Count(e.Id));
         }
 
 
-        long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn, new()
+        long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn
         {
-            T request = new T();
-            return db.Scalar<T, long?>(e => Sql.Count(request.CountColumn)).Value;
+            return db.Scalar<T, long?>(e => Sql.Count(e.CountColumn)).Value;
         }
 
 
-        int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>, new()
+        int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>
         {
             return db.Scalar<T, int>(e => Sql.Count(e.Id), predicate);
         }
 
-        int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn, new()
+        int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn
         {
             return db.Scalar<T, int?>(e => Sql.Count(e.CountColumn), predicate).Value;
         }
@@ -110,4 +108,4 @@ public CountTestTable() { }
         public int? CountColumn { get; set; }
         #endregion
     }
-}
+}
diff --git a/src/ServiceStack.OrmLite.SqlServerTests/Expressions/OrmLiteCountTests.cs b/src/ServiceStack.OrmLite.SqlServerTests/Expressions/OrmLiteCountTests.cs
@@ -63,26 +63,24 @@ public void CanDoCountWithInterfaceAndPredicate()
             }
         }
 
-        long Count<T>(IDbConnection db) where T : IHasId<int>, new()
+        long Count<T>(IDbConnection db) where T : IHasId<int>
         {
-            T request = new T();
-            return db.Scalar<T, long>(e => Sql.Count(request.Id));
+            return db.Scalar<T, long>(e => Sql.Count(e.Id));
         }
 
 
-        long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn, new()
+        long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn
         {
-            T request = new T();
-            return db.Scalar<T, long?>(e => Sql.Count(request.CountColumn)).Value;
+            return db.Scalar<T, long?>(e => Sql.Count(e.CountColumn)).Value;
         }
 
 
-        int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>, new()
+        int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>
         {
             return db.Scalar<T, int>(e => Sql.Count(e.Id), predicate);
         }
 
-        int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn, new()
+        int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn
         {
             return db.Scalar<T, int?>(e => Sql.Count(e.CountColumn), predicate).Value;
         }
@@ -108,4 +106,4 @@ public CountTestTable() { }
         public int? CountColumn { get; set; }
         #endregion
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -64,26 +64,24 @@ public void CanDoCountWithInterfaceAndPredicate()`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- long Count<T>(IDbConnection db) where T : IHasId<int>, new()`
	`67`	`+ long Count<T>(IDbConnection db) where T : IHasId<int>`
`68`	`68`	`{`
`69`		`- T request = new T();`
`70`		`- return db.Scalar<T, long>(e => Sql.Count(request.Id));`
	`69`	`+ return db.Scalar<T, long>(e => Sql.Count(e.Id));`
`71`	`70`	`}`
`72`	`71`
`73`	`72`
`74`		`- long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn, new()`
	`73`	`+ long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn`
`75`	`74`	`{`
`76`		`- T request = new T();`
`77`		`- return db.Scalar<T, long?>(e => Sql.Count(request.CountColumn)).Value;`
	`75`	`+ return db.Scalar<T, long?>(e => Sql.Count(e.CountColumn)).Value;`
`78`	`76`	`}`
`79`	`77`
`80`	`78`
`81`		`- int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>, new()`
	`79`	`+ int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>`
`82`	`80`	`{`
`83`	`81`	`return db.Scalar<T, int>(e => Sql.Count(e.Id), predicate);`
`84`	`82`	`}`
`85`	`83`
`86`		`- int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn, new()`
	`84`	`+ int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn`
`87`	`85`	`{`
`88`	`86`	`return db.Scalar<T, int?>(e => Sql.Count(e.CountColumn), predicate).Value;`
`89`	`87`	`}`
`@@ -109,4 +107,4 @@ public CountTestTable() { }`
`109`	`107`	`public int? CountColumn { get; set; }`
`110`	`108`	`#endregion`
`111`	`109`	`}`
`112`		`-}`
	`110`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -65,26 +65,24 @@ public void CanDoCountWithInterfaceAndPredicate()`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- long Count<T>(IDbConnection db) where T : IHasId<int>, new()`
	`68`	`+ long Count<T>(IDbConnection db) where T : IHasId<int>`
`69`	`69`	`{`
`70`		`- T request = new T();`
`71`		`- return db.Scalar<T, long>(e => Sql.Count(request.Id));`
	`70`	`+ return db.Scalar<T, long>(e => Sql.Count(e.Id));`
`72`	`71`	`}`
`73`	`72`
`74`	`73`
`75`		`- long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn, new()`
	`74`	`+ long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn`
`76`	`75`	`{`
`77`		`- T request = new T();`
`78`		`- return db.Scalar<T, long?>(e => Sql.Count(request.CountColumn)).Value;`
	`76`	`+ return db.Scalar<T, long?>(e => Sql.Count(e.CountColumn)).Value;`
`79`	`77`	`}`
`80`	`78`
`81`	`79`
`82`		`- int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>, new()`
	`80`	`+ int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>`
`83`	`81`	`{`
`84`	`82`	`return db.Scalar<T, int>(e => Sql.Count(e.Id), predicate);`
`85`	`83`	`}`
`86`	`84`
`87`		`- int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn, new()`
	`85`	`+ int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn`
`88`	`86`	`{`
`89`	`87`	`return db.Scalar<T, int?>(e => Sql.Count(e.CountColumn), predicate).Value;`
`90`	`88`	`}`
`@@ -110,4 +108,4 @@ public CountTestTable() { }`
`110`	`108`	`public int? CountColumn { get; set; }`
`111`	`109`	`#endregion`
`112`	`110`	`}`
`113`		`-}`
	`111`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -63,26 +63,24 @@ public void CanDoCountWithInterfaceAndPredicate()`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- long Count<T>(IDbConnection db) where T : IHasId<int>, new()`
	`66`	`+ long Count<T>(IDbConnection db) where T : IHasId<int>`
`67`	`67`	`{`
`68`		`- T request = new T();`
`69`		`- return db.Scalar<T, long>(e => Sql.Count(request.Id));`
	`68`	`+ return db.Scalar<T, long>(e => Sql.Count(e.Id));`
`70`	`69`	`}`
`71`	`70`
`72`	`71`
`73`		`- long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn, new()`
	`72`	`+ long CountByColumn<T>(IDbConnection db) where T : IHasCountColumn`
`74`	`73`	`{`
`75`		`- T request = new T();`
`76`		`- return db.Scalar<T, long?>(e => Sql.Count(request.CountColumn)).Value;`
	`74`	`+ return db.Scalar<T, long?>(e => Sql.Count(e.CountColumn)).Value;`
`77`	`75`	`}`
`78`	`76`
`79`	`77`
`80`		`- int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>, new()`
	`78`	`+ int Count<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasId<int>`
`81`	`79`	`{`
`82`	`80`	`return db.Scalar<T, int>(e => Sql.Count(e.Id), predicate);`
`83`	`81`	`}`
`84`	`82`
`85`		`- int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn, new()`
	`83`	`+ int CountByColumn<T>(IDbConnection db, Expression<Func<T, bool>> predicate) where T : IHasCountColumn`
`86`	`84`	`{`
`87`	`85`	`return db.Scalar<T, int?>(e => Sql.Count(e.CountColumn), predicate).Value;`
`88`	`86`	`}`
`@@ -108,4 +106,4 @@ public CountTestTable() { }`
`108`	`106`	`public int? CountColumn { get; set; }`
`109`	`107`	`#endregion`
`110`	`108`	`}`
`111`		`-}`
	`109`	`+}`