Skip to content

Rename method HasKey according to standard nomenclature. #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2022
Merged

Rename method HasKey according to standard nomenclature. #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dotnet/src/dotnetframework/GxClasses/Data/GXDataCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ public string ConnectionStringForLog()
}
return result;
}
public virtual bool hasKey(string data, string key)
public virtual bool HasKey(string data, string key)
{
if (!string.IsNullOrEmpty(data) && data.IndexOf(key, StringComparison.OrdinalIgnoreCase) >= 0)
{
Expand Down Expand Up @@ -1961,19 +1961,19 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();
string port1 = port!=null ? port.Trim() : "";
if (!string.IsNullOrEmpty(datasourceName) && port1.Length > 0 && !hasKey(extra, "Data Source"))
if (!string.IsNullOrEmpty(datasourceName) && port1.Length > 0 && !HasKey(extra, "Data Source"))
{
connectionString.AppendFormat("Data Source={0},{1};",datasourceName, port1);
}
else if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source"))
else if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source"))
{
connectionString.AppendFormat("Data Source={0};",datasourceName);
}
if (userId!=null)
{
connectionString.AppendFormat(";User ID={0};Password={1}",userId,userPassword);
}
if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database"))
if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database"))
{
connectionString.AppendFormat(";Database={0}",databaseName);
}
Expand Down
6 changes: 3 additions & 3 deletions dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();

if (!string.IsNullOrEmpty(datasourceName) && port != null && port.Trim().Length > 0 && !hasKey(extra, "Server"))
if (!string.IsNullOrEmpty(datasourceName) && port != null && port.Trim().Length > 0 && !HasKey(extra, "Server"))
{
connectionString.AppendFormat("Server={0}:{1};",datasourceName, port);
}
else if (datasourceName != null && !hasKey(extra, "Server"))
else if (datasourceName != null && !HasKey(extra, "Server"))
{

connectionString.AppendFormat("Server={0};",datasourceName);
Expand All @@ -190,7 +190,7 @@ protected override string BuildConnectionString(string datasourceName, string us
{
connectionString.AppendFormat(";UID={0};Password={1}", userId, userPassword);
}
if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database"))
if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database"))
{
connectionString.AppendFormat(";Database={0}",databaseName);
}
Expand Down
14 changes: 7 additions & 7 deletions dotnet/src/dotnetframework/GxClasses/Data/GXDataDb2400.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,20 +234,20 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();

if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source"))
if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source"))
{
connectionString.AppendFormat("Data Source={0};",datasourceName);
}
if (userId!=null)
{
connectionString.AppendFormat("User ID={0};Password={1};",userId,userPassword);
}
if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Default Collection"))
if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Default Collection"))
{
connectionString.AppendFormat("Default Collection={0};", databaseName);
}

if (!String.IsNullOrEmpty(m_InitialCatalog) && !hasKey(extra, "Database"))
if (!String.IsNullOrEmpty(m_InitialCatalog) && !HasKey(extra, "Database"))
{
connectionString.AppendFormat("Database={0}", m_InitialCatalog);
}
Expand Down Expand Up @@ -867,23 +867,23 @@ protected override string BuildConnectionString(string datasourceName, string us
StringBuilder connectionString = new StringBuilder();
connectionString.Append("Provider=DB2OLEDB;Network Port=446;Network Transport Library=TCP;");

if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Network Address"))
if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Network Address"))
{
connectionString.AppendFormat("Network Address={0};", datasourceName);
}
if (userId != null)
{
connectionString.AppendFormat("User ID={0};Password={1};", userId, userPassword);
}
if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Default Qualifier"))
if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Default Qualifier"))
{
connectionString.AppendFormat("Default Qualifier={0};", databaseName);
}
if (!String.IsNullOrEmpty(m_InitialCatalog) && !hasKey(extra, "Initial Catalog"))
if (!String.IsNullOrEmpty(m_InitialCatalog) && !HasKey(extra, "Initial Catalog"))
{
connectionString.AppendFormat("Initial Catalog={0};", m_InitialCatalog);
}
if (!string.IsNullOrEmpty(m_SqlPackage) && !hasKey(extra, "Package Collection"))
if (!string.IsNullOrEmpty(m_SqlPackage) && !HasKey(extra, "Package Collection"))
{
connectionString.AppendFormat("Package Collection={0}", m_SqlPackage);
}
Expand Down
8 changes: 4 additions & 4 deletions dotnet/src/dotnetframework/GxClasses/Data/GXDataHana.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,23 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();

if (!string.IsNullOrEmpty(datasourceName) && port != null && port.Trim().Length > 0 && !hasKey(extra, "Server"))
if (!string.IsNullOrEmpty(datasourceName) && port != null && port.Trim().Length > 0 && !HasKey(extra, "Server"))
{
connectionString.AppendFormat("Server={0}:{1};", datasourceName, port);
}
else if (datasourceName != null && !hasKey(extra, "Server"))
else if (datasourceName != null && !HasKey(extra, "Server"))
{
connectionString.AppendFormat("Server={0}:30015;", datasourceName);
}
if (userId != null)
{
connectionString.AppendFormat(";UserID={0};Password={1}", userId, userPassword);
}
if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database"))
if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database"))
{
connectionString.AppendFormat(";Database={0}", databaseName);
}
if (schema != null && schema.Trim().Length > 0 && !hasKey(extra, "Current Schema"))
if (schema != null && schema.Trim().Length > 0 && !HasKey(extra, "Current Schema"))
{
connectionString.AppendFormat(";Current Schema={0}", schema);
}
Expand Down
8 changes: 4 additions & 4 deletions dotnet/src/dotnetframework/GxClasses/Data/GXDataInformix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,17 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();

if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Host"))
if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Host"))
{
connectionString.AppendFormat("Host={0};", datasourceName);

}
if (m_serverInstance != null && m_serverInstance.Trim().Length > 0 && !hasKey(extra, "Server"))
if (m_serverInstance != null && m_serverInstance.Trim().Length > 0 && !HasKey(extra, "Server"))
{
connectionString.AppendFormat("Server={0};", m_serverInstance);

}
if (port != null && port.Trim().Length > 0 && !hasKey(extra, "Service"))
if (port != null && port.Trim().Length > 0 && !HasKey(extra, "Service"))
{
connectionString.AppendFormat("Service={0};", port);

Expand All @@ -172,7 +172,7 @@ protected override string BuildConnectionString(string datasourceName, string us
{
connectionString.AppendFormat(";User ID={0};Password={1}", userId, userPassword);
}
if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database"))
if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database"))
{
connectionString.AppendFormat(";Database={0}", databaseName);
}
Expand Down
6 changes: 3 additions & 3 deletions dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlConnector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,19 +110,19 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();

if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Server"))
if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Server"))
{
connectionString.AppendFormat("Server={0};", datasourceName);
}
if (port != null && port.Trim().Length > 0 && !hasKey(extra, "Port"))
if (port != null && port.Trim().Length > 0 && !HasKey(extra, "Port"))
{
connectionString.AppendFormat("Port={0};", port);
}
if (userId != null)
{
connectionString.AppendFormat(";User ID={0};Password={1}", userId, userPassword);
}
if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database"))
if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database"))
{
connectionString.AppendFormat(";Database={0}", databaseName);
}
Expand Down
6 changes: 3 additions & 3 deletions dotnet/src/dotnetframework/GxClasses/Data/GXDataMysqlDriverCS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ protected override string BuildConnectionString(string datasourceName, string us
string userPassword, string databaseName, string port, string schema, string extra)
{
StringBuilder connectionString = new StringBuilder();
if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Location"))
if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Location"))
{
connectionString.AppendFormat("Location={0};", datasourceName);
}
if (port != null && port.Trim().Length > 0 && !hasKey(extra, "Port"))
if (port != null && port.Trim().Length > 0 && !HasKey(extra, "Port"))
{
connectionString.AppendFormat("Port={0};", port);
}
if (userId != null)
{
connectionString.AppendFormat(";User ID={0};Password={1}", userId, userPassword);
}
if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Data Source"))
if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Data Source"))
{
connectionString.AppendFormat(";Data Source={0}", databaseName);
}
Expand Down
6 changes: 3 additions & 3 deletions dotnet/src/dotnetframework/GxClasses/Data/GXDataOracle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();

if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source"))
if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source"))
{
connectionString.AppendFormat("Data Source={0};", datasourceName);
}
Expand Down Expand Up @@ -618,7 +618,7 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();

if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source"))
if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source"))
{
connectionString.AppendFormat("Data Source={0};", datasourceName);
}
Expand Down Expand Up @@ -888,7 +888,7 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();

if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Data Source"))
if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Data Source"))
{
connectionString.AppendFormat("Data Source={0};", datasourceName);
}
Expand Down
6 changes: 3 additions & 3 deletions dotnet/src/dotnetframework/GxClasses/Data/GXDataPostgreSQL.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,19 +106,19 @@ protected override string BuildConnectionString(string datasourceName, string us
{
StringBuilder connectionString = new StringBuilder();

if (!string.IsNullOrEmpty(datasourceName) && !hasKey(extra, "Server"))
if (!string.IsNullOrEmpty(datasourceName) && !HasKey(extra, "Server"))
{
connectionString.AppendFormat("Server={0};", datasourceName);
}
if (port != null && port.Trim().Length > 0 && !hasKey(extra, "Port"))
if (port != null && port.Trim().Length > 0 && !HasKey(extra, "Port"))
{
connectionString.AppendFormat("Port={0};", port);
}
if (userId != null)
{
connectionString.AppendFormat(";User ID={0};Password={1}", userId, userPassword);
}
if (databaseName != null && databaseName.Trim().Length > 0 && !hasKey(extra, "Database"))
if (databaseName != null && databaseName.Trim().Length > 0 && !HasKey(extra, "Database"))
{
connectionString.AppendFormat(";Database={0}", databaseName);
}
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/extensions/mocking/src/MockDBAccess/GXMockDataRecord.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,9 @@ public override void PrepareCommand(IDbCommand cmd)
realDataRecord.PrepareCommand(cmd);
}

public override bool hasKey(string data, string key)
public override bool HasKey(string data, string key)
{
return realDataRecord.hasKey(data, key);
return realDataRecord.HasKey(data, key);
}

public override string ParseAdditionalData(string data, string extractWord)
Expand Down