Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 259673b

Browse files
mythzmythz
committed
Add overloads in custom sql APIs for accepting and executing a native ISqlExpression
1 parent 4d253e0 commit 259673b

File tree

5 files changed

+219
-13
lines changed

5 files changed

+219
-13
lines changed

‎src/ServiceStack.OrmLite/OrmLiteReadConnectionExtensions.cs‎

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,15 @@ public static T SingleWhere<T>(this IDbConnection dbConn, string name, object va
202202
return dbConn.Exec(dbCmd => dbCmd.SingleWhere<T>(name, value));
203203
}
204204

205+
/// <summary>
206+
/// Returns a single scalar value using an SqlExpression. E.g:
207+
/// <para>db.Column&lt;int&gt;(db.From&lt;Persion&gt;().Select(x => Sql.Count("*")).Where(q => q.Age > 40))</para>
208+
/// </summary>
209+
public static T Scalar<T>(this IDbConnection dbConn, ISqlExpression sqlExpression)
210+
{
211+
return dbConn.Exec(dbCmd => dbCmd.Scalar<T>(sqlExpression.ToSelectStatement()));
212+
}
213+
205214
/// <summary>
206215
/// Returns a single scalar value using a parameterized query. E.g:
207216
/// <para>db.Scalar&lt;int&gt;("SELECT COUNT(*) FROM Person WHERE Age &gt; @age", new { age = 40 })</para>
@@ -220,6 +229,15 @@ public static T ScalarFmt<T>(this IDbConnection dbConn, string sqlFormat, params
220229
return dbConn.Exec(dbCmd => dbCmd.ScalarFmt<T>(sqlFormat, sqlParams));
221230
}
222231

232+
/// <summary>
233+
/// Returns the distinct first column values in a HashSet using an SqlExpression. E.g:
234+
/// <para>db.Column&lt;int&gt;(db.From&lt;Persion&gt;().Select(x => x.LastName).Where(q => q.Age == 27))</para>
235+
/// </summary>
236+
public static List<T> Column<T>(this IDbConnection dbConn, ISqlExpression query)
237+
{
238+
return dbConn.Exec(dbCmd => dbCmd.Column<T>(query.ToSelectStatement()));
239+
}
240+
223241
/// <summary>
224242
/// Returns the first column in a List using a SqlFormat query. E.g:
225243
/// <para>db.Column&lt;string&gt;("SELECT LastName FROM Person WHERE Age = @age", new { age = 27 })</para>
@@ -238,6 +256,15 @@ public static List<T> ColumnFmt<T>(this IDbConnection dbConn, string sqlFormat,
238256
return dbConn.Exec(dbCmd => dbCmd.ColumnFmt<T>(sqlFormat, sqlParams));
239257
}
240258

259+
/// <summary>
260+
/// Returns the distinct first column values in a HashSet using an SqlExpression. E.g:
261+
/// <para>db.ColumnDistinct&lt;int&gt;(db.From&lt;Persion&gt;().Select(x => x.Age).Where(q => q.Age < 50))</para>
262+
/// </summary>
263+
public static HashSet<T> ColumnDistinct<T>(this IDbConnection dbConn, ISqlExpression query)
264+
{
265+
return dbConn.Exec(dbCmd => dbCmd.ColumnDistinct<T>(query.ToSelectStatement()));
266+
}
267+
241268
/// <summary>
242269
/// Returns the distinct first column values in a HashSet using an SqlFormat query. E.g:
243270
/// <para>db.ColumnDistinct&lt;int&gt;("SELECT Age FROM Person WHERE Age &lt; @age", new { age = 50 })</para>
@@ -256,6 +283,15 @@ public static HashSet<T> ColumnDistinctFmt<T>(this IDbConnection dbConn, string
256283
return dbConn.Exec(dbCmd => dbCmd.ColumnDistinctFmt<T>(sqlFormat, sqlParams));
257284
}
258285

