Relax Generic expression constraint on db.Scalar/q.Select

Author: mythz

src/ServiceStack.OrmLite/Async/ReadExpressionCommandExtensionsAsync.cs

@@ -84,7 +84,7 @@ internal static Task<T> SingleAsync<T>(this IDbCommand dbCmd, SqlExpression<T> e
             return dbCmd.ExprConvertToAsync<T>(sql, expression.Params, token);
         }
 
-        public static Task<TKey> ScalarAsync<T, TKey>(this IDbCommand dbCmd, Expression<Func<T, TKey>> field, CancellationToken token)
+        public static Task<TKey> ScalarAsync<T, TKey>(this IDbCommand dbCmd, Expression<Func<T, object>> field, CancellationToken token)
         {
             var q = dbCmd.GetDialectProvider().SqlExpression<T>();
             q.Select(field);
@@ -93,7 +93,7 @@ public static Task<TKey> ScalarAsync<T, TKey>(this IDbCommand dbCmd, Expression<
         }
 
         internal static Task<TKey> ScalarAsync<T, TKey>(this IDbCommand dbCmd,
-            Expression<Func<T, TKey>> field, Expression<Func<T, bool>> predicate, CancellationToken token)
+            Expression<Func<T, object>> field, Expression<Func<T, bool>> predicate, CancellationToken token)
         {
             var q = dbCmd.GetDialectProvider().SqlExpression<T>();
             q.Select(field).Where(predicate);

src/ServiceStack.OrmLite/Expressions/ReadExpressionCommandExtensions.cs

@@ -102,7 +102,7 @@ public static TKey Scalar<T, TKey>(this IDbCommand dbCmd, SqlExpression<T> expre
             return dbCmd.Scalar<TKey>(sql, expression.Params);
         }
 
-        public static TKey Scalar<T, TKey>(this IDbCommand dbCmd, Expression<Func<T, TKey>> field)
+        public static TKey Scalar<T, TKey>(this IDbCommand dbCmd, Expression<Func<T, object>> field)
         {
             var q = dbCmd.GetDialectProvider().SqlExpression<T>();
             q.Select(field);
@@ -111,7 +111,7 @@ public static TKey Scalar<T, TKey>(this IDbCommand dbCmd, Expression<Func<T, TKe
         }
 
         internal static TKey Scalar<T, TKey>(this IDbCommand dbCmd,
-            Expression<Func<T, TKey>> field, Expression<Func<T, bool>> predicate)
+            Expression<Func<T, object>> field, Expression<Func<T, bool>> predicate)
         {
             var q = dbCmd.GetDialectProvider().SqlExpression<T>();
             q.Select(field).Where(predicate);

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -190,10 +190,8 @@ public virtual SqlExpression<T> Select(string[] fields)
         /// <param name='fields'>
         /// x=> x.SomeProperty1 or x=> new{ x.SomeProperty1, x.SomeProperty2}
         /// </param>
-        /// <typeparam name='TKey'>
-        /// objectWithProperties
         /// </typeparam>
-        public virtual SqlExpression<T> Select<TKey>(Expression<Func<T, TKey>> fields)
+        public virtual SqlExpression<T> Select(Expression<Func<T, object>> fields)
         {
             sep = string.Empty;
             useFieldName = true;

src/ServiceStack.OrmLite/OrmLiteReadExpressionsApi.cs

@@ -188,19 +188,19 @@ public static T Single<T>(this IDbConnection dbConn, ISqlExpression expression)
         /// Returns a scalar result from using an SqlExpression lambda. E.g:
         /// <para>db.Scalar&lt;Person, int&gt;(x =&gt; Sql.Max(x.Age))</para>
         /// </summary>
-        public static TKey Scalar<T, TKey>(this IDbConnection dbConn, Expression<Func<T, TKey>> field)
+        public static TKey Scalar<T, TKey>(this IDbConnection dbConn, Expression<Func<T, object>> field)
         {
-            return dbConn.Exec(dbCmd => dbCmd.Scalar(field));
+            return dbConn.Exec(dbCmd => dbCmd.Scalar<T, TKey>(field));
         }
 
         /// <summary>
         /// Returns a scalar result from using an SqlExpression lambda. E.g:
         /// <para>db.Scalar&lt;Person, int&gt;(x =&gt; Sql.Max(x.Age), , x =&gt; x.Age &lt; 50)</para>
         /// </summary>        
         public static TKey Scalar<T, TKey>(this IDbConnection dbConn,
-            Expression<Func<T, TKey>> field, Expression<Func<T, bool>> predicate)
+            Expression<Func<T, object>> field, Expression<Func<T, bool>> predicate)
         {
-            return dbConn.Exec(dbCmd => dbCmd.Scalar(field, predicate));
+            return dbConn.Exec(dbCmd => dbCmd.Scalar<T, TKey>(field, predicate));
         }
 
         /// <summary>

src/ServiceStack.OrmLite/OrmLiteReadExpressionsApiAsync.cs

@@ -109,19 +109,19 @@ public static class OrmLiteReadExpressionsApiAsync
         /// Returns a scalar result from using an SqlExpression lambda. E.g:
         /// <para>db.Scalar&lt;Person, int&gt;(x =&gt; Sql.Max(x.Age))</para>
         /// </summary>
-        public static Task<TKey> ScalarAsync<T, TKey>(this IDbConnection dbConn, Expression<Func<T, TKey>> field, CancellationToken token = default(CancellationToken))
+        public static Task<TKey> ScalarAsync<T, TKey>(this IDbConnection dbConn, Expression<Func<T, object>> field, CancellationToken token = default(CancellationToken))
         {
-            return dbConn.Exec(dbCmd => dbCmd.ScalarAsync(field, token));
+            return dbConn.Exec(dbCmd => dbCmd.ScalarAsync<T, TKey>(field, token));
         }
 
         /// <summary>
         /// Returns a scalar result from using an SqlExpression lambda. E.g:
         /// <para>db.Scalar&lt;Person, int&gt;(x =&gt; Sql.Max(x.Age), , x =&gt; x.Age &lt; 50)</para>
         /// </summary>        
         public static Task<TKey> ScalarAsync<T, TKey>(this IDbConnection dbConn,
-            Expression<Func<T, TKey>> field, Expression<Func<T, bool>> predicate, CancellationToken token = default(CancellationToken))
+            Expression<Func<T, object>> field, Expression<Func<T, bool>> predicate, CancellationToken token = default(CancellationToken))
         {
-            return dbConn.Exec(dbCmd => dbCmd.ScalarAsync(field, predicate, token));
+            return dbConn.Exec(dbCmd => dbCmd.ScalarAsync<T, TKey>(field, predicate, token));
         }
 
         /// <summary>