Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/Core/Resolvers/DWSqlQueryBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,10 @@ public string BuildStoredProcedureResultDetailsQuery(string databaseObjectName)
public string BuildQueryToGetReadOnlyColumns(string schemaParamName, string tableParamName)
{
// For 'timestamp' columns sc.is_computed = 0.
string query = "SELECT ifsc.column_name from sys.columns as sc INNER JOIN INFORMATION_SCHEMA.COLUMNS as ifsc " +
"ON (sc.is_computed = 1 or ifsc.data_type = 'timestamp') " +
$"AND sc.object_id = object_id({schemaParamName}+'.'+{tableParamName}) and ifsc.table_name = {tableParamName} " +
$"AND ifsc.table_schema = {schemaParamName} and ifsc.column_name = sc.name;";
string query = "SELECT ifsc.COLUMN_NAME from sys.columns as sc INNER JOIN INFORMATION_SCHEMA.COLUMNS as ifsc " +
"ON (sc.is_computed = 1 or ifsc.DATA_TYPE = 'timestamp') " +
$"AND sc.object_id = object_id({schemaParamName}+'.'+{tableParamName}) AND ifsc.TABLE_SCHEMA = {schemaParamName} " +
$"AND ifsc.TABLE_NAME = {tableParamName} AND ifsc.COLUMN_NAME = sc.name;";

return query;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Core/Resolvers/MsSqlQueryBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -509,10 +509,10 @@ public string BuildStoredProcedureResultDetailsQuery(string databaseObjectName)
public string BuildQueryToGetReadOnlyColumns(string schemaParamName, string tableParamName)
{
// For 'timestamp' columns sc.is_computed = 0.
string query = "SELECT ifsc.column_name from sys.columns as sc INNER JOIN information_schema.columns as ifsc " +
"ON (sc.is_computed = 1 or ifsc.data_type = 'timestamp') " +
$"AND sc.object_id = object_id({schemaParamName}+'.'+{tableParamName}) and ifsc.table_name = {tableParamName} " +
$"AND ifsc.table_schema = {schemaParamName} and ifsc.column_name = sc.name;";
string query = "SELECT ifsc.COLUMN_NAME from sys.columns as sc INNER JOIN INFORMATION_SCHEMA.COLUMNS as ifsc " +
"ON (sc.is_computed = 1 or ifsc.DATA_TYPE = 'timestamp') " +
$"AND sc.object_id = object_id({schemaParamName}+'.'+{tableParamName}) AND ifsc.TABLE_SCHEMA = {schemaParamName} " +
$"AND ifsc.TABLE_NAME = {tableParamName} AND ifsc.COLUMN_NAME = sc.name;";

return query;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Core/Resolvers/MySqlQueryBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ private static string GetMySQLDefaultValue(ColumnDefinition column)
/// <inheritdoc/>
public string BuildQueryToGetReadOnlyColumns(string schemaParamName, string tableParamName)
{
string query = "select column_name as column_name from information_schema.columns " +
$"where table_schema = {schemaParamName} and table_name = {tableParamName} and generation_expression != '';";
string query = "select COLUMN_NAME as COLUMN_NAME from INFORMATION_SCHEMA.COLUMNS " +
$"where TABLE_SCHEMA = {schemaParamName} and TABLE_NAME = {tableParamName} and GENERATION_EXPRESSION != '';";
return query;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Core/Resolvers/PostgresQueryBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public string BuildStoredProcedureResultDetailsQuery(string databaseObjectName)
/// <inheritdoc/>
public string BuildQueryToGetReadOnlyColumns(string schemaParamName, string tableParamName)
{
string query = "SELECT attname AS column_name FROM pg_attribute " +
string query = $"SELECT attname AS {QuoteIdentifier("COLUMN_NAME")} FROM pg_attribute " +
$"WHERE attrelid = ({schemaParamName} || '.' || {tableParamName})::regclass AND attgenerated = 's';";
return query;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1841,7 +1841,7 @@ private async Task<List<string>>
foreach (DbResultSetRow readOnlyFieldRowWithProperties in readOnlyFieldRowsWithProperties.Rows)
{
Dictionary<string, object?> readOnlyFieldInfo = readOnlyFieldRowWithProperties.Columns;
string fieldName = (string)readOnlyFieldInfo["column_name"]!;
string fieldName = (string)readOnlyFieldInfo["COLUMN_NAME"]!;
readOnlyFields.Add(fieldName);
}

Expand Down