286+
/// <summary>
287+
/// Returns an Dictionary&lt;K, List&lt;V&gt;&gt; grouping made from the first two columns using an Sql Expression. E.g:
288+
/// <para>db.Lookup&lt;int, string&gt;(db.From&lt;Person&gt;().Select(x => new { x.Age, x.LastName }).Where(q => q.Age < 50))</para>
289+
/// </summary>
290+
public static Dictionary<K, List<V>> Lookup<K, V>(this IDbConnection dbConn, ISqlExpression sqlExpression)
291+
{
292+
return dbConn.Exec(dbCmd => dbCmd.Lookup<K, V>(sqlExpression.ToSelectStatement()));
293+
}
294+
259295
/// <summary>
260296
/// Returns an Dictionary&lt;K, List&lt;V&gt;&gt; grouping made from the first two columns using an parameterized query. E.g:
261297
/// <para>db.Lookup&lt;int, string&gt;("SELECT Age, LastName FROM Person WHERE Age &lt; @age", new { age = 50 })</para>
@@ -274,6 +310,15 @@ public static Dictionary<K, List<V>> LookupFmt<K, V>(this IDbConnection dbConn,
274310
return dbConn.Exec(dbCmd => dbCmd.LookupFmt<K, V>(sqlFormat, sqlParams));
275311
}
276312

313+
/// <summary>
314+
/// Returns a Dictionary from the first 2 columns: Column 1 (Keys), Column 2 (Values) using an SqlExpression. E.g:
315+
/// <para>db.Dictionary&lt;int, string&gt;(db.From&lt;Person&gt;().Select(x => new { x.Id, x.LastName }).Where(x => x.Age < 50))</para>
316+
/// </summary>
317+
public static Dictionary<K, V> Dictionary<K, V>(this IDbConnection dbConn, ISqlExpression query)
318+
{
319+
return dbConn.Exec(dbCmd => dbCmd.Dictionary<K, V>(query.ToSelectStatement()));
320+
}
321+
277322
/// <summary>
278323
/// Returns a Dictionary from the first 2 columns: Column 1 (Keys), Column 2 (Values) using sql. E.g:
279324
/// <para>db.Dictionary&lt;int, string&gt;("SELECT Id, LastName FROM Person WHERE Age &lt; @age", new { age = 50 })</para>
@@ -312,7 +357,7 @@ public static bool Exists<T>(this IDbConnection dbConn, Func<SqlExpression<T>, S
312357

313358
/// <summary>
314359
/// Returns true if the Query returns any records that match the supplied SqlExpression, E.g:
315-
/// <para>db.Exists(db.SqlExpression&lt;Person&gt;().Where(x =&gt; x.Age &lt; 50))</para>
360+
/// <para>db.Exists(db.From&lt;Person&gt;().Where(x =&gt; x.Age &lt; 50))</para>
316361
/// </summary>
317362
public static bool Exists<T>(this IDbConnection dbConn, SqlExpression<T> expression)
318363
{
@@ -347,6 +392,15 @@ public static bool ExistsFmt<T>(this IDbConnection dbConn, string sqlFormat, par
347392
return dbConn.Exec(dbCmd => dbCmd.ExistsFmt<T>(sqlFormat, filterParams));
348393
}
349394

395+
/// <summary>
396+
/// Returns results from an arbitrary SqlExpression. E.g:
397+
/// <para>db.SqlList&lt;Person&gt;(db.From&lt;Person&gt;().Select("*").Where(q => q.Age &lt; 50))</para>
398+
/// </summary>
399+
public static List<T> SqlList<T>(this IDbConnection dbConn, ISqlExpression sqlExpression)
400+
{
401+
return dbConn.Exec(dbCmd => dbCmd.SqlList<T>(sqlExpression.ToSelectStatement()));
402+
}
403+
350404
/// <summary>
351405
/// Returns results from an arbitrary parameterized raw sql query. E.g:
352406
/// <para>db.SqlList&lt;Person&gt;("EXEC GetRockstarsAged @age", new { age = 50 })</para>
@@ -365,6 +419,15 @@ public static List<T> SqlList<T>(this IDbConnection dbConn, string sql, Dictiona
365419
return dbConn.Exec(dbCmd => dbCmd.SqlList<T>(sql, dict));
366420
}
367421

422+
/// <summary>
423+
/// Returns the first column in a List using an SqlExpression. E.g:
424+
/// <para>db.SqlColumn&lt;string&gt;(db.From&lt;Person&gt;().Select(x => x.LastName).Where(q => q.Age < 50))</para>
425+
/// </summary>
426+
public static List<T> SqlColumn<T>(this IDbConnection dbConn, ISqlExpression sqlExpression)
427+
{
428+
return dbConn.Exec(dbCmd => dbCmd.SqlColumn<T>(sqlExpression.ToSelectStatement()));
429+
}
430+
368431
/// <summary>
369432
/// Returns the first column in a List using a parameterized query. E.g:
370433
/// <para>db.SqlColumn&lt;string&gt;("SELECT LastName FROM Person WHERE Age &lt; @age", new { age = 50 })</para>
@@ -383,6 +446,15 @@ public static List<T> SqlColumn<T>(this IDbConnection dbConn, string sql, Dictio
383446
return dbConn.Exec(dbCmd => dbCmd.SqlColumn<T>(sql, dict));
384447
}
385448

449+
/// <summary>
450+
/// Returns a single Scalar value using an SqlExpression. E.g:
451+
/// <para>db.SqlScalar&lt;int&gt;(db.From&lt;Person&gt;().Select(Sql.Count("*")).Where(q => q.Age &lt; 50))</para>
452+
/// </summary>
453+
public static T SqlScalar<T>(this IDbConnection dbConn, ISqlExpression sqlExpression)
454+
{
455+
return dbConn.Exec(dbCmd => dbCmd.SqlScalar<T>(sqlExpression.ToSelectStatement()));
456+
}
457+
386458
/// <summary>
387459
/// Returns a single Scalar value using a parameterized query. E.g:
388460
/// <para>db.SqlScalar&lt;int&gt;("SELECT COUNT(*) FROM Person WHERE Age &lt; @age", new { age = 50 })</para>

‎tests/ServiceStack.OrmLite.Tests/ApiSqlServerTests.cs‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void API_SqlServer_Examples()
3636
db.Select<Person>(q => q.Where(x => x.Age > 40));
3737
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Id\", \"FirstName\", \"LastName\", \"Age\" \nFROM \"Person\"\nWHERE (\"Age\" > 40)"));
3838

