thatdogmachine
diff --git a/‎NpgsqlRest/NpgsqlRestMiddlewareExtensions.cs‎
Lines changed: 33 additions & 23 deletions b/‎NpgsqlRest/NpgsqlRestMiddlewareExtensions.cs‎
Lines changed: 33 additions & 23 deletions
diff --git a/‎NpgsqlRest/NpgsqlRestParameter.cs‎
Lines changed: 7 additions & 0 deletions b/‎NpgsqlRest/NpgsqlRestParameter.cs‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎NpgsqlRestClient/NpgsqlRestClient.csproj‎
Lines changed: 7 additions & 0 deletions b/‎NpgsqlRestClient/NpgsqlRestClient.csproj‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎plugins/NpgsqlRest.HttpFiles/HttpFile.cs‎
Lines changed: 2 additions & 2 deletions b/‎plugins/NpgsqlRest.HttpFiles/HttpFile.cs‎
Lines changed: 2 additions & 2 deletions
@@ -285,19 +285,22 @@ public static IApplicationBuilder UseNpgsqlRest(this IApplicationBuilder builder
                         )
                     )
                     {
+                        var bodyParameter = parameter.NpgsqlResMemberwiseClone();
                         if (body is null)
                         {
-                            parameter.ParamType = ParamType.BodyParam;
-                            parameter.Value = DBNull.Value;
+                            bodyParameter.ParamType = ParamType.BodyParam;
+                            bodyParameter.Value = DBNull.Value;
                             hasNulls = true;
-                            paramsList.Add(parameter);
+                            paramsList.Add(bodyParameter);
                         }
                         else
                         {
                             StringValues bodyStringValues = body;
-                            if (TryParseParameter(parameter, ref bodyStringValues, endpoint.QueryStringNullHandling))
+                            if (TryParseParameter(bodyParameter, ref bodyStringValues, endpoint.QueryStringNullHandling))
                             {
-                                paramsList.Add(parameter);
+                                bodyParameter.ParamType = ParamType.BodyParam;
+                                hasNulls = false;
+                                paramsList.Add(bodyParameter);
                             }
                         }
                         continue;
@@ -319,9 +322,10 @@ parameter.TypeDescriptor.HasDefault is true &&
                             {
                                 SearializeHeader();
                             }
-                            parameter.ParamType = ParamType.HeaderParam;
-                            parameter.Value = headers;
-                            paramsList.Add(parameter);
+                            var headerParameter = parameter.NpgsqlResMemberwiseClone();
+                            headerParameter.ParamType = ParamType.HeaderParam;
+                            headerParameter.Value = headers;
+                            paramsList.Add(headerParameter);
                             continue;
                         }
                     }
@@ -335,19 +339,23 @@ parameter.TypeDescriptor.HasDefault is true &&
                         }
                         continue;
                     }
-                    if (TryParseParameter(parameter, ref qsValue, endpoint.QueryStringNullHandling) is false)
+
+                    var queryParemeter = parameter.NpgsqlResMemberwiseClone();
+                    if (TryParseParameter(queryParemeter, ref qsValue, endpoint.QueryStringNullHandling) is false)
                     {
-                        if (parameter.TypeDescriptor.HasDefault is false)
+                        if (queryParemeter.TypeDescriptor.HasDefault is false)
                         {
                             await next(context);
                             return;
                         }
                         continue;
                     }
-                    parameter.ParamType = ParamType.QueryString;
-                    parameter.QueryStringValues = qsValue;
-                    paramsList.Add(parameter);
-                    if (hasNulls is false && parameter.Value == DBNull.Value)
+
+                    queryParemeter.ParamType = ParamType.QueryString;
+                    queryParemeter.QueryStringValues = qsValue;
+                    paramsList.Add(queryParemeter);
+
+                    if (hasNulls is false && queryParemeter.Value == DBNull.Value)
                     {
                         hasNulls = true;
                     }
@@ -401,9 +409,10 @@ parameter.TypeDescriptor.HasDefault is true &&
                             {
                                 SearializeHeader();
                             }
-                            parameter.ParamType = ParamType.HeaderParam;
-                            parameter.Value = headers;
-                            paramsList.Add(parameter);
+                            var headerParameter = parameter.NpgsqlResMemberwiseClone();
+                            headerParameter.ParamType = ParamType.HeaderParam;
+                            headerParameter.Value = headers;
+                            paramsList.Add(headerParameter);
                             continue;
                         }
                     }
@@ -417,19 +426,20 @@ parameter.TypeDescriptor.HasDefault is true &&
                         }
                         continue;
                     }
-                    if (TryParseParameter(parameter, ref value) is false)
+                    var bodyParameter = parameter.NpgsqlResMemberwiseClone();
+                    if (TryParseParameter(bodyParameter, ref value) is false)
                     {
-                        if (parameter.TypeDescriptor.HasDefault is false)
+                        if (bodyParameter.TypeDescriptor.HasDefault is false)
                         {
                             await next(context);
                             return;
                         }
                         continue;
                     }
