Skip to content
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

Jump to bottom

FIX: building UpsertType SQL command for PostgreSQL. #1590

Merged
merged 3 commits into from May 24, 2023
Merged

FIX: building UpsertType SQL command for PostgreSQL. #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
beb5d4b
FIX: Create Foreign key wizard ignored AllowNull field (#1560)
JiriPrajz May 15, 2023
db221df
FIX: Upsert key SQL for Postgre is incorrect (#1586)
JiriPrajz May 22, 2023
9c20a2a
Merge branch '2022.4' of github.com:origam/origam into upsertPostgres…
JiriPrajz May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/Origam.DA.Service/Generators/AbstractSqlCommandGenerator.cs
View file
Open in desktop
Expand Up @@ -1409,9 +1409,9 @@ public string UpsertSql(DataStructure ds, DataStructureEntity entity)
keysBuilder.Append(", ");
searchPredicatesBuilder.Append(" AND ");
}
keysBuilder.AppendFormat("{0} as {1}",
keysBuilder.AppendFormat(RenderUpsertKey(
paramName,
fieldName);
fieldName));
searchPredicatesBuilder.AppendFormat("{0}.{1} = src.{1}",
tableName, fieldName);
keys++;
Expand Down Expand Up @@ -1445,7 +1445,6 @@ public string UpsertSql(DataStructure ds, DataStructureEntity entity)
insertValuesBuilder));
return sqlExpression.ToString();
}

internal abstract string MergeSql(string tableName, StringBuilder keysBuilder, StringBuilder searchPredicatesBuilder, StringBuilder updateBuilder, StringBuilder insertColumnsBuilder, StringBuilder insertValuesBuilder);

public string InsertSql(DataStructure ds, DataStructureEntity entity)
Expand Down Expand Up @@ -4043,6 +4042,7 @@ var placeholderElements
}
return output;
}
protected abstract string RenderUpsertKey(string paramName, string fieldName);
#endregion

#region Operators
Expand Down
4 changes: 4 additions & 0 deletions backend/Origam.DA.Service/Generators/MsSqlCommandGenerator.cs
View file
Open in desktop
Expand Up @@ -469,5 +469,9 @@ protected override string SqlPrimaryIndex()
{
return " PRIMARY KEY NONCLUSTERED";
}
protected override string RenderUpsertKey(string paramName, string fieldName)
{
return string.Format("{0} as {1}", paramName, fieldName);
}
}
}
6 changes: 5 additions & 1 deletion backend/Origam.DA.Service/Generators/PgSqlCommandGenerator.cs
View file
Open in desktop
Expand Up @@ -230,7 +230,7 @@ internal override string MergeSql(string tableName, StringBuilder keysBuilder, S
{
StringBuilder sqlExpression = new StringBuilder();
return sqlExpression.AppendFormat(
"INSERT INTO {0} ({1}) VALUES ({2}) ON CONFLICT {3} DO UPDATE SET {4};",
"INSERT INTO {0} ({1}) VALUES ({2}) ON CONFLICT ({3}) DO UPDATE SET {4};",
tableName,
insertColumnsBuilder,
insertValuesBuilder,
Expand Down Expand Up @@ -415,5 +415,9 @@ protected override string SqlPrimaryIndex()
return " PRIMARY KEY";

}
protected override string RenderUpsertKey(string paramName, string fieldName)
{
return fieldName;
}
}
}