39-
db.Select(db.SqlExpression<Person>().Where(x => x.Age > 40));
39+
db.Select(db.From<Person>().Where(x => x.Age > 40));
4040
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Id\", \"FirstName\", \"LastName\", \"Age\" \nFROM \"Person\"\nWHERE (\"Age\" > 40)"));
4141

4242
db.Single<Person>(x => x.Age == 42);
@@ -45,7 +45,7 @@ public void API_SqlServer_Examples()
4545
db.Single<Person>(q => q.Where(x => x.Age == 42));
4646
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT TOP 1 \"Id\", \"FirstName\", \"LastName\", \"Age\" \nFROM \"Person\"\nWHERE (\"Age\" = 42)"));
4747

48-
db.Single(db.SqlExpression<Person>().Where(x => x.Age == 42));
48+
db.Single(db.From<Person>().Where(x => x.Age == 42));
4949
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT TOP 1 \"Id\", \"FirstName\", \"LastName\", \"Age\" \nFROM \"Person\"\nWHERE (\"Age\" = 42)"));
5050

5151
db.Scalar<Person, int>(x => Sql.Max(x.Age));
@@ -57,7 +57,7 @@ public void API_SqlServer_Examples()
5757
db.Count<Person>(x => x.Age < 50);
5858
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT COUNT(*) FROM \"Person\" WHERE (\"Age\" < 50)"));
5959

60-
db.Count(db.SqlExpression<Person>().Where(x => x.Age < 50));
60+
db.Count(db.From<Person>().Where(x => x.Age < 50));
6161
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT COUNT(*) FROM \"Person\" WHERE (\"Age\" < 50)"));
6262

