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

Commit 1ee601a

Browse files
committed
Renamed to ExecuteNonQuery to improve readability
- Refactored NonQuery to ExecuteNonQuery so that the implicit meaning of the method translates in a better understood API.
1 parent 2ea3893 commit 1ee601a

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

src/ServiceStack.OrmLite/OrmLiteReadConnectionExtensions.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,19 +160,19 @@ public static List<T> Query<T>(this IDbConnection dbConn, string sql, Dictionary
160160
return dbConn.Exec(dbCmd => dbCmd.Query<T>(sql, dict));
161161
}
162162

163-
public static int NonQuery(this IDbConnection dbConn, string sql)
163+
public static int ExecuteNonQuery(this IDbConnection dbConn, string sql)
164164
{
165-
return dbConn.Exec(dbCmd => dbCmd.NonQuery(sql));
165+
return dbConn.Exec(dbCmd => dbCmd.ExecuteNonQuery(sql));
166166
}
167167

168-
public static int NonQuery(this IDbConnection dbConn, string sql, object anonType)
168+
public static int ExecuteNonQuery(this IDbConnection dbConn, string sql, object anonType)
169169
{
170-
return dbConn.Exec(dbCmd => dbCmd.NonQuery(sql, anonType));
170+
return dbConn.Exec(dbCmd => dbCmd.ExecuteNonQuery(sql, anonType));
171171
}
172172

173-
public static int NonQuery(this IDbConnection dbConn, string sql, Dictionary<string, object> dict)
173+
public static int ExecuteNonQuery(this IDbConnection dbConn, string sql, Dictionary<string, object> dict)
174174
{
175-
return dbConn.Exec(dbCmd => dbCmd.NonQuery(sql, dict));
175+
return dbConn.Exec(dbCmd => dbCmd.ExecuteNonQuery(sql, dict));
176176
}
177177

178178
public static T QueryScalar<T>(this IDbConnection dbConn, object anonType)

src/ServiceStack.OrmLite/OrmLiteReadExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ internal static List<T> Query<T>(this IDbCommand dbCmd, string sql, Dictionary<s
424424
: dbReader.ConvertToList<T>();
425425
}
426426

