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
44 changes: 22 additions & 22 deletions Drivers/NpgsqlDriver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public NpgsqlDriver(
["Guid"] = new(
new()
{
{ "uuid", new(NpgsqlTypeOverride: "NpgsqlDbType.Uuid") }
{ "uuid", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<Guid>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<Guid[]>({ordinal})"
Expand All @@ -96,8 +96,8 @@ public NpgsqlDriver(
new()
{
{ "date", new(NpgsqlTypeOverride: "NpgsqlDbType.Date") },
{ "timestamp", new(NpgsqlTypeOverride: "NpgsqlDbType.Timestamp") },
{ "timestamptz", new(NpgsqlTypeOverride: "NpgsqlDbType.TimestampTz") }
{ "timestamp", new() },
{ "timestamptz", new() }
},
readerFn: ordinal => $"reader.GetDateTime({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<DateTime[]>({ordinal})"
Expand All @@ -123,35 +123,35 @@ public NpgsqlDriver(
["short"] = new(
new()
{
{ "int2", new(NpgsqlTypeOverride: "NpgsqlDbType.Smallint") }
{ "int2", new() }
},
readerFn: ordinal => $"reader.GetInt16({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<short[]>({ordinal})"
),
["int"] = new(
new()
{
{ "integer", new(NpgsqlTypeOverride: "NpgsqlDbType.Integer") },
{ "int", new(NpgsqlTypeOverride: "NpgsqlDbType.Integer") },
{ "int4", new(NpgsqlTypeOverride: "NpgsqlDbType.Integer") },
{ "serial", new(NpgsqlTypeOverride: "NpgsqlDbType.Integer") }
{ "integer", new() },
{ "int", new() },
{ "int4", new() },
{ "serial", new() }
},
readerFn: ordinal => $"reader.GetInt32({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<int[]>({ordinal})"
),
["float"] = new(
new()
{
{ "float4", new(NpgsqlTypeOverride: "NpgsqlDbType.Real") }
{ "float4", new() }
},
readerFn: ordinal => $"reader.GetFloat({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<float[]>({ordinal})"
),
["decimal"] = new(
new()
{
{ "numeric", new(NpgsqlTypeOverride: "NpgsqlDbType.Numeric") },
{ "decimal", new(NpgsqlTypeOverride: "NpgsqlDbType.Numeric") },
{ "numeric", new() },
{ "decimal", new() },
{ "money", new(NpgsqlTypeOverride: "NpgsqlDbType.Money") }
},
readerFn: ordinal => $"reader.GetDecimal({ordinal})",
Expand All @@ -160,7 +160,7 @@ public NpgsqlDriver(
["double"] = new(
new()
{
{ "float8", new(NpgsqlTypeOverride: "NpgsqlDbType.Double") }
{ "float8", new() }
},
readerFn: ordinal => $"reader.GetDouble({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<double[]>({ordinal})"
Expand All @@ -177,7 +177,7 @@ public NpgsqlDriver(
["NpgsqlPoint"] = new(
new()
{
{ "point", new(NpgsqlTypeOverride: "NpgsqlDbType.Point") }
{ "point", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlPoint>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlPoint[]>({ordinal})",
Expand All @@ -187,7 +187,7 @@ public NpgsqlDriver(
["NpgsqlLine"] = new(
new()
{
{ "line", new(NpgsqlTypeOverride: "NpgsqlDbType.Line") }
{ "line", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlLine>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlLine[]>({ordinal})",
Expand All @@ -197,7 +197,7 @@ public NpgsqlDriver(
["NpgsqlLSeg"] = new(
new()
{
{ "lseg", new(NpgsqlTypeOverride: "NpgsqlDbType.LSeg") }
{ "lseg", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlLSeg>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlLSeg[]>({ordinal})",
Expand All @@ -207,7 +207,7 @@ public NpgsqlDriver(
["NpgsqlBox"] = new(
new()
{
{ "box", new(NpgsqlTypeOverride: "NpgsqlDbType.Box") }
{ "box", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlBox>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlBox[]>({ordinal})",
Expand All @@ -217,7 +217,7 @@ public NpgsqlDriver(
["NpgsqlPath"] = new(
new()
{
{ "path", new(NpgsqlTypeOverride: "NpgsqlDbType.Path") }
{ "path", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlPath>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlPath[]>({ordinal})",
Expand All @@ -227,7 +227,7 @@ public NpgsqlDriver(
["NpgsqlPolygon"] = new(
new()
{
{ "polygon", new(NpgsqlTypeOverride: "NpgsqlDbType.Polygon") }
{ "polygon", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlPolygon>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlPolygon[]>({ordinal})",
Expand All @@ -237,7 +237,7 @@ public NpgsqlDriver(
["NpgsqlCircle"] = new(
new()
{
{ "circle", new(NpgsqlTypeOverride: "NpgsqlDbType.Circle") }
{ "circle", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlCircle>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlCircle[]>({ordinal})",
Expand All @@ -247,7 +247,7 @@ public NpgsqlDriver(
["NpgsqlCidr"] = new(
new()
{
{ "cidr", new(NpgsqlTypeOverride: "NpgsqlDbType.Cidr") }
{ "cidr", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlCidr>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlCidr[]>({ordinal})",
Expand All @@ -257,7 +257,7 @@ public NpgsqlDriver(
["IPAddress"] = new(
new()
{
{ "inet", new(NpgsqlTypeOverride: "NpgsqlDbType.Inet") }
{ "inet", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<IPAddress>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<IPAddress[]>({ordinal})",
Expand All @@ -267,7 +267,7 @@ public NpgsqlDriver(
["PhysicalAddress"] = new(
new()
{
{ "macaddr", new(NpgsqlTypeOverride: "NpgsqlDbType.MacAddr") }
{ "macaddr", new() }
},
readerFn: ordinal => $"reader.GetFieldValue<PhysicalAddress>({ordinal})",
readerArrayFn: ordinal => $"reader.GetFieldValue<PhysicalAddress[]>({ordinal})",
Expand Down
32 changes: 16 additions & 16 deletions examples/NpgsqlDapperExample/QuerySql.cs
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 402 in examples/NpgsqlDapperExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(ListAllAuthorsBooksSql))
{
Expand Down Expand Up @@ -440,7 +440,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 443 in examples/NpgsqlDapperExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(GetDuplicateAuthorsSql))
{
Expand Down Expand Up @@ -487,7 +487,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 490 in examples/NpgsqlDapperExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(GetAuthorsByBookNameSql))
{
Expand Down Expand Up @@ -653,25 +653,25 @@
{
await writer.StartRowAsync();
await writer.WriteAsync(row.CBoolean);
await writer.WriteAsync(row.CSmallint, NpgsqlDbType.Smallint);
await writer.WriteAsync(row.CInteger, NpgsqlDbType.Integer);
await writer.WriteAsync(row.CSmallint);
await writer.WriteAsync(row.CInteger);
await writer.WriteAsync(row.CBigint);
await writer.WriteAsync(row.CReal, NpgsqlDbType.Real);
await writer.WriteAsync(row.CNumeric, NpgsqlDbType.Numeric);
await writer.WriteAsync(row.CDecimal, NpgsqlDbType.Numeric);
await writer.WriteAsync(row.CDoublePrecision, NpgsqlDbType.Double);
await writer.WriteAsync(row.CReal);
await writer.WriteAsync(row.CNumeric);
await writer.WriteAsync(row.CDecimal);
await writer.WriteAsync(row.CDoublePrecision);
await writer.WriteAsync(row.CMoney, NpgsqlDbType.Money);
await writer.WriteAsync(row.CDate, NpgsqlDbType.Date);
await writer.WriteAsync(row.CTime, NpgsqlDbType.Time);
await writer.WriteAsync(row.CTimestamp, NpgsqlDbType.Timestamp);
await writer.WriteAsync(row.CTimestampWithTz, NpgsqlDbType.TimestampTz);
await writer.WriteAsync(row.CTimestamp);
await writer.WriteAsync(row.CTimestampWithTz);
await writer.WriteAsync(row.CInterval, NpgsqlDbType.Interval);
await writer.WriteAsync(row.CChar);
await writer.WriteAsync(row.CVarchar);
await writer.WriteAsync(row.CCharacterVarying);
await writer.WriteAsync(row.CBpchar);
await writer.WriteAsync(row.CText);
await writer.WriteAsync(row.CUuid, NpgsqlDbType.Uuid);
await writer.WriteAsync(row.CUuid);
await writer.WriteAsync(row.CBytea);
}

Expand Down Expand Up @@ -872,13 +872,13 @@
foreach (var row in args)
{
await writer.StartRowAsync();
await writer.WriteAsync(row.CPoint, NpgsqlDbType.Point);
await writer.WriteAsync(row.CLine, NpgsqlDbType.Line);
await writer.WriteAsync(row.CLseg, NpgsqlDbType.LSeg);
await writer.WriteAsync(row.CBox, NpgsqlDbType.Box);
await writer.WriteAsync(row.CPath, NpgsqlDbType.Path);
await writer.WriteAsync(row.CPolygon, NpgsqlDbType.Polygon);
await writer.WriteAsync(row.CCircle, NpgsqlDbType.Circle);
await writer.WriteAsync(row.CPoint);
await writer.WriteAsync(row.CLine);
await writer.WriteAsync(row.CLseg);
await writer.WriteAsync(row.CBox);
await writer.WriteAsync(row.CPath);
await writer.WriteAsync(row.CPolygon);
await writer.WriteAsync(row.CCircle);
}

await writer.CompleteAsync();
Expand Down
32 changes: 16 additions & 16 deletions examples/NpgsqlDapperLegacyExample/QuerySql.cs
Original file line number Diff line number Diff line change
Expand Up @@ -654,25 +654,25 @@ public async Task InsertPostgresTypesBatch(List<InsertPostgresTypesBatchArgs> ar
{
await writer.StartRowAsync();
await writer.WriteAsync(row.CBoolean);
await writer.WriteAsync(row.CSmallint, NpgsqlDbType.Smallint);
await writer.WriteAsync(row.CInteger, NpgsqlDbType.Integer);
await writer.WriteAsync(row.CSmallint);
await writer.WriteAsync(row.CInteger);
await writer.WriteAsync(row.CBigint);
await writer.WriteAsync(row.CReal, NpgsqlDbType.Real);
await writer.WriteAsync(row.CNumeric, NpgsqlDbType.Numeric);
await writer.WriteAsync(row.CDecimal, NpgsqlDbType.Numeric);
await writer.WriteAsync(row.CDoublePrecision, NpgsqlDbType.Double);
await writer.WriteAsync(row.CReal);
await writer.WriteAsync(row.CNumeric);
await writer.WriteAsync(row.CDecimal);
await writer.WriteAsync(row.CDoublePrecision);
await writer.WriteAsync(row.CMoney, NpgsqlDbType.Money);
await writer.WriteAsync(row.CDate, NpgsqlDbType.Date);
await writer.WriteAsync(row.CTime, NpgsqlDbType.Time);
await writer.WriteAsync(row.CTimestamp, NpgsqlDbType.Timestamp);
await writer.WriteAsync(row.CTimestampWithTz, NpgsqlDbType.TimestampTz);
await writer.WriteAsync(row.CTimestamp);
await writer.WriteAsync(row.CTimestampWithTz);
await writer.WriteAsync(row.CInterval, NpgsqlDbType.Interval);
await writer.WriteAsync(row.CChar);
await writer.WriteAsync(row.CVarchar);
await writer.WriteAsync(row.CCharacterVarying);
await writer.WriteAsync(row.CBpchar);
await writer.WriteAsync(row.CText);
await writer.WriteAsync(row.CUuid, NpgsqlDbType.Uuid);
await writer.WriteAsync(row.CUuid);
await writer.WriteAsync(row.CBytea);
}

Expand Down Expand Up @@ -873,13 +873,13 @@ public async Task InsertPostgresGeoTypesBatch(List<InsertPostgresGeoTypesBatchAr
foreach (var row in args)
{
await writer.StartRowAsync();
await writer.WriteAsync(row.CPoint, NpgsqlDbType.Point);
await writer.WriteAsync(row.CLine, NpgsqlDbType.Line);
await writer.WriteAsync(row.CLseg, NpgsqlDbType.LSeg);
await writer.WriteAsync(row.CBox, NpgsqlDbType.Box);
await writer.WriteAsync(row.CPath, NpgsqlDbType.Path);
await writer.WriteAsync(row.CPolygon, NpgsqlDbType.Polygon);
await writer.WriteAsync(row.CCircle, NpgsqlDbType.Circle);
await writer.WriteAsync(row.CPoint);
await writer.WriteAsync(row.CLine);
await writer.WriteAsync(row.CLseg);
await writer.WriteAsync(row.CBox);
await writer.WriteAsync(row.CPath);
await writer.WriteAsync(row.CPolygon);
await writer.WriteAsync(row.CCircle);
}

await writer.CompleteAsync();
Expand Down
32 changes: 16 additions & 16 deletions examples/NpgsqlExample/QuerySql.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 49 in examples/NpgsqlExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(GetAuthorSql))
{
Expand Down Expand Up @@ -102,7 +102,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 105 in examples/NpgsqlExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(ListAuthorsSql))
{
Expand Down Expand Up @@ -140,7 +140,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 143 in examples/NpgsqlExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(CreateAuthorSql))
{
Expand Down Expand Up @@ -201,7 +201,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 204 in examples/NpgsqlExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(CreateAuthorReturnIdSql))
{
Expand Down Expand Up @@ -236,7 +236,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 239 in examples/NpgsqlExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(GetAuthorByIdSql))
{
Expand Down Expand Up @@ -293,7 +293,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 296 in examples/NpgsqlExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(GetAuthorByNamePatternSql))
{
Expand Down Expand Up @@ -332,7 +332,7 @@
{
if (this.Transaction == null)
{
using (var connection = NpgsqlDataSource.Create(ConnectionString))

Check warning on line 335 in examples/NpgsqlExample/QuerySql.cs

View workflow job for this annotation

GitHub Actions / End-to-End Tests

Possible null reference argument for parameter 'connectionString' in 'NpgsqlDataSource NpgsqlDataSource.Create(string connectionString)'.
{
using (var command = connection.CreateCommand(DeleteAuthorSql))
{
Expand Down Expand Up @@ -763,25 +763,25 @@
{
await writer.StartRowAsync();
await writer.WriteAsync(row.CBoolean ?? (object)DBNull.Value);
await writer.WriteAsync(row.CSmallint ?? (object)DBNull.Value, NpgsqlDbType.Smallint);
await writer.WriteAsync(row.CInteger ?? (object)DBNull.Value, NpgsqlDbType.Integer);
await writer.WriteAsync(row.CSmallint ?? (object)DBNull.Value);
await writer.WriteAsync(row.CInteger ?? (object)DBNull.Value);
await writer.WriteAsync(row.CBigint ?? (object)DBNull.Value);
await writer.WriteAsync(row.CReal ?? (object)DBNull.Value, NpgsqlDbType.Real);
await writer.WriteAsync(row.CNumeric ?? (object)DBNull.Value, NpgsqlDbType.Numeric);
await writer.WriteAsync(row.CDecimal ?? (object)DBNull.Value, NpgsqlDbType.Numeric);
await writer.WriteAsync(row.CDoublePrecision ?? (object)DBNull.Value, NpgsqlDbType.Double);
await writer.WriteAsync(row.CReal ?? (object)DBNull.Value);
await writer.WriteAsync(row.CNumeric ?? (object)DBNull.Value);
await writer.WriteAsync(row.CDecimal ?? (object)DBNull.Value);
await writer.WriteAsync(row.CDoublePrecision ?? (object)DBNull.Value);
await writer.WriteAsync(row.CMoney ?? (object)DBNull.Value, NpgsqlDbType.Money);
await writer.WriteAsync(row.CDate ?? (object)DBNull.Value, NpgsqlDbType.Date);
await writer.WriteAsync(row.CTime ?? (object)DBNull.Value, NpgsqlDbType.Time);
await writer.WriteAsync(row.CTimestamp ?? (object)DBNull.Value, NpgsqlDbType.Timestamp);
await writer.WriteAsync(row.CTimestampWithTz ?? (object)DBNull.Value, NpgsqlDbType.TimestampTz);
await writer.WriteAsync(row.CTimestamp ?? (object)DBNull.Value);
await writer.WriteAsync(row.CTimestampWithTz ?? (object)DBNull.Value);
await writer.WriteAsync(row.CInterval ?? (object)DBNull.Value, NpgsqlDbType.Interval);
await writer.WriteAsync(row.CChar ?? (object)DBNull.Value);
await writer.WriteAsync(row.CVarchar ?? (object)DBNull.Value);
await writer.WriteAsync(row.CCharacterVarying ?? (object)DBNull.Value);
await writer.WriteAsync(row.CBpchar ?? (object)DBNull.Value);
await writer.WriteAsync(row.CText ?? (object)DBNull.Value);
await writer.WriteAsync(row.CUuid ?? (object)DBNull.Value, NpgsqlDbType.Uuid);
await writer.WriteAsync(row.CUuid ?? (object)DBNull.Value);
await writer.WriteAsync(row.CBytea ?? (object)DBNull.Value);
}

Expand Down Expand Up @@ -1114,13 +1114,13 @@
foreach (var row in args)
{
await writer.StartRowAsync();
await writer.WriteAsync(row.CPoint ?? (object)DBNull.Value, NpgsqlDbType.Point);
await writer.WriteAsync(row.CLine ?? (object)DBNull.Value, NpgsqlDbType.Line);
await writer.WriteAsync(row.CLseg ?? (object)DBNull.Value, NpgsqlDbType.LSeg);
await writer.WriteAsync(row.CBox ?? (object)DBNull.Value, NpgsqlDbType.Box);
await writer.WriteAsync(row.CPath ?? (object)DBNull.Value, NpgsqlDbType.Path);
await writer.WriteAsync(row.CPolygon ?? (object)DBNull.Value, NpgsqlDbType.Polygon);
await writer.WriteAsync(row.CCircle ?? (object)DBNull.Value, NpgsqlDbType.Circle);
await writer.WriteAsync(row.CPoint ?? (object)DBNull.Value);
await writer.WriteAsync(row.CLine ?? (object)DBNull.Value);
await writer.WriteAsync(row.CLseg ?? (object)DBNull.Value);
await writer.WriteAsync(row.CBox ?? (object)DBNull.Value);
await writer.WriteAsync(row.CPath ?? (object)DBNull.Value);
await writer.WriteAsync(row.CPolygon ?? (object)DBNull.Value);
await writer.WriteAsync(row.CCircle ?? (object)DBNull.Value);
}

await writer.CompleteAsync();
Expand Down
Loading