Skip to content

V10: Fix build warnings umbraco.persistence #12502

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
Zeegaan merged 7 commits into from
Jun 20, 2022
Merged

V10: Fix build warnings umbraco.persistence #12502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e582bec
Run code cleanup
May 30, 2022
6fe4fcf
Run dotnet format
May 30, 2022
f930a98
Manual cleanup
May 30, 2022
de17586
Fix [..] to substring
May 30, 2022
4e50f6e
Merge branch 'v10/dev' into v10/bugfix/fix-build-warnings_Umbraco.Per…
Zeegaan Jun 14, 2022
1516688
Fix after merge
Zeegaan Jun 14, 2022
ce6418e
Update src/Umbraco.Cms.Persistence.SqlServer/Services/SqlServerBulkSq…
Zeegaan Jun 14, 2022
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
4 changes: 2 additions & 2 deletions src/Umbraco.Cms.Persistence.SqlServer/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
namespace Umbraco.Cms.Persistence.SqlServer;

/// <summary>
/// Constants related to SQLite.
/// Constants related to SQLite.
/// </summary>
public static class Constants
{
/// <summary>
/// SQLite provider name.
/// SQLite provider name.
/// </summary>
public const string ProviderName = "Microsoft.Data.SqlClient";
}
31 changes: 15 additions & 16 deletions src/Umbraco.Cms.Persistence.SqlServer/Dtos/ColumnInSchemaDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
using NPoco;

namespace Umbraco.Cms.Persistence.SqlServer.Dtos
namespace Umbraco.Cms.Persistence.SqlServer.Dtos;

internal class ColumnInSchemaDto
{
internal class ColumnInSchemaDto
{
[Column("TABLE_NAME")]
public string TableName { get; set; } = null!;
[Column("TABLE_NAME")]
public string TableName { get; set; } = null!;

[Column("COLUMN_NAME")]
public string ColumnName { get; set; } = null!;
[Column("COLUMN_NAME")]
public string ColumnName { get; set; } = null!;

[Column("ORDINAL_POSITION")]
public int OrdinalPosition { get; set; }
[Column("ORDINAL_POSITION")]
public int OrdinalPosition { get; set; }

[Column("COLUMN_DEFAULT")]
public string ColumnDefault { get; set; } = null!;
[Column("COLUMN_DEFAULT")]
public string ColumnDefault { get; set; } = null!;

[Column("IS_NULLABLE")]
public string IsNullable { get; set; } = null!;
[Column("IS_NULLABLE")]
public string IsNullable { get; set; } = null!;

[Column("DATA_TYPE")]
public string DataType { get; set; } = null!;
}
[Column("DATA_TYPE")]
public string DataType { get; set; } = null!;
}
19 changes: 9 additions & 10 deletions src/Umbraco.Cms.Persistence.SqlServer/Dtos/ConstraintPerColumnDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
using NPoco;

namespace Umbraco.Cms.Persistence.SqlServer.Dtos
namespace Umbraco.Cms.Persistence.SqlServer.Dtos;

internal class ConstraintPerColumnDto
{
internal class ConstraintPerColumnDto
{
[Column("TABLE_NAME")]
public string TableName { get; set; } = null!;
[Column("TABLE_NAME")]
public string TableName { get; set; } = null!;

[Column("COLUMN_NAME")]
public string ColumnName { get; set; } = null!;
[Column("COLUMN_NAME")]
public string ColumnName { get; set; } = null!;

[Column("CONSTRAINT_NAME")]
public string ConstraintName { get; set; } = null!;
}
[Column("CONSTRAINT_NAME")]
public string ConstraintName { get; set; } = null!;
}
15 changes: 7 additions & 8 deletions src/Umbraco.Cms.Persistence.SqlServer/Dtos/ConstraintPerTableDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
using NPoco;

namespace Umbraco.Cms.Persistence.SqlServer.Dtos
namespace Umbraco.Cms.Persistence.SqlServer.Dtos;