427-
internal static int NonQuery(this IDbCommand dbCmd, string sql, object anonType = null)
427+
internal static int ExecuteNonQuery(this IDbCommand dbCmd, string sql, object anonType = null)
428428
{
429429
if (anonType != null)
430430
dbCmd.SetParameters(anonType, excludeNulls: false);
@@ -433,7 +433,7 @@ internal static int NonQuery(this IDbCommand dbCmd, string sql, object anonType
433433
return dbCmd.ExecuteNonQuery();
434434
}
435435

436-
internal static int NonQuery(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict)
436+
internal static int ExecuteNonQuery(this IDbCommand dbCmd, string sql, Dictionary<string, object> dict)
437437
{
438438
if (dict != null)
439439
dbCmd.SetParameters(dict, excludeNulls: false);

tests/ServiceStack.OrmLite.Tests/OrmLiteNonQueryTests.cs renamed to tests/ServiceStack.OrmLite.Tests/OrmLiteExecuteNonQueryTests.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endregion using
1010

1111
[TestFixture]
12-
public class OrmLiteNonQueryTests
12+
public class OrmLiteExecuteNonQueryTests
1313
{
1414
public class UsingAnonType : OrmLiteTestBase
1515
{
@@ -22,7 +22,7 @@ public void Can_insert_one_row_and_get_one_affected_row()
2222

2323
var name = "Jane Doe";
2424

25-
var affectedRows = db.NonQuery("insert into Person (Name) Values (@name);", new
25+
var affectedRows = db.ExecuteNonQuery("insert into Person (Name) Values (@name);", new
2626
{
2727
name
2828
});
@@ -46,7 +46,7 @@ public void Can_insert_multiple_rows_and_get_matching_number_of_affected_rows()
4646
var name1 = "Jane Doe";
4747
var name2 = "john Smith";
4848

49-
var affectedRows = db.NonQuery(@"
49+
var affectedRows = db.ExecuteNonQuery(@"
5050
insert into Person (Name)
5151
Select @name1
5252
Union
@@ -82,7 +82,7 @@ public void Can_update_and_returns_appropriate_number_of_affected_rows()
8282

8383
var newName = "John Smith";
8484

85-
var affectedRows = db.NonQuery("Update Person Set Name = @newName where Id = @personId", new
85+
var affectedRows = db.ExecuteNonQuery("Update Person Set Name = @newName where Id = @personId", new
8686
{
8787
personId,
8888
newName
@@ -111,7 +111,7 @@ public void Can_delete_and_returns_appropriate_number_of_affected_rows()
111111

112112
var personId = db.GetLastInsertId();
113113

114-
var affectedRows = db.NonQuery("Delete From Person where Id = @personId", new
114+
var affectedRows = db.ExecuteNonQuery("Delete From Person where Id = @personId", new
115115
{
116116
personId
117117
});
@@ -130,7 +130,7 @@ public void Can_exec_statement_which_performs_no_changes_and_returns_no_affected
130130
{
131131
db.DropAndCreateTable<Person>();
132132

133-
var affectedRows = db.NonQuery(@"Delete From Person Where Id = @nonExistingId", new
133+
var affectedRows = db.ExecuteNonQuery(@"Delete From Person Where Id = @nonExistingId", new
134134
{
135135
nonExistingId = -1
136136
});
@@ -151,7 +151,7 @@ public void Can_insert_one_row_and_get_one_affected_row()
151151

152152
var name = "Jane Doe";
153153

154-
var affectedRows = db.NonQuery("insert into Person (Name) Values (@name);", new Dictionary<string, object>
154+
var affectedRows = db.ExecuteNonQuery("insert into Person (Name) Values (@name);", new Dictionary<string, object>
155155
{
156156
{ "name", name }
157157
});
@@ -175,7 +175,7 @@ public void Can_insert_multiple_rows_and_get_matching_number_of_affected_rows()
175175
var name1 = "Jane Doe";
176176
var name2 = "john Smith";
177177

178-
var affectedRows = db.NonQuery(@"
178+
var affectedRows = db.ExecuteNonQuery(@"
179179
insert into Person (Name)
180180
Select @name1
181181
Union
@@ -211,7 +211,7 @@ public void Can_update_and_returns_appropriate_number_of_affected_rows()
211211

212212
var newName = "John Smith";
213213

214-
var affectedRows = db.NonQuery("Update Person Set Name = @newName where Id = @personId", new Dictionary<string, object>
214+
var affectedRows = db.ExecuteNonQuery("Update Person Set Name = @newName where Id = @personId", new Dictionary<string, object>
215215
{
216216
{ "personId", personId },
217217
{ "newName", newName }
@@ -240,7 +240,7 @@ public void Can_delete_and_returns_appropriate_number_of_affected_rows()
240240

241241
var personId = db.GetLastInsertId();
242242

243-
var affectedRows = db.NonQuery("Delete From Person where Id = @personId", new Dictionary<string, object>
243+
var affectedRows = db.ExecuteNonQuery("Delete From Person where Id = @personId", new Dictionary<string, object>
244244
{
245245
{ "personId", personId }
246246
});
@@ -259,7 +259,7 @@ public void Can_exec_statement_which_performs_no_changes_and_returns_no_affected
259259
{
260260
db.DropAndCreateTable<Person>();
261261

262-
var affectedRows = db.NonQuery(@"Delete From Person Where Id = @nonExistingId", new Dictionary<string, object>
262+
var affectedRows = db.ExecuteNonQuery(@"Delete From Person Where Id = @nonExistingId", new Dictionary<string, object>
263263
{
264264
{ "nonExistingId", -1 }
265265
});
@@ -282,7 +282,7 @@ public void Can_insert_one_row_and_get_one_affected_row()
282282

283283
var sql = string.Format("insert into Person (Name) Values ('{0}');", name);
284284

285-
var affectedRows = db.NonQuery(sql);
285+
var affectedRows = db.ExecuteNonQuery(sql);
286286

287287
var personId = db.GetLastInsertId();
288288

@@ -305,7 +305,7 @@ public void Can_insert_multiple_rows_and_get_matching_number_of_affected_rows()
305305

306306
var sql = string.Format(@"insert into Person (Name) Select '{0}' Union Select '{1}'", name1, name2);
307307

308-
var affectedRows = db.NonQuery(sql);
308+
var affectedRows = db.ExecuteNonQuery(sql);
309309

310310
var rows = db.SqlList<Person>("select * from Person order by name");
311311

@@ -335,7 +335,7 @@ public void Can_update_and_returns_appropriate_number_of_affected_rows()
335335

336336
var sql = string.Format(@"Update Person Set Name = '{0}' where Id = {1}", newName, personId);
337337

338-
var affectedRows = db.NonQuery(sql);
338+
var affectedRows = db.ExecuteNonQuery(sql);
339339

340340
var updatedPerson = db.GetById<Person>(personId);
341341

@@ -362,7 +362,7 @@ public void Can_delete_and_returns_appropriate_number_of_affected_rows()
362362

363363
var sql = string.Format(@"Delete From Person where Id = {0}", personId);
364364

365-
var affectedRows = db.NonQuery(sql);
365+
var affectedRows = db.ExecuteNonQuery(sql);
366366

367367
var count = db.Count<Person>();
368368

@@ -380,7 +380,7 @@ public void Can_exec_statement_which_performs_no_changes_and_returns_no_affected
380380

381381
var sql = string.Format(@"Delete From Person where Id = {0}", -1);
382382

383-
var affectedRows = db.NonQuery(sql);
383+
var affectedRows = db.ExecuteNonQuery(sql);
384384

385385
Assert.That(affectedRows, Is.EqualTo(0));
386386
}

tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<Compile Include="ForeignKeyAttributeTests.cs" />
119119
<Compile Include="OrmLiteDropTableTests.cs" />
120120
<Compile Include="OrmLiteDropTableWithNamingStrategyTests.cs" />
121-
<Compile Include="OrmLiteNonQueryTests.cs" />
121+
<Compile Include="OrmLiteExecuteNonQueryTests.cs" />
122122
<Compile Include="OrmLiteQueryTests.cs" />
123123
<Compile Include="LocalizationTests.cs" />
124124
<Compile Include="OrmLiteConnectionFactoryTests.cs" />

0 commit comments

Comments
 (0)