-                    parameter.ParamType = ParamType.BodyJson;
-                    parameter.JsonBodyNode = value;
-                    paramsList.Add(parameter);
-                    if (hasNulls is false && parameter.Value == DBNull.Value)
+                    bodyParameter.ParamType = ParamType.BodyJson;
+                    bodyParameter.JsonBodyNode = value;
+                    paramsList.Add(bodyParameter);
+                    if (hasNulls is false && bodyParameter.Value == DBNull.Value)
                     {
                         hasNulls = true;
                     }
 
@@ -13,4 +13,11 @@ public class NpgsqlRestParameter : NpgsqlParameter
     public StringValues? QueryStringValues { get; set; } = null;
     public JsonNode? JsonBodyNode { get; set; } = null;
     public TypeDescriptor TypeDescriptor { get; init; } = default!;
+
+    public NpgsqlRestParameter NpgsqlResMemberwiseClone()
+    {
+#pragma warning disable CS8603 // Possible null reference return.
+        return MemberwiseClone() as NpgsqlRestParameter;
+#pragma warning restore CS8603 // Possible null reference return.
+    }
 }
@@ -11,6 +11,13 @@
     <Version>2.5.0</Version>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="src\http\**" />
+    <Content Remove="src\http\**" />
+    <EmbeddedResource Remove="src\http\**" />
+    <None Remove="src\http\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
     <PackageReference Include="System.Text.Json" Version="9.0.0" />
 
@@ -121,9 +121,9 @@ public void Handle(Routine routine, RoutineEndpoint endpoint)
                         var value = SampleValueUnquoted(i, descriptor);
                         if (descriptor.IsArray)
                         {
-                            return string.Join("&", value.Split(',').Select(v => $"{p}={Uri.EscapeDataString(v)}"));
+                            return string.Join("&", value.Split(',').Select(v => $"{p.ConvertedName}={Uri.EscapeDataString(v)}"));
                         }
-                        return $"{p}={Uri.EscapeDataString(value)}";
+                        return $"{p.ConvertedName}={Uri.EscapeDataString(value)}";
                     })));
 
             sb.AppendLine(line.EndsWith('?') ? line[..^1] : line);
Original file line number	Diff line number	Diff line change
`@@ -285,19 +285,22 @@ public static IApplicationBuilder UseNpgsqlRest(this IApplicationBuilder builder`
`285`	`285`	`)`
`286`	`286`	`)`
`287`	`287`	`{`
	`288`	`+ var bodyParameter = parameter.NpgsqlResMemberwiseClone();`
`288`	`289`	`if (body is null)`
`289`	`290`	`{`
`290`		`- parameter.ParamType = ParamType.BodyParam;`
`291`		`- parameter.Value = DBNull.Value;`
	`291`	`+ bodyParameter.ParamType = ParamType.BodyParam;`
	`292`	`+ bodyParameter.Value = DBNull.Value;`
`292`	`293`	`hasNulls = true;`
`293`		`- paramsList.Add(parameter);`
	`294`	`+ paramsList.Add(bodyParameter);`
`294`	`295`	`}`
`295`	`296`	`else`
`296`	`297`	`{`
`297`	`298`	`StringValues bodyStringValues = body;`
`298`		`- if (TryParseParameter(parameter, ref bodyStringValues, endpoint.QueryStringNullHandling))`
	`299`	`+ if (TryParseParameter(bodyParameter, ref bodyStringValues, endpoint.QueryStringNullHandling))`
`299`	`300`	`{`
`300`		`- paramsList.Add(parameter);`
	`301`	`+ bodyParameter.ParamType = ParamType.BodyParam;`
	`302`	`+ hasNulls = false;`
	`303`	`+ paramsList.Add(bodyParameter);`
`301`	`304`	`}`
`302`	`305`	`}`
`303`	`306`	`continue;`
`@@ -319,9 +322,10 @@ parameter.TypeDescriptor.HasDefault is true &&`
`319`	`322`	`{`
`320`	`323`	`SearializeHeader();`
`321`	`324`	`}`
`322`		`- parameter.ParamType = ParamType.HeaderParam;`
`323`		`- parameter.Value = headers;`
`324`		`- paramsList.Add(parameter);`
	`325`	`+ var headerParameter = parameter.NpgsqlResMemberwiseClone();`
	`326`	`+ headerParameter.ParamType = ParamType.HeaderParam;`
	`327`	`+ headerParameter.Value = headers;`
	`328`	`+ paramsList.Add(headerParameter);`