internal class ConstraintPerTableDto
{
internal class ConstraintPerTableDto
{
[Column("TABLE_NAME")]
public string TableName { get; set; } = null!;
[Column("TABLE_NAME")]
public string TableName { get; set; } = null!;

[Column("CONSTRAINT_NAME")]
public string ConstraintName { get; set; } = null!;
}
[Column("CONSTRAINT_NAME")]
public string ConstraintName { get; set; } = null!;
}
22 changes: 11 additions & 11 deletions src/Umbraco.Cms.Persistence.SqlServer/Dtos/DefaultConstraintPerColumnDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
using NPoco;

namespace Umbraco.Cms.Persistence.SqlServer.Dtos
namespace Umbraco.Cms.Persistence.SqlServer.Dtos;

internal class DefaultConstraintPerColumnDto
{
internal class DefaultConstraintPerColumnDto
{
[Column("TABLE_NAME")] public string TableName { get; set; } = null!;
[Column("TABLE_NAME")]
public string TableName { get; set; } = null!;

[Column("COLUMN_NAME")]
public string ColumnName { get; set; } = null!;
[Column("COLUMN_NAME")]
public string ColumnName { get; set; } = null!;

[Column("NAME")]
public string Name { get; set; } = null!;
[Column("NAME")]
public string Name { get; set; } = null!;

[Column("DEFINITION")]
public string Definition { get; set; } = null!;
}
[Column("DEFINITION")]
public string Definition { get; set; } = null!;
}
24 changes: 11 additions & 13 deletions src/Umbraco.Cms.Persistence.SqlServer/Dtos/DefinedIndexDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
using NPoco;

namespace Umbraco.Cms.Persistence.SqlServer.Dtos
{
internal class DefinedIndexDto
{
namespace Umbraco.Cms.Persistence.SqlServer.Dtos;

[Column("TABLE_NAME")]
public string TableName { get; set; } = null!;
internal class DefinedIndexDto
{
[Column("TABLE_NAME")]
public string TableName { get; set; } = null!;

[Column("INDEX_NAME")]
public string IndexName { get; set; } = null!;
[Column("INDEX_NAME")]
public string IndexName { get; set; } = null!;

[Column("COLUMN_NAME")]
public string ColumnName { get; set; } = null!;
[Column("COLUMN_NAME")]
public string ColumnName { get; set; } = null!;

[Column("UNIQUE")]
public short Unique { get; set; }
}
[Column("UNIQUE")]
public short Unique { get; set; }
}
3 changes: 2 additions & 1 deletion src/Umbraco.Cms.Persistence.SqlServer/Interceptors/SqlServerAddMiniProfilerInterceptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using System.Data.Common;
using NPoco;
using StackExchange.Profiling;
using StackExchange.Profiling.Data;

namespace Umbraco.Cms.Persistence.SqlServer.Interceptors;

public class SqlServerAddMiniProfilerInterceptor : SqlServerConnectionInterceptor
{
public override DbConnection OnConnectionOpened(IDatabase database, DbConnection conn)
=> new StackExchange.Profiling.Data.ProfiledDbConnection(conn, MiniProfiler.Current);
=> new ProfiledDbConnection(conn, MiniProfiler.Current);
}
8 changes: 6 additions & 2 deletions src/Umbraco.Cms.Persistence.SqlServer/Interceptors/SqlServerAddRetryPolicyInterceptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ public override DbConnection OnConnectionOpened(IDatabase database, DbConnection
return conn;
}

RetryPolicy? connectionRetryPolicy = RetryPolicyFactory.GetDefaultSqlConnectionRetryPolicyByConnectionString(_connectionStrings.CurrentValue.ConnectionString);
RetryPolicy? commandRetryPolicy = RetryPolicyFactory.GetDefaultSqlCommandRetryPolicyByConnectionString(_connectionStrings.CurrentValue.ConnectionString);
RetryPolicy? connectionRetryPolicy =
RetryPolicyFactory.GetDefaultSqlConnectionRetryPolicyByConnectionString(_connectionStrings.CurrentValue
.ConnectionString);
RetryPolicy? commandRetryPolicy =
RetryPolicyFactory.GetDefaultSqlCommandRetryPolicyByConnectionString(_connectionStrings.CurrentValue
.ConnectionString);

if (connectionRetryPolicy == null && commandRetryPolicy == null)
{
Expand Down
Loading