6363

@@ -133,30 +133,47 @@ public void API_SqlServer_Examples()
133133
db.SingleWhere<Person>("Age", 42);
134134
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Id\", \"FirstName\", \"LastName\", \"Age\" FROM \"Person\" WHERE \"Age\" = @Age"));
135135

136+
db.Scalar<int>(db.From<Person>().Select(Sql.Count("*")).Where(q => q.Age > 40));
137+
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT COUNT(*) \nFROM \"Person\"\nWHERE (\"Age\" > 40)"));
138+
db.Scalar<int>(db.From<Person>().Select(x => Sql.Count("*")).Where(q => q.Age > 40));
139+
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT Count(*) \nFROM \"Person\"\nWHERE (\"Age\" > 40)"));
140+
136141
db.Scalar<int>("SELECT COUNT(*) FROM Person WHERE Age > @age", new { age = 40 });
137142
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT COUNT(*) FROM Person WHERE Age > @age"));
138143

139144
db.ScalarFmt<int>("SELECT COUNT(*) FROM Person WHERE Age > {0}", 40);
140145
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT COUNT(*) FROM Person WHERE Age > 40"));
141146

147+
db.Column<string>(db.From<Person>().Select(x => x.LastName).Where(q => q.Age == 27));
148+
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"LastName\" \nFROM \"Person\"\nWHERE (\"Age\" = 27)"));
149+
142150
db.Column<string>("SELECT LastName FROM Person WHERE Age = @age", new { age = 27 });
143151
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT LastName FROM Person WHERE Age = @age"));
144152

145153
db.ColumnFmt<string>("SELECT LastName FROM Person WHERE Age = {0}", 27);
146154
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT LastName FROM Person WHERE Age = 27"));
147155

156+
db.ColumnDistinct<int>(db.From<Person>().Select(x => x.Age).Where(q => q.Age < 50));
157+
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Age\" \nFROM \"Person\"\nWHERE (\"Age\" < 50)"));
158+
148159
db.ColumnDistinct<int>("SELECT Age FROM Person WHERE Age < @age", new { age = 50 });
149160
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT Age FROM Person WHERE Age < @age"));
150161

151162
db.ColumnDistinctFmt<int>("SELECT Age FROM Person WHERE Age < {0}", 50);
152163
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT Age FROM Person WHERE Age < 50"));
153164

165+
db.Lookup<int, string>(db.From<Person>().Select(x => new { x.Age, x.LastName }).Where(q => q.Age < 50));
166+
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Age\",\"LastName\" \nFROM \"Person\"\nWHERE (\"Age\" < 50)"));
167+
154168
db.Lookup<int, string>("SELECT Age, LastName FROM Person WHERE Age < @age", new { age = 50 });
155169
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT Age, LastName FROM Person WHERE Age < @age"));
156170

157171
db.LookupFmt<int, string>("SELECT Age, LastName FROM Person WHERE Age < {0}", 50);
158172
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT Age, LastName FROM Person WHERE Age < 50"));
159173

174+
db.Dictionary<int, string>(db.From<Person>().Select(x => new { x.Id, x.LastName }).Where(x => x.Age < 50));
175+
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"Id\",\"LastName\" \nFROM \"Person\"\nWHERE (\"Age\" < 50)"));
176+
160177
db.Dictionary<int, string>("SELECT Id, LastName FROM Person WHERE Age < @age", new { age = 50 });
161178
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT Id, LastName FROM Person WHERE Age < @age"));
162179

@@ -166,7 +183,7 @@ public void API_SqlServer_Examples()
166183
db.Exists<Person>(x => x.Age < 50);
167184
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT COUNT(*) FROM \"Person\" WHERE (\"Age\" < 50)"));
168185

169-
db.Exists(db.SqlExpression<Person>().Where(x => x.Age < 50));
186+
db.Exists(db.From<Person>().Where(x => x.Age < 50));
170187
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT COUNT(*) FROM \"Person\" WHERE (\"Age\" < 50)"));
171188