`325`	`329`	`continue;`
`326`	`330`	`}`
`327`	`331`	`}`
`@@ -335,19 +339,23 @@ parameter.TypeDescriptor.HasDefault is true &&`
`335`	`339`	`}`
`336`	`340`	`continue;`
`337`	`341`	`}`
`338`		`- if (TryParseParameter(parameter, ref qsValue, endpoint.QueryStringNullHandling) is false)`
	`342`	`+`
	`343`	`+ var queryParemeter = parameter.NpgsqlResMemberwiseClone();`
	`344`	`+ if (TryParseParameter(queryParemeter, ref qsValue, endpoint.QueryStringNullHandling) is false)`
`339`	`345`	`{`
`340`		`- if (parameter.TypeDescriptor.HasDefault is false)`
	`346`	`+ if (queryParemeter.TypeDescriptor.HasDefault is false)`
`341`	`347`	`{`
`342`	`348`	`await next(context);`
`343`	`349`	`return;`
`344`	`350`	`}`
`345`	`351`	`continue;`
`346`	`352`	`}`
`347`		`- parameter.ParamType = ParamType.QueryString;`
`348`		`- parameter.QueryStringValues = qsValue;`
`349`		`- paramsList.Add(parameter);`
`350`		`- if (hasNulls is false && parameter.Value == DBNull.Value)`
	`353`	`+`
	`354`	`+ queryParemeter.ParamType = ParamType.QueryString;`
	`355`	`+ queryParemeter.QueryStringValues = qsValue;`
	`356`	`+ paramsList.Add(queryParemeter);`
	`357`	`+`
	`358`	`+ if (hasNulls is false && queryParemeter.Value == DBNull.Value)`
`351`	`359`	`{`
`352`	`360`	`hasNulls = true;`
`353`	`361`	`}`
`@@ -401,9 +409,10 @@ parameter.TypeDescriptor.HasDefault is true &&`
`401`	`409`	`{`
`402`	`410`	`SearializeHeader();`
`403`	`411`	`}`
`404`		`- parameter.ParamType = ParamType.HeaderParam;`
`405`		`- parameter.Value = headers;`
`406`		`- paramsList.Add(parameter);`
	`412`	`+ var headerParameter = parameter.NpgsqlResMemberwiseClone();`
	`413`	`+ headerParameter.ParamType = ParamType.HeaderParam;`
	`414`	`+ headerParameter.Value = headers;`
	`415`	`+ paramsList.Add(headerParameter);`
`407`	`416`	`continue;`
`408`	`417`	`}`
`409`	`418`	`}`
`@@ -417,19 +426,20 @@ parameter.TypeDescriptor.HasDefault is true &&`
`417`	`426`	`}`
`418`	`427`	`continue;`
`419`	`428`	`}`
`420`		`- if (TryParseParameter(parameter, ref value) is false)`
	`429`	`+ var bodyParameter = parameter.NpgsqlResMemberwiseClone();`
	`430`	`+ if (TryParseParameter(bodyParameter, ref value) is false)`
`421`	`431`	`{`
`422`		`- if (parameter.TypeDescriptor.HasDefault is false)`
	`432`	`+ if (bodyParameter.TypeDescriptor.HasDefault is false)`
`423`	`433`	`{`
`424`	`434`	`await next(context);`
`425`	`435`	`return;`
`426`	`436`	`}`
`427`	`437`	`continue;`
`428`	`438`	`}`
`429`		`- parameter.ParamType = ParamType.BodyJson;`
`430`		`- parameter.JsonBodyNode = value;`
`431`		`- paramsList.Add(parameter);`
`432`		`- if (hasNulls is false && parameter.Value == DBNull.Value)`
	`439`	`+ bodyParameter.ParamType = ParamType.BodyJson;`
	`440`	`+ bodyParameter.JsonBodyNode = value;`
	`441`	`+ paramsList.Add(bodyParameter);`
	`442`	`+ if (hasNulls is false && bodyParameter.Value == DBNull.Value)`
`433`	`443`	`{`
`434`	`444`	`hasNulls = true;`
`435`	`445`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,9 @@ public void Handle(Routine routine, RoutineEndpoint endpoint)`
`121`	`121`	`var value = SampleValueUnquoted(i, descriptor);`
`122`	`122`	`if (descriptor.IsArray)`
`123`	`123`	`{`
`124`		`- return string.Join("&", value.Split(',').Select(v => $"{p}={Uri.EscapeDataString(v)}"));`
	`124`	`+ return string.Join("&", value.Split(',').Select(v => $"{p.ConvertedName}={Uri.EscapeDataString(v)}"));`
`125`	`125`	`}`
`126`		`- return $"{p}={Uri.EscapeDataString(value)}";`
	`126`	`+ return $"{p.ConvertedName}={Uri.EscapeDataString(value)}";`
`127`	`127`	`})));`
`128`	`128`
`129`	`129`	`sb.AppendLine(line.EndsWith('?') ? line[..^1] : line);`