Skip to content

Commit 4dd4ca7

Browse files
committed
DB adapter refactoring
1 parent a481517 commit 4dd4ca7

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

QueryDB/MSSQL/Adapter.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ internal class Adapter
1313
/// <summary>
1414
/// Gets the 'SQL Server' data reader.
1515
/// </summary>
16-
/// <param name="selectSql">'Select' sql value.</param>
16+
/// <param name="cmdText">The text of the query.</param>
1717
/// <param name="connection">'SQL Server' connection.</param>
18-
/// <returns>'SQL Server' data reader for the select sql.</returns>
19-
internal SqlDataReader GetSqlReader(string selectSql, SqlConnection connection)
18+
/// <param name="commandType">Sql command type.</param>
19+
/// <returns>'SQL Server' data reader.</returns>
20+
internal SqlDataReader GetSqlReader(string cmdText, SqlConnection connection, CommandType commandType)
2021
{
2122
connection.Open();
22-
using (var sqlCommand = new SqlCommand(selectSql, connection) { CommandType = CommandType.Text })
23+
using (var sqlCommand = new SqlCommand(cmdText, connection) { CommandType = commandType })
2324
{
2425
return sqlCommand.ExecuteReader();
2526
}
@@ -36,7 +37,7 @@ internal SqlDataReader GetSqlReader(string selectSql, SqlConnection connection)
3637
internal List<DataDictionary> FetchData(string selectSql, SqlConnection connection, bool upperCaseKeys)
3738
{
3839
var dataList = new List<DataDictionary>();
39-
using (var reader = GetSqlReader(selectSql, connection))
40+
using (var reader = GetSqlReader(selectSql, connection, CommandType.Text))
4041
{
4142
while (reader.Read())
4243
{

QueryDB/MySQL/Adapter.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ internal class Adapter
1313
/// <summary>
1414
/// Gets the 'MySQL' data reader.
1515
/// </summary>
16-
/// <param name="selectSql">'Select' sql value.</param>
16+
/// <param name="cmdText">The text of the query.</param>
1717
/// <param name="connection">'MySQL' connection.</param>
18-
/// <returns>'MySQL' data reader for the select sql.</returns>
19-
internal MySqlDataReader GetMySqlReader(string selectSql, MySqlConnection connection)
18+
/// <param name="commandType">Sql command type.</param>
19+
/// <returns>'MySQL' data reader.</returns>
20+
internal MySqlDataReader GetMySqlReader(string cmdText, MySqlConnection connection, CommandType commandType)
2021
{
2122
connection.Open();
22-
using (var sqlCommand = new MySqlCommand(selectSql, connection) { CommandType = CommandType.Text })
23+
using (var sqlCommand = new MySqlCommand(cmdText, connection) { CommandType = commandType })
2324
{
2425
return sqlCommand.ExecuteReader();
2526
}
@@ -36,7 +37,7 @@ internal MySqlDataReader GetMySqlReader(string selectSql, MySqlConnection connec
3637
internal List<DataDictionary> FetchData(string selectSql, MySqlConnection connection, bool upperCaseKeys)
3738
{
3839
var dataList = new List<DataDictionary>();
39-
using (var reader = GetMySqlReader(selectSql, connection))
40+
using (var reader = GetMySqlReader(selectSql, connection, CommandType.Text))
4041
{
4142
while (reader.Read())
4243
{

QueryDB/Oracle/Adapter.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ internal class Adapter
1313
/// <summary>
1414
/// Gets the 'Oracle' data reader.
1515
/// </summary>
16-
/// <param name="selectSql">'Select' sql value.</param>
16+
/// <param name="cmdText">The text of the query.</param>
1717
/// <param name="connection">'Oracle' connection.</param>
18-
/// <returns>'Oracle' data reader for the select sql.</returns>
19-
internal OracleDataReader GetOracleReader(string selectSql, OracleConnection connection)
18+
/// <param name="commandType">Sql command type.</param>
19+
/// <returns>'Oracle' data reader.</returns>
20+
internal OracleDataReader GetOracleReader(string cmdText, OracleConnection connection, CommandType commandType)
2021
{
2122
connection.Open();
22-
using (var sqlCommand = new OracleCommand(selectSql, connection) { CommandType = CommandType.Text })
23+
using (var sqlCommand = new OracleCommand(cmdText, connection) { CommandType = commandType })
2324
{
2425
return sqlCommand.ExecuteReader();
2526
}
@@ -36,7 +37,7 @@ internal OracleDataReader GetOracleReader(string selectSql, OracleConnection con
3637
internal List<DataDictionary> FetchData(string selectSql, OracleConnection connection, bool upperCaseKeys)
3738
{
3839
var dataList = new List<DataDictionary>();
39-
using (var reader = GetOracleReader(selectSql, connection))
40+
using (var reader = GetOracleReader(selectSql, connection, CommandType.Text))
4041
{
4142
while (reader.Read())
4243
{

0 commit comments

Comments
 (0)