Skip to content

Commit 70803db

Browse files
SockworkOrangeSockworkOrange
authored
fix: removing NpgsqlTypeOverrides - relying on driver defaults when possible (#260)
1 parent 01a05c4 commit 70803db

5 files changed

Lines changed: 86 additions & 86 deletions

File tree

‎Drivers/NpgsqlDriver.cs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public NpgsqlDriver(
7878
["Guid"] = new(
7979
new()
8080
{
81-
{ "uuid", new(NpgsqlTypeOverride: "NpgsqlDbType.Uuid") }
81+
{ "uuid", new() }
8282
},
8383
readerFn: ordinal => $"reader.GetFieldValue<Guid>({ordinal})",
8484
readerArrayFn: ordinal => $"reader.GetFieldValue<Guid[]>({ordinal})"
@@ -96,8 +96,8 @@ public NpgsqlDriver(
9696
new()
9797
{
9898
{ "date", new(NpgsqlTypeOverride: "NpgsqlDbType.Date") },
99-
{ "timestamp", new(NpgsqlTypeOverride: "NpgsqlDbType.Timestamp") },
100-
{ "timestamptz", new(NpgsqlTypeOverride: "NpgsqlDbType.TimestampTz") }
99+
{ "timestamp", new() },
100+
{ "timestamptz", new() }
101101
},
102102
readerFn: ordinal => $"reader.GetDateTime({ordinal})",
103103
readerArrayFn: ordinal => $"reader.GetFieldValue<DateTime[]>({ordinal})"
@@ -123,35 +123,35 @@ public NpgsqlDriver(
123123
["short"] = new(
124124
new()
125125
{
126-
{ "int2", new(NpgsqlTypeOverride: "NpgsqlDbType.Smallint") }
126+
{ "int2", new() }
127127
},
128128
readerFn: ordinal => $"reader.GetInt16({ordinal})",
129129
readerArrayFn: ordinal => $"reader.GetFieldValue<short[]>({ordinal})"
130130
),
131131
["int"] = new(
132132
new()
133133
{
134-
{ "integer", new(NpgsqlTypeOverride: "NpgsqlDbType.Integer") },
135-
{ "int", new(NpgsqlTypeOverride: "NpgsqlDbType.Integer") },
136-
{ "int4", new(NpgsqlTypeOverride: "NpgsqlDbType.Integer") },
137-
{ "serial", new(NpgsqlTypeOverride: "NpgsqlDbType.Integer") }
134+
{ "integer", new() },
135+
{ "int", new() },
136+
{ "int4", new() },
137+
{ "serial", new() }
138138
},
139139
readerFn: ordinal => $"reader.GetInt32({ordinal})",
140140
readerArrayFn: ordinal => $"reader.GetFieldValue<int[]>({ordinal})"
141141
),
142142
["float"] = new(
143143
new()
144144
{
145-
{ "float4", new(NpgsqlTypeOverride: "NpgsqlDbType.Real") }
145+
{ "float4", new() }
146146
},
147147
readerFn: ordinal => $"reader.GetFloat({ordinal})",
148148
readerArrayFn: ordinal => $"reader.GetFieldValue<float[]>({ordinal})"
149149
),
150150
["decimal"] = new(
151151
new()
152152
{
153-
{ "numeric", new(NpgsqlTypeOverride: "NpgsqlDbType.Numeric") },
154-
{ "decimal", new(NpgsqlTypeOverride: "NpgsqlDbType.Numeric") },
153+
{ "numeric", new() },
154+
{ "decimal", new() },
155155
{ "money", new(NpgsqlTypeOverride: "NpgsqlDbType.Money") }
156156
},
157157
readerFn: ordinal => $"reader.GetDecimal({ordinal})",
@@ -160,7 +160,7 @@ public NpgsqlDriver(
160160
["double"] = new(
161161
new()
162162
{
163-
{ "float8", new(NpgsqlTypeOverride: "NpgsqlDbType.Double") }
163+
{ "float8", new() }
164164
},
165165
readerFn: ordinal => $"reader.GetDouble({ordinal})",
166166
readerArrayFn: ordinal => $"reader.GetFieldValue<double[]>({ordinal})"
@@ -177,7 +177,7 @@ public NpgsqlDriver(
177177
["NpgsqlPoint"] = new(
178178
new()
179179
{
180-
{ "point", new(NpgsqlTypeOverride: "NpgsqlDbType.Point") }
180+
{ "point", new() }
181181
},
182182
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlPoint>({ordinal})",
183183
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlPoint[]>({ordinal})",
@@ -187,7 +187,7 @@ public NpgsqlDriver(
187187
["NpgsqlLine"] = new(
188188
new()
189189
{
190-
{ "line", new(NpgsqlTypeOverride: "NpgsqlDbType.Line") }
190+
{ "line", new() }
191191
},
192192
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlLine>({ordinal})",
193193
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlLine[]>({ordinal})",
@@ -197,7 +197,7 @@ public NpgsqlDriver(
197197
["NpgsqlLSeg"] = new(
198198
new()
199199
{
200-
{ "lseg", new(NpgsqlTypeOverride: "NpgsqlDbType.LSeg") }
200+
{ "lseg", new() }
201201
},
202202
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlLSeg>({ordinal})",
203203
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlLSeg[]>({ordinal})",
@@ -207,7 +207,7 @@ public NpgsqlDriver(
207207
["NpgsqlBox"] = new(
208208
new()
209209
{
210-
{ "box", new(NpgsqlTypeOverride: "NpgsqlDbType.Box") }
210+
{ "box", new() }
211211
},
212212
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlBox>({ordinal})",
213213
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlBox[]>({ordinal})",
@@ -217,7 +217,7 @@ public NpgsqlDriver(
217217
["NpgsqlPath"] = new(
218218
new()
219219
{
220-
{ "path", new(NpgsqlTypeOverride: "NpgsqlDbType.Path") }
220+
{ "path", new() }
221221
},
222222
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlPath>({ordinal})",
223223
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlPath[]>({ordinal})",
@@ -227,7 +227,7 @@ public NpgsqlDriver(
227227
["NpgsqlPolygon"] = new(
228228
new()
229229
{
230-
{ "polygon", new(NpgsqlTypeOverride: "NpgsqlDbType.Polygon") }
230+
{ "polygon", new() }
231231
},
232232
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlPolygon>({ordinal})",
233233
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlPolygon[]>({ordinal})",
@@ -237,7 +237,7 @@ public NpgsqlDriver(
237237
["NpgsqlCircle"] = new(
238238
new()
239239
{
240-
{ "circle", new(NpgsqlTypeOverride: "NpgsqlDbType.Circle") }
240+
{ "circle", new() }
241241
},
242242
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlCircle>({ordinal})",
243243
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlCircle[]>({ordinal})",
@@ -247,7 +247,7 @@ public NpgsqlDriver(
247247
["NpgsqlCidr"] = new(
248248
new()
249249
{
250-
{ "cidr", new(NpgsqlTypeOverride: "NpgsqlDbType.Cidr") }
250+
{ "cidr", new() }
251251
},
252252
readerFn: ordinal => $"reader.GetFieldValue<NpgsqlCidr>({ordinal})",
253253
readerArrayFn: ordinal => $"reader.GetFieldValue<NpgsqlCidr[]>({ordinal})",
@@ -257,7 +257,7 @@ public NpgsqlDriver(
257257
["IPAddress"] = new(
258258
new()
259259
{
260-
{ "inet", new(NpgsqlTypeOverride: "NpgsqlDbType.Inet") }
260+
{ "inet", new() }
261261
},
262262
readerFn: ordinal => $"reader.GetFieldValue<IPAddress>({ordinal})",
263263
readerArrayFn: ordinal => $"reader.GetFieldValue<IPAddress[]>({ordinal})",
@@ -267,7 +267,7 @@ public NpgsqlDriver(
267267
["PhysicalAddress"] = new(
268268
new()
269269
{
270-
{ "macaddr", new(NpgsqlTypeOverride: "NpgsqlDbType.MacAddr") }
270+
{ "macaddr", new() }
271271
},
272272
readerFn: ordinal => $"reader.GetFieldValue<PhysicalAddress>({ordinal})",
273273
readerArrayFn: ordinal => $"reader.GetFieldValue<PhysicalAddress[]>({ordinal})",

‎examples/NpgsqlDapperExample/QuerySql.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -653,25 +653,25 @@ public async Task InsertPostgresTypesBatch(List<InsertPostgresTypesBatchArgs> ar
653653
{
654654
await writer.StartRowAsync();
655655
await writer.WriteAsync(row.CBoolean);
656-
await writer.WriteAsync(row.CSmallint, NpgsqlDbType.Smallint);
657-
await writer.WriteAsync(row.CInteger, NpgsqlDbType.Integer);
656+
await writer.WriteAsync(row.CSmallint);
657+
await writer.WriteAsync(row.CInteger);
658658
await writer.WriteAsync(row.CBigint);
659-
await writer.WriteAsync(row.CReal, NpgsqlDbType.Real);
660-
await writer.WriteAsync(row.CNumeric, NpgsqlDbType.Numeric);
661-
await writer.WriteAsync(row.CDecimal, NpgsqlDbType.Numeric);
662-
await writer.WriteAsync(row.CDoublePrecision, NpgsqlDbType.Double);
659+
await writer.WriteAsync(row.CReal);
660+
await writer.WriteAsync(row.CNumeric);
661+
await writer.WriteAsync(row.CDecimal);
662+
await writer.WriteAsync(row.CDoublePrecision);
663663
await writer.WriteAsync(row.CMoney, NpgsqlDbType.Money);
664664
await writer.WriteAsync(row.CDate, NpgsqlDbType.Date);
665665
await writer.WriteAsync(row.CTime, NpgsqlDbType.Time);
666-
await writer.WriteAsync(row.CTimestamp, NpgsqlDbType.Timestamp);
667-
await writer.WriteAsync(row.CTimestampWithTz, NpgsqlDbType.TimestampTz);
666+
await writer.WriteAsync(row.CTimestamp);
667+
await writer.WriteAsync(row.CTimestampWithTz);
668668
await writer.WriteAsync(row.CInterval, NpgsqlDbType.Interval);
669669
await writer.WriteAsync(row.CChar);
670670
await writer.WriteAsync(row.CVarchar);
671671
await writer.WriteAsync(row.CCharacterVarying);
672672
await writer.WriteAsync(row.CBpchar);
673673
await writer.WriteAsync(row.CText);
674-
await writer.WriteAsync(row.CUuid, NpgsqlDbType.Uuid);
674+
await writer.WriteAsync(row.CUuid);
675675
await writer.WriteAsync(row.CBytea);
676676
}
677677

@@ -872,13 +872,13 @@ public async Task InsertPostgresGeoTypesBatch(List<InsertPostgresGeoTypesBatchAr
872872
foreach (var row in args)
873873
{
874874
await writer.StartRowAsync();
875-
await writer.WriteAsync(row.CPoint, NpgsqlDbType.Point);
876-
await writer.WriteAsync(row.CLine, NpgsqlDbType.Line);
877-
await writer.WriteAsync(row.CLseg, NpgsqlDbType.LSeg);
878-
await writer.WriteAsync(row.CBox, NpgsqlDbType.Box);
879-
await writer.WriteAsync(row.CPath, NpgsqlDbType.Path);
880-
await writer.WriteAsync(row.CPolygon, NpgsqlDbType.Polygon);
881-
await writer.WriteAsync(row.CCircle, NpgsqlDbType.Circle);
875+
await writer.WriteAsync(row.CPoint);
876+
await writer.WriteAsync(row.CLine);
877+
await writer.WriteAsync(row.CLseg);
878+
await writer.WriteAsync(row.CBox);
879+
await writer.WriteAsync(row.CPath);
880+
await writer.WriteAsync(row.CPolygon);
881+
await writer.WriteAsync(row.CCircle);
882882
}
883883

884884
await writer.CompleteAsync();

‎examples/NpgsqlDapperLegacyExample/QuerySql.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -654,25 +654,25 @@ public async Task InsertPostgresTypesBatch(List<InsertPostgresTypesBatchArgs> ar
654654
{
655655
await writer.StartRowAsync();
656656
await writer.WriteAsync(row.CBoolean);
657-
await writer.WriteAsync(row.CSmallint, NpgsqlDbType.Smallint);
658-
await writer.WriteAsync(row.CInteger, NpgsqlDbType.Integer);
657+
await writer.WriteAsync(row.CSmallint);
658+
await writer.WriteAsync(row.CInteger);
659659
await writer.WriteAsync(row.CBigint);
660-
await writer.WriteAsync(row.CReal, NpgsqlDbType.Real);
661-
await writer.WriteAsync(row.CNumeric, NpgsqlDbType.Numeric);
662-
await writer.WriteAsync(row.CDecimal, NpgsqlDbType.Numeric);
663-
await writer.WriteAsync(row.CDoublePrecision, NpgsqlDbType.Double);
660+
await writer.WriteAsync(row.CReal);
661+
await writer.WriteAsync(row.CNumeric);
662+
await writer.WriteAsync(row.CDecimal);
663+
await writer.WriteAsync(row.CDoublePrecision);
664664
await writer.WriteAsync(row.CMoney, NpgsqlDbType.Money);
665665
await writer.WriteAsync(row.CDate, NpgsqlDbType.Date);
666666
await writer.WriteAsync(row.CTime, NpgsqlDbType.Time);
667-
await writer.WriteAsync(row.CTimestamp, NpgsqlDbType.Timestamp);
668-
await writer.WriteAsync(row.CTimestampWithTz, NpgsqlDbType.TimestampTz);
667+
await writer.WriteAsync(row.CTimestamp);
668+
await writer.WriteAsync(row.CTimestampWithTz);
669669
await writer.WriteAsync(row.CInterval, NpgsqlDbType.Interval);
670670
await writer.WriteAsync(row.CChar);
671671
await writer.WriteAsync(row.CVarchar);
672672
await writer.WriteAsync(row.CCharacterVarying);
673673
await writer.WriteAsync(row.CBpchar);
674674
await writer.WriteAsync(row.CText);
675-
await writer.WriteAsync(row.CUuid, NpgsqlDbType.Uuid);
675+
await writer.WriteAsync(row.CUuid);
676676
await writer.WriteAsync(row.CBytea);
677677
}
678678

@@ -873,13 +873,13 @@ public async Task InsertPostgresGeoTypesBatch(List<InsertPostgresGeoTypesBatchAr
873873
foreach (var row in args)
874874
{
875875
await writer.StartRowAsync();
876-
await writer.WriteAsync(row.CPoint, NpgsqlDbType.Point);
877-
await writer.WriteAsync(row.CLine, NpgsqlDbType.Line);
878-
await writer.WriteAsync(row.CLseg, NpgsqlDbType.LSeg);
879-
await writer.WriteAsync(row.CBox, NpgsqlDbType.Box);
880-
await writer.WriteAsync(row.CPath, NpgsqlDbType.Path);
881-
await writer.WriteAsync(row.CPolygon, NpgsqlDbType.Polygon);
882-
await writer.WriteAsync(row.CCircle, NpgsqlDbType.Circle);
876+
await writer.WriteAsync(row.CPoint);
877+
await writer.WriteAsync(row.CLine);
878+
await writer.WriteAsync(row.CLseg);
879+
await writer.WriteAsync(row.CBox);
880+
await writer.WriteAsync(row.CPath);
881+
await writer.WriteAsync(row.CPolygon);
882+
await writer.WriteAsync(row.CCircle);
883883
}
884884

885885
await writer.CompleteAsync();

‎examples/NpgsqlExample/QuerySql.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -763,25 +763,25 @@ public async Task InsertPostgresTypesBatch(List<InsertPostgresTypesBatchArgs> ar
763763
{
764764
await writer.StartRowAsync();
765765
await writer.WriteAsync(row.CBoolean ?? (object)DBNull.Value);
766-
await writer.WriteAsync(row.CSmallint ?? (object)DBNull.Value, NpgsqlDbType.Smallint);
767-
await writer.WriteAsync(row.CInteger ?? (object)DBNull.Value, NpgsqlDbType.Integer);
766+
await writer.WriteAsync(row.CSmallint ?? (object)DBNull.Value);
767+
await writer.WriteAsync(row.CInteger ?? (object)DBNull.Value);
768768
await writer.WriteAsync(row.CBigint ?? (object)DBNull.Value);
769-
await writer.WriteAsync(row.CReal ?? (object)DBNull.Value, NpgsqlDbType.Real);
770-
await writer.WriteAsync(row.CNumeric ?? (object)DBNull.Value, NpgsqlDbType.Numeric);
771-
await writer.WriteAsync(row.CDecimal ?? (object)DBNull.Value, NpgsqlDbType.Numeric);
772-
await writer.WriteAsync(row.CDoublePrecision ?? (object)DBNull.Value, NpgsqlDbType.Double);
769+
await writer.WriteAsync(row.CReal ?? (object)DBNull.Value);
770+
await writer.WriteAsync(row.CNumeric ?? (object)DBNull.Value);
771+
await writer.WriteAsync(row.CDecimal ?? (object)DBNull.Value);
772+
await writer.WriteAsync(row.CDoublePrecision ?? (object)DBNull.Value);
773773
await writer.WriteAsync(row.CMoney ?? (object)DBNull.Value, NpgsqlDbType.Money);
774774
await writer.WriteAsync(row.CDate ?? (object)DBNull.Value, NpgsqlDbType.Date);
775775
await writer.WriteAsync(row.CTime ?? (object)DBNull.Value, NpgsqlDbType.Time);
776-
await writer.WriteAsync(row.CTimestamp ?? (object)DBNull.Value, NpgsqlDbType.Timestamp);
777-
await writer.WriteAsync(row.CTimestampWithTz ?? (object)DBNull.Value, NpgsqlDbType.TimestampTz);
776+
await writer.WriteAsync(row.CTimestamp ?? (object)DBNull.Value);
777+
await writer.WriteAsync(row.CTimestampWithTz ?? (object)DBNull.Value);
778778
await writer.WriteAsync(row.CInterval ?? (object)DBNull.Value, NpgsqlDbType.Interval);
779779
await writer.WriteAsync(row.CChar ?? (object)DBNull.Value);
780780
await writer.WriteAsync(row.CVarchar ?? (object)DBNull.Value);
781781
await writer.WriteAsync(row.CCharacterVarying ?? (object)DBNull.Value);
782782
await writer.WriteAsync(row.CBpchar ?? (object)DBNull.Value);
783783
await writer.WriteAsync(row.CText ?? (object)DBNull.Value);
784-
await writer.WriteAsync(row.CUuid ?? (object)DBNull.Value, NpgsqlDbType.Uuid);
784+
await writer.WriteAsync(row.CUuid ?? (object)DBNull.Value);
785785
await writer.WriteAsync(row.CBytea ?? (object)DBNull.Value);
786786
}
787787

@@ -1114,13 +1114,13 @@ public async Task InsertPostgresGeoTypesBatch(List<InsertPostgresGeoTypesBatchAr
11141114
foreach (var row in args)
11151115
{
11161116
await writer.StartRowAsync();
1117-
await writer.WriteAsync(row.CPoint ?? (object)DBNull.Value, NpgsqlDbType.Point);
1118-
await writer.WriteAsync(row.CLine ?? (object)DBNull.Value, NpgsqlDbType.Line);
1119-
await writer.WriteAsync(row.CLseg ?? (object)DBNull.Value, NpgsqlDbType.LSeg);
1120-
await writer.WriteAsync(row.CBox ?? (object)DBNull.Value, NpgsqlDbType.Box);
1121-
await writer.WriteAsync(row.CPath ?? (object)DBNull.Value, NpgsqlDbType.Path);
1122-
await writer.WriteAsync(row.CPolygon ?? (object)DBNull.Value, NpgsqlDbType.Polygon);
1123-
await writer.WriteAsync(row.CCircle ?? (object)DBNull.Value, NpgsqlDbType.Circle);
1117+
await writer.WriteAsync(row.CPoint ?? (object)DBNull.Value);
1118+
await writer.WriteAsync(row.CLine ?? (object)DBNull.Value);
1119+
await writer.WriteAsync(row.CLseg ?? (object)DBNull.Value);
1120+
await writer.WriteAsync(row.CBox ?? (object)DBNull.Value);
1121+
await writer.WriteAsync(row.CPath ?? (object)DBNull.Value);
1122+
await writer.WriteAsync(row.CPolygon ?? (object)DBNull.Value);
1123+
await writer.WriteAsync(row.CCircle ?? (object)DBNull.Value);
11241124
}
11251125

11261126
await writer.CompleteAsync();

0 commit comments

Comments
 (0)