Skip to content

Commit 42f2ffc

Browse files
abhinavminhasabhinavminhas
committed
Update: Execute DDL -> Execute Command
1 parent 2e1d5d3 commit 42f2ffc

File tree

11 files changed

+85
-57
lines changed

11 files changed

+85
-57
lines changed

‎QueryDB.Core.Tests/MSSQLTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,11 @@ public void Test_MSSQL_FetchData_Entity_Strict_Error_Check()
308308

309309
#endregion
310310

311-
#region Execute DDL Tests - << void ExecuteDDL(string ddlStatement) >>
311+
#region Execute Command Tests - << void ExecuteCommand(string sqlStatement) >>
312312

313313
[TestMethod]
314314
[TestCategory(DB_TESTS), TestCategory(MSSQL_TESTS)]
315-
public void Test_MSSQL_ExecuteDDL_Queries()
315+
public void Test_MSSQL_ExecuteCommand_DDL_Queries()
316316
{
317317
var createTableSql = Queries.MSSQLQueries.TestDB.DDL.Create_Table;
318318
var alterTableSql = Queries.MSSQLQueries.TestDB.DDL.Alter_Table;
@@ -326,11 +326,11 @@ public void Test_MSSQL_ExecuteDDL_Queries()
326326
var dDLTableColumnCommentCheckSql = Queries.MSSQLQueries.TestDB.DDL.DDL_Table_Column_Comment_check;
327327

328328
var dbContext = new DBContext(DB.MSSQL, MSSQLConnectionString);
329-
dbContext.ExecuteDDL(createTableSql);
330-
dbContext.ExecuteDDL(alterTableSql);
331-
dbContext.ExecuteDDL(commentTableSql);
332-
dbContext.ExecuteDDL(commentTableColumnSql);
333-
dbContext.ExecuteDDL(truncateTableSql);
329+
dbContext.ExecuteCommand(createTableSql);
330+
dbContext.ExecuteCommand(alterTableSql);
331+
dbContext.ExecuteCommand(commentTableSql);
332+
dbContext.ExecuteCommand(commentTableColumnSql);
333+
dbContext.ExecuteCommand(truncateTableSql);
334334

335335
var tableCount = dbContext
336336
.FetchData(string.Format(dDLExecutionCheckSql, "dbo", "Employee"));
@@ -342,7 +342,7 @@ public void Test_MSSQL_ExecuteDDL_Queries()
342342
.FetchData(string.Format(dDLTableColumnCommentCheckSql, "dbo", "Employee"));
343343
Assert.AreEqual("This column stores employee middle name", tableColumnComment[0].ReferenceData["Table_Column_Comment"]);
344344

345-
dbContext.ExecuteDDL(renameTableSql);
345+
dbContext.ExecuteCommand(renameTableSql);
346346

347347
tableCount = dbContext
348348
.FetchData(string.Format(dDLExecutionCheckSql, "dbo", "Employee"));
@@ -351,7 +351,7 @@ public void Test_MSSQL_ExecuteDDL_Queries()
351351
.FetchData(string.Format(dDLExecutionCheckSql, "dbo", "Employees"));
352352
Assert.AreEqual("1", tableCount[0].ReferenceData["Table_Count"]);
353353

354-
dbContext.ExecuteDDL(dropTableSql);
354+
dbContext.ExecuteCommand(dropTableSql);
355355

356356
tableCount = dbContext
357357
.FetchData(string.Format(dDLExecutionCheckSql, "dbo", "Employees"));

‎QueryDB.Core.Tests/MySQLTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -288,11 +288,11 @@ public void Test_MySQL_FetchData_Entity_Strict_Error_Check()
288288

289289
#endregion
290290

291-
#region Execute DDL Tests - << void ExecuteDDL(string ddlStatement) >>
291+
#region Execute Command Tests - << void ExecuteCommand(string sqlStatement) >>
292292

293293
[TestMethod]
294294
[TestCategory(DB_TESTS), TestCategory(MYSQL_TESTS)]
295-
public void Test_MySQL_ExecuteDDL_Queries()
295+
public void Test_MySQL_ExecuteCommand_DDL_Queries()
296296
{
297297
var createTableSql = Queries.MySQLQueries.TestDB.DDL.Create_Table;
298298
var alterTableSql = Queries.MySQLQueries.TestDB.DDL.Alter_Table;
@@ -306,11 +306,11 @@ public void Test_MySQL_ExecuteDDL_Queries()
306306
var dDLTableColumnCommentCheckSql = Queries.MySQLQueries.TestDB.DDL.DDL_Table_Column_Comment_check;
307307

308308
var dbContext = new DBContext(DB.MySQL, MySQLConnectionString);
309-
dbContext.ExecuteDDL(createTableSql);
310-
dbContext.ExecuteDDL(alterTableSql);
311-
dbContext.ExecuteDDL(commentTableSql);
312-
dbContext.ExecuteDDL(commentTableColumnSql);
313-
dbContext.ExecuteDDL(truncateTableSql);
309+
dbContext.ExecuteCommand(createTableSql);
310+
dbContext.ExecuteCommand(alterTableSql);
311+
dbContext.ExecuteCommand(commentTableSql);
312+
dbContext.ExecuteCommand(commentTableColumnSql);
313+
dbContext.ExecuteCommand(truncateTableSql);
314314

315315
var tableCount = dbContext
316316
.FetchData(string.Format(dDLExecutionCheckSql, "mysql", "Employee"));
@@ -322,7 +322,7 @@ public void Test_MySQL_ExecuteDDL_Queries()
322322
.FetchData(string.Format(dDLTableColumnCommentCheckSql, "mysql", "Employee"));
323323
Assert.AreEqual("This column stores employee middle name", tableColumnComment[3].ReferenceData["Table_Column_Comment"]);
324324

325-
dbContext.ExecuteDDL(renameTableSql);
325+
dbContext.ExecuteCommand(renameTableSql);
326326

327327
tableCount = dbContext
328328
.FetchData(string.Format(dDLExecutionCheckSql, "mysql", "Employee"));
@@ -331,7 +331,7 @@ public void Test_MySQL_ExecuteDDL_Queries()
331331
.FetchData(string.Format(dDLExecutionCheckSql, "mysql", "Employees"));
332332
Assert.AreEqual("1", tableCount[0].ReferenceData["Table_Count"]);
333333

334-
dbContext.ExecuteDDL(dropTableSql);
334+
dbContext.ExecuteCommand(dropTableSql);
335335

336336
tableCount = dbContext
337337
.FetchData(string.Format(dDLExecutionCheckSql, "mysql", "Employees"));

‎QueryDB.Core.Tests/OracleTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,11 @@ public void Test_Oracle_FetchData_Entity_Strict_Error_Check()
290290

291291
#endregion
292292

293-
#region Execute DDL Tests - << void ExecuteDDL(string ddlStatement) >>
293+
#region Execute Command Tests - << void ExecuteCommand(string sqlStatement) >>
294294

295295
[TestMethod]
296296
[TestCategory(DB_TESTS), TestCategory(ORACLE_TESTS)]
297-
public void Test_Oracle_ExecuteDDL_Queries()
297+
public void Test_Oracle_ExecuteCommand_DDL_Queries()
298298
{
299299
var createTableSql = Queries.OracleQueries.TestDB.DDL.Create_Table;
300300
var alterTableSql = Queries.OracleQueries.TestDB.DDL.Alter_Table;
@@ -308,11 +308,11 @@ public void Test_Oracle_ExecuteDDL_Queries()
308308
var dDLTableColumnCommentCheckSql = Queries.OracleQueries.TestDB.DDL.DDL_Table_Column_Comment_check;
309309

310310
var dbContext = new DBContext(DB.Oracle, OracleConnectionString);
311-
dbContext.ExecuteDDL(createTableSql);
312-
dbContext.ExecuteDDL(alterTableSql);
313-
dbContext.ExecuteDDL(commentTableSql);
314-
dbContext.ExecuteDDL(commentTableColumnSql);
315-
dbContext.ExecuteDDL(truncateTableSql);
311+
dbContext.ExecuteCommand(createTableSql);
312+
dbContext.ExecuteCommand(alterTableSql);
313+
dbContext.ExecuteCommand(commentTableSql);
314+
dbContext.ExecuteCommand(commentTableColumnSql);
315+
dbContext.ExecuteCommand(truncateTableSql);
316316

317317
var tableCount = dbContext
318318
.FetchData(string.Format(dDLExecutionCheckSql, "Employee"));
@@ -324,7 +324,7 @@ public void Test_Oracle_ExecuteDDL_Queries()
324324
.FetchData(string.Format(dDLTableColumnCommentCheckSql, "Employee"));
325325
Assert.AreEqual("This column stores employee middle name", tableColumnComment[3].ReferenceData["TABLE_COLUMN_COMMENT"]);
326326

327-
dbContext.ExecuteDDL(renameTableSql);
327+
dbContext.ExecuteCommand(renameTableSql);
328328

329329
tableCount = dbContext
330330
.FetchData(string.Format(dDLExecutionCheckSql, "Employee"));
@@ -333,7 +333,7 @@ public void Test_Oracle_ExecuteDDL_Queries()
333333
.FetchData(string.Format(dDLExecutionCheckSql, "Employees"));
334334
Assert.AreEqual("1", tableCount[0].ReferenceData["TABLE_COUNT"]);
335335

336-
dbContext.ExecuteDDL(dropTableSql);
336+
dbContext.ExecuteCommand(dropTableSql);
337337

338338
tableCount = dbContext
339339
.FetchData(string.Format(dDLExecutionCheckSql, "Employees"));

‎QueryDB.Core.Tests/PostgreSQLTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,11 @@ public void Test_PostgreSQL_FetchData_Entity_Strict_Error_Check()
282282

283283
#endregion
284284

285-
#region Execute DDL Tests - << void ExecuteDDL(string ddlStatement) >>
285+
#region Execute Command Tests - << void ExecuteCommand(string sqlStatement) >>
286286

287287
[TestMethod]
288288
[TestCategory(DB_TESTS), TestCategory(POSTGRESQL_TESTS)]
289-
public void Test_PostgreSQL_ExecuteDDL_Queries()
289+
public void Test_PostgreSQL_ExecuteCommand_DDL_Queries()
290290
{
291291
var createTableSql = Queries.PostgreSQLQueries.TestDB.DDL.Create_Table;
292292
var alterTableSql = Queries.PostgreSQLQueries.TestDB.DDL.Alter_Table;
@@ -300,11 +300,11 @@ public void Test_PostgreSQL_ExecuteDDL_Queries()
300300
var dDLTableColumnCommentCheckSql = Queries.PostgreSQLQueries.TestDB.DDL.DDL_Table_Column_Comment_check;
301301

302302
var dbContext = new DBContext(DB.PostgreSQL, PostgreSQLConnectionString);
303-
dbContext.ExecuteDDL(createTableSql);
304-
dbContext.ExecuteDDL(alterTableSql);
305-
dbContext.ExecuteDDL(commentTableSql);
306-
dbContext.ExecuteDDL(commentTableColumnSql);
307-
dbContext.ExecuteDDL(truncateTableSql);
303+
dbContext.ExecuteCommand(createTableSql);
304+
dbContext.ExecuteCommand(alterTableSql);
305+
dbContext.ExecuteCommand(commentTableSql);
306+
dbContext.ExecuteCommand(commentTableColumnSql);
307+
dbContext.ExecuteCommand(truncateTableSql);
308308

309309
var tableCount = dbContext
310310
.FetchData(string.Format(dDLExecutionCheckSql, "public", "Employee"));
@@ -316,7 +316,7 @@ public void Test_PostgreSQL_ExecuteDDL_Queries()
316316
.FetchData(string.Format(dDLTableColumnCommentCheckSql, "public", "Employee"));
317317
Assert.AreEqual("This column stores employee middle name", tableColumnComment[3].ReferenceData["table_column_comment"]);
318318

319-
dbContext.ExecuteDDL(renameTableSql);
319+
dbContext.ExecuteCommand(renameTableSql);
320320

321321
tableCount = dbContext
322322
.FetchData(string.Format(dDLExecutionCheckSql, "public", "Employee"));
@@ -325,7 +325,7 @@ public void Test_PostgreSQL_ExecuteDDL_Queries()
325325
.FetchData(string.Format(dDLExecutionCheckSql, "public", "Employees"));
326326
Assert.AreEqual("1", tableCount[0].ReferenceData["table_count"]);
327327

328-
dbContext.ExecuteDDL(dropTableSql);
328+
dbContext.ExecuteCommand(dropTableSql);
329329

330330
tableCount = dbContext
331331
.FetchData(string.Format(dDLExecutionCheckSql, "public", "Employees"));

‎QueryDB.Core.Tests/Queries.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ internal static class DDL
3636
}
3737
}
3838
}
39-
39+
4040
internal static class MySQLQueries
4141
{
4242
internal static class Smoke

‎QueryDB/DBContext.cs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,38 +142,42 @@ public List<DataDictionary> FetchData(string selectSql, bool upperCaseKeys = fal
142142
return dataList;
143143
}
144144

145-
public void ExecuteDDL(string ddlStatement)
145+
/// <summary>
146+
/// Executes SQL commands.
147+
/// </summary>
148+
/// <param name="sqlStatement">SQL statement as command.</param>
149+
public void ExecuteCommand(string sqlStatement)
146150
{
147151
if (Database.Equals(DB.MSSQL))
148152
{
149153
using (var msSqlDBConnection = GetSqlServerConnection())
150154
{
151155
var _systemAdapter = new MSSQL.Adapter();
152-
_systemAdapter.ExecuteDDL(ddlStatement, msSqlDBConnection.SqlConnection);
156+
_systemAdapter.ExecuteCommand(sqlStatement, msSqlDBConnection.SqlConnection);
153157
}
154158
}
155159
else if (Database.Equals(DB.MySQL))
156160
{
157161
using (var mySqlDBConnection = GetMySqlConnection())
158162
{
159163
var _systemAdapter = new MySQL.Adapter();
160-
_systemAdapter.ExecuteDDL(ddlStatement, mySqlDBConnection.MySqlConnection);
164+
_systemAdapter.ExecuteCommand(sqlStatement, mySqlDBConnection.MySqlConnection);
161165
}
162166
}
163167
else if (Database.Equals(DB.Oracle))
164168
{
165169
using (var oracleDBConnection = GetOracleConnection())
166170
{
167171
var _systemAdapter = new Oracle.Adapter();
168-
_systemAdapter.ExecuteDDL(ddlStatement, oracleDBConnection.OracleConnection);
172+
_systemAdapter.ExecuteCommand(sqlStatement, oracleDBConnection.OracleConnection);
169173
}
170174
}
171175
else if (Database.Equals(DB.PostgreSQL))
172176
{
173177
using (var postgreSqlDBConnection = GetPostgreSqlConnection())
174178
{
175179
var _systemAdapter = new PostgreSQL.Adapter();
176-
_systemAdapter.ExecuteDDL(ddlStatement, postgreSqlDBConnection.PostgreSQLConnection);
180+
_systemAdapter.ExecuteCommand(sqlStatement, postgreSqlDBConnection.PostgreSQLConnection);
177181
}
178182
}
179183
}

‎QueryDB/IDBContext.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ interface IDBContext
2626
List<T> FetchData<T>(string selectSql, bool strict = false) where T : new();
2727

2828
/// <summary>
29-
/// Executes 'Data Definition Language' commands.
29+
/// Executes SQL commands.
3030
/// </summary>
31-
/// <param name="ddlStatement">DDL statement as command.</param>
32-
void ExecuteDDL(string ddlStatement);
31+
/// <param name="sqlStatement">SQL statement as command.</param>
32+
void ExecuteCommand(string sqlStatement);
3333
}
3434
}

