Skip to content

Commit af6f9c0

Browse files
authored
Upgrade Npgsql (#225)
1 parent b7a3374 commit af6f9c0

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
2626
<PackageVersion Include="MySql.Data" Version="8.0.30" />
2727
<PackageVersion Include="NLog" Version="4.5.0" />
28-
<PackageVersion Include="Npgsql" Version="4.1.3.1" />
28+
<PackageVersion Include="Npgsql" Version="8.0.2" />
2929
<PackageVersion Include="NUnit" Version="3.14.0" />
3030
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
3131
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="2.18.3" />

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Connection.cs

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ internal class Connection : SqlConnection
1818
{
1919
private NpgsqlConnection underlyingConnection;
2020
private NpgsqlTransaction activeTransaction;
21+
private bool activeTransactionIsCompleted;
2122

2223
/// <inheritdoc/>
2324
public override DbConnection UnderlyingConnection => underlyingConnection;
@@ -36,6 +37,7 @@ public override void BeginTransaction()
3637
EnsureIsNotDisposed();
3738
EnsureTransactionIsNotActive();
3839
activeTransaction = underlyingConnection.BeginTransaction();
40+
activeTransactionIsCompleted = false;
3941
}
4042

4143
/// <inheritdoc/>
@@ -45,6 +47,7 @@ public override void BeginTransaction(IsolationLevel isolationLevel)
4547
EnsureIsNotDisposed();
4648
EnsureTransactionIsNotActive();
4749
activeTransaction = underlyingConnection.BeginTransaction(SqlHelper.ReduceIsolationLevel(isolationLevel));
50+
activeTransactionIsCompleted = false;
4851
}
4952

5053
public override void Commit(bool rollbackOnFail = false)
@@ -56,6 +59,7 @@ public override void Commit(bool rollbackOnFail = false)
5659
if (!IsTransactionCompleted()) {
5760
ActiveTransaction.Commit();
5861
}
62+
activeTransactionIsCompleted = true;
5963
}
6064
catch when (rollbackOnFail) {
6165
ActiveTransaction.Rollback();
@@ -75,6 +79,7 @@ public override async Task CommitAsync(bool rollbackOnFail = false, Cancellation
7579
if (!IsTransactionCompleted()) {
7680
await ActiveTransaction.CommitAsync(token).ConfigureAwait(false);
7781
}
82+
activeTransactionIsCompleted = true;
7883
}
7984
catch when (rollbackOnFail) {
8085
await ActiveTransaction.RollbackAsync(token).ConfigureAwaitFalse();;
@@ -194,7 +199,7 @@ private async Task ExecuteNonQueryAsync(string commandText, CancellationToken to
194199

195200
private bool IsTransactionCompleted()
196201
{
197-
return activeTransaction != null && activeTransaction.IsCompleted;
202+
return activeTransaction != null && activeTransactionIsCompleted;
198203
}
199204

200205
// Constructors
@@ -206,4 +211,4 @@ public Connection(SqlDriver driver)
206211
underlyingConnection = new NpgsqlConnection();
207212
}
208213
}
209-
}
214+
}

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/DriverFactory.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ protected override string BuildConnectionString(UrlInfo url)
4444
builder.Username = url.User;
4545
builder.Password = url.Password;
4646
}
47-
else {
48-
builder.IntegratedSecurity = true;
49-
}
5047

5148
// custom options
5249
foreach (var param in url.Params) {
@@ -193,4 +190,4 @@ await SqlHelper.NotifyConnectionInitializingAsync(accessors,
193190
}
194191
}
195192
}
196-
}
193+
}

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v8_0/TypeMapper.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public override void BindTimeSpan(DbParameter parameter, object value)
114114
var nativeParameter = (NpgsqlParameter) parameter;
115115
nativeParameter.NpgsqlDbType = NpgsqlDbType.Interval;
116116
nativeParameter.Value = value != null
117-
? (object) new NpgsqlTimeSpan((TimeSpan) value)
117+
? (object) (TimeSpan) value
118118
: DBNull.Value;
119119
}
120120

@@ -181,7 +181,7 @@ public override Guid ReadGuid(DbDataReader reader, int index)
181181
public override TimeSpan ReadTimeSpan(DbDataReader reader, int index)
182182
{
183183
var nativeReader = (NpgsqlDataReader) reader;
184-
return (TimeSpan) nativeReader.GetInterval(index);
184+
return nativeReader.GetTimeSpan(index);
185185
}
186186

187187
public override decimal ReadDecimal(DbDataReader reader, int index)

0 commit comments

Comments
 (0)