run dotnet format
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Data;
 | 
			
		||||
using System.Data.Common;
 | 
			
		||||
using System.Threading;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Data;
 | 
			
		||||
using System.Threading;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
@@ -10,18 +10,18 @@ namespace PluralKit.Core
 | 
			
		||||
    public interface IPKConnection: IDbConnection, IAsyncDisposable
 | 
			
		||||
    {
 | 
			
		||||
        public Guid ConnectionId { get; }
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        public Task OpenAsync(CancellationToken cancellationToken = default);
 | 
			
		||||
        public Task CloseAsync();
 | 
			
		||||
 | 
			
		||||
        public Task ChangeDatabaseAsync(string databaseName, CancellationToken ct = default);
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        public ValueTask<IPKTransaction> BeginTransactionAsync(CancellationToken ct = default) => BeginTransactionAsync(IsolationLevel.Unspecified, ct);
 | 
			
		||||
        public ValueTask<IPKTransaction> BeginTransactionAsync(IsolationLevel level, CancellationToken ct = default);
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        public NpgsqlBinaryImporter BeginBinaryImport(string copyFromCommand);
 | 
			
		||||
        public NpgsqlBinaryExporter BeginBinaryExport(string copyToCommand);
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        [Obsolete] new void Open();
 | 
			
		||||
        [Obsolete] new void Close();
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Data;
 | 
			
		||||
using System.Threading;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
#nullable enable
 | 
			
		||||
#nullable enable
 | 
			
		||||
using System;
 | 
			
		||||
using System.Data;
 | 
			
		||||
using System.Data.Common;
 | 
			
		||||
@@ -19,11 +19,11 @@ namespace PluralKit.Core
 | 
			
		||||
    internal class PKCommand: DbCommand, IPKCommand
 | 
			
		||||
    {
 | 
			
		||||
        private NpgsqlCommand Inner { get; }
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        private readonly PKConnection _ourConnection;
 | 
			
		||||
        private readonly ILogger _logger;
 | 
			
		||||
        private readonly IMetrics _metrics;
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        public PKCommand(NpgsqlCommand inner, PKConnection ourConnection, ILogger logger, IMetrics metrics)
 | 
			
		||||
        {
 | 
			
		||||
            Inner = inner;
 | 
			
		||||
@@ -111,16 +111,16 @@ namespace PluralKit.Core
 | 
			
		||||
            {
 | 
			
		||||
                var end = SystemClock.Instance.GetCurrentInstant();
 | 
			
		||||
                var elapsed = end - start;
 | 
			
		||||
                
 | 
			
		||||
 | 
			
		||||
                _logger.Verbose("Executed query {Query} in {ElapsedTime} on connection {ConnectionId}", CommandText, elapsed, _ourConnection.ConnectionId);
 | 
			
		||||
                
 | 
			
		||||
 | 
			
		||||
                // One "BCL compatible tick" is 100 nanoseconds
 | 
			
		||||
                var micros = elapsed.BclCompatibleTicks / 10;
 | 
			
		||||
                _metrics.Provider.Timer.Instance(CoreMetrics.DatabaseQuery, new MetricTags("query", CommandText))
 | 
			
		||||
                    .Record(micros, TimeUnit.Microseconds, CommandText);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        private static Exception SyncError(string caller) => throw new Exception($"Executed synchronous IDbCommand function {caller}!");
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
#nullable enable
 | 
			
		||||
#nullable enable
 | 
			
		||||
using System;
 | 
			
		||||
using System.Data;
 | 
			
		||||
using System.Data.Common;
 | 
			
		||||
@@ -37,28 +37,28 @@ namespace PluralKit.Core
 | 
			
		||||
            _logger = logger.ForContext<PKConnection>();
 | 
			
		||||
            _metrics = metrics;
 | 
			
		||||
        }
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        public override Task OpenAsync(CancellationToken ct)
 | 
			
		||||
        {
 | 
			
		||||
            if (_hasOpened) return Inner.OpenAsync(ct);
 | 
			
		||||
            _countHolder.Increment();
 | 
			
		||||
            _hasOpened = true;
 | 
			
		||||
            _openTime = SystemClock.Instance.GetCurrentInstant();
 | 
			
		||||
            _logger.Verbose("Opened database connection {ConnectionId}, new connection count {ConnectionCount}", ConnectionId, _countHolder.ConnectionCount);       
 | 
			
		||||
            _logger.Verbose("Opened database connection {ConnectionId}, new connection count {ConnectionCount}", ConnectionId, _countHolder.ConnectionCount);
 | 
			
		||||
            return Inner.OpenAsync(ct);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public override Task CloseAsync() => Inner.CloseAsync();
 | 
			
		||||
 | 
			
		||||
        protected override DbCommand CreateDbCommand() => new PKCommand(Inner.CreateCommand(), this, _logger, _metrics);
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        public void ReloadTypes() => Inner.ReloadTypes();
 | 
			
		||||
 | 
			
		||||
        public new async ValueTask<IPKTransaction> BeginTransactionAsync(IsolationLevel level, CancellationToken ct = default) => new PKTransaction(await Inner.BeginTransactionAsync(level, ct));
 | 
			
		||||
 | 
			
		||||
        public NpgsqlBinaryImporter BeginBinaryImport(string copyFromCommand) => Inner.BeginBinaryImport(copyFromCommand);
 | 
			
		||||
        public NpgsqlBinaryExporter BeginBinaryExport(string copyToCommand) => Inner.BeginBinaryExport(copyToCommand);
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        public override void ChangeDatabase(string databaseName) => Inner.ChangeDatabase(databaseName);
 | 
			
		||||
        public override Task ChangeDatabaseAsync(string databaseName, CancellationToken ct = default) => Inner.ChangeDatabaseAsync(databaseName, ct);
 | 
			
		||||
        protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLevel) => throw SyncError(nameof(BeginDbTransaction));
 | 
			
		||||
@@ -85,12 +85,12 @@ namespace PluralKit.Core
 | 
			
		||||
        public override ConnectionState State => Inner.State;
 | 
			
		||||
        public override string DataSource => Inner.DataSource;
 | 
			
		||||
        public override string ServerVersion => Inner.ServerVersion;
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        protected override void Dispose(bool disposing)
 | 
			
		||||
        { 
 | 
			
		||||
        {
 | 
			
		||||
            Inner.Dispose();
 | 
			
		||||
            if (_hasClosed) return;
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
            LogClose();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@@ -100,12 +100,12 @@ namespace PluralKit.Core
 | 
			
		||||
            LogClose();
 | 
			
		||||
            return Inner.DisposeAsync();
 | 
			
		||||
        }
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        private void LogClose()
 | 
			
		||||
        {
 | 
			
		||||
            _countHolder.Decrement();
 | 
			
		||||
            _hasClosed = true;
 | 
			
		||||
            
 | 
			
		||||
 | 
			
		||||
            var duration = SystemClock.Instance.GetCurrentInstant() - _openTime;
 | 
			
		||||
            _logger.Verbose("Closed database connection {ConnectionId} (open for {ConnectionDuration}), new connection count {ConnectionCount}", ConnectionId, duration, _countHolder.ConnectionCount);
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Data;
 | 
			
		||||
using System.Data.Common;
 | 
			
		||||
using System.Threading;
 | 
			
		||||
@@ -11,7 +11,7 @@ namespace PluralKit.Core
 | 
			
		||||
    internal class PKTransaction: DbTransaction, IPKTransaction
 | 
			
		||||
    {
 | 
			
		||||
        public NpgsqlTransaction Inner { get; }
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        public PKTransaction(NpgsqlTransaction inner)
 | 
			
		||||
        {
 | 
			
		||||
            Inner = inner;
 | 
			
		||||
@@ -25,7 +25,7 @@ namespace PluralKit.Core
 | 
			
		||||
 | 
			
		||||
        protected override DbConnection DbConnection => Inner.Connection;
 | 
			
		||||
        public override IsolationLevel IsolationLevel => Inner.IsolationLevel;
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        private static Exception SyncError(string caller) => throw new Exception($"Executed synchronous IDbTransaction function {caller}!");
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user