172189
db.Exists<Person>(new { Age = 42 });
@@ -182,18 +199,27 @@ public void API_SqlServer_Examples()
182199
db.ExistsFmt<Person>("SELECT * FROM Person WHERE Age = {0}", 42);
183200
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT * FROM Person WHERE Age = 42"));
184201

202+
db.SqlList<Person>(db.From<Person>().Select("*").Where(q => q.Age < 50));
203+
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT * \nFROM \"Person\"\nWHERE (\"Age\" < 50)"));
204+
185205
db.SqlList<Person>("SELECT * FROM Person WHERE Age < @age", new { age = 50 });
186206
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT * FROM Person WHERE Age < @age"));
187207

188208
db.SqlList<Person>("SELECT * FROM Person WHERE Age < @age", new Dictionary<string, object> { { "age", 50 } });
189209
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT * FROM Person WHERE Age < @age"));
190210

211+
db.SqlColumn<string>(db.From<Person>().Select(x => x.LastName).Where(q => q.Age < 50));
212+
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT \"LastName\" \nFROM \"Person\"\nWHERE (\"Age\" < 50)"));
213+
191214
db.SqlColumn<string>("SELECT LastName FROM Person WHERE Age < @age", new { age = 50 });
192215
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT LastName FROM Person WHERE Age < @age"));
193216

194217
db.SqlColumn<string>("SELECT LastName FROM Person WHERE Age < @age", new Dictionary<string, object> { { "age", 50 } });
195218
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT LastName FROM Person WHERE Age < @age"));
196219

220+
db.SqlScalar<int>(db.From<Person>().Select(Sql.Count("*")).Where(q => q.Age < 50));
221+
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT COUNT(*) \nFROM \"Person\"\nWHERE (\"Age\" < 50)"));
222+
197223
db.SqlScalar<int>("SELECT COUNT(*) FROM Person WHERE Age < @age", new { age = 50 });
198224
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT COUNT(*) FROM Person WHERE Age < @age"));
199225

@@ -222,7 +248,7 @@ public void API_SqlServer_Examples()
222248
db.InsertOnly(new PersonWithAutoId { FirstName = "Amy", Age = 27 }, ev => ev.Insert(p => new { p.FirstName, p.Age }));
223249
Assert.That(db.GetLastSql(), Is.EqualTo("INSERT INTO \"PersonWithAutoId\" (\"FirstName\",\"Age\") VALUES ('Amy',27)"));
224250

225-
db.InsertOnly(new PersonWithAutoId { FirstName = "Amy", Age = 27 }, ev => db.SqlExpression<PersonWithAutoId>().Insert(p => new { p.FirstName, p.Age }));
251+
db.InsertOnly(new PersonWithAutoId { FirstName = "Amy", Age = 27 }, ev => db.From<PersonWithAutoId>().Insert(p => new { p.FirstName, p.Age }));
226252
Assert.That(db.GetLastSql(), Is.EqualTo("INSERT INTO \"PersonWithAutoId\" (\"FirstName\",\"Age\") VALUES ('Amy',27)"));
227253

228254
db.Update(new Person { Id = 1, FirstName = "Jimi", LastName = "Hendrix", Age = 27 });
@@ -301,7 +327,7 @@ public void API_SqlServer_Examples()
301327
db.Delete<Person>(ev => ev.Where(p => p.Age == 27));
302328
Assert.That(db.GetLastSql(), Is.EqualTo("DELETE FROM \"Person\" WHERE (\"Age\" = 27)"));
303329

304-
db.Delete(db.SqlExpression<Person>().Where(p => p.Age == 27));
330+
db.Delete(db.From<Person>().Where(p => p.Age == 27));
305331
Assert.That(db.GetLastSql(), Is.EqualTo("DELETE FROM \"Person\" WHERE (\"Age\" = 27)"));
306332

307333
db.DeleteFmt<Person>(where: "Age = {0}".SqlFmt(27));

0 commit comments

Comments
 (0)