‎QueryDB/MSSQL/Adapter.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,17 @@ internal List<DataDictionary> FetchData(string selectSql, SqlConnection connecti
9292
return dataList;
9393
}
9494

95-
internal void ExecuteDDL(string ddlStatement, SqlConnection connection)
95+
/// <summary>
96+
/// Executes SQL commands.
97+
/// </summary>
98+
/// <param name="sqlStatement">SQL statement as command.</param>
99+
/// <param name="connection">'Sql' Connection.</param>
100+
/// <returns>The number of rows affected.</returns>
101+
internal int ExecuteCommand(string sqlStatement, SqlConnection connection)
96102
{
97-
using(var sqlCommand = GetSqlCommand(ddlStatement, connection, CommandType.Text))
103+
using(var sqlCommand = GetSqlCommand(sqlStatement, connection, CommandType.Text))
98104
{
99-
sqlCommand.ExecuteNonQuery();
105+
return sqlCommand.ExecuteNonQuery();
100106
}
101107
}
102108
}

‎QueryDB/MySQL/Adapter.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,17 @@ internal List<DataDictionary> FetchData(string selectSql, MySqlConnection connec
9292
return dataList;
9393
}
9494

95-
internal void ExecuteDDL(string ddlStatement, MySqlConnection connection)
95+
/// <summary>
96+
/// Executes SQL commands.
97+
/// </summary>
98+
/// <param name="sqlStatement">SQL statement as command.</param>
99+
/// <param name="connection">'MySQL' Connection.</param>
100+
/// <returns>The number of rows affected.</returns>
101+
internal int ExecuteCommand(string sqlStatement, MySqlConnection connection)
96102
{
97-
using (var sqlCommand = GetMySqlCommand(ddlStatement, connection, CommandType.Text))
103+
using (var sqlCommand = GetMySqlCommand(sqlStatement, connection, CommandType.Text))
98104
{
99-
sqlCommand.ExecuteNonQuery();
105+
return sqlCommand.ExecuteNonQuery();
100106
}
101107
}
102108
}

‎QueryDB/Oracle/Adapter.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,17 @@ internal List<DataDictionary> FetchData(string selectSql, OracleConnection conne
9999
return dataList;
100100
}
101101

102-
internal void ExecuteDDL(string ddlStatement, OracleConnection connection)
102+
/// <summary>
103+
/// Executes SQL commands.
104+
/// </summary>
105+
/// <param name="sqlStatement">SQL statement as command.</param>
106+
/// <param name="connection">'Oracle' Connection.</param>
107+
/// <returns>The number of rows affected.</returns>
108+
internal int ExecuteCommand(string sqlStatement, OracleConnection connection)
103109
{
104-
using (var sqlCommand = GetOracleCommand(ddlStatement, connection, CommandType.Text))
110+
using (var sqlCommand = GetOracleCommand(sqlStatement, connection, CommandType.Text))
105111
{
106-
sqlCommand.ExecuteNonQuery();
112+
return sqlCommand.ExecuteNonQuery();
107113
}
108114
}
109115
}

0 commit comments

Comments
 (0)