Refactor parameter processing to reduce duplication etc. (#4333)

roji · web-flow · commit 5c8d80b017d2 · 2022-02-16T14:58:48.000+01:00
diff --git a/src/Npgsql/NpgsqlCommand.cs b/src/Npgsql/NpgsqlCommand.cs
@@ -633,15 +633,7 @@ Task Prepare(bool async, CancellationToken cancellationToken = default)
         {
             foreach (var batchCommand in InternalBatchCommands)
             {
-                batchCommand.Parameters.HasOutputParameters = false;
-                batchCommand.Parameters.PlaceholderType = PlaceholderType.NoParameters;
-
-                foreach (var p in batchCommand.Parameters.InternalList)
-                {
-                    batchCommand.Parameters.CalculatePlaceholderType(p);
-                    p.Bind(connector.TypeMapper);
-                }
-
+                batchCommand.Parameters.ProcessParameters(connector.TypeMapper, validate: false);
                 ProcessRawQuery(connector.SqlQueryParser, connector.UseConformingStrings, batchCommand);
 
                 needToPrepare = batchCommand.ExplicitPrepare(connector) || needToPrepare;
@@ -652,15 +644,7 @@ Task Prepare(bool async, CancellationToken cancellationToken = default)
         }
         else
         {
-            Parameters.HasOutputParameters = false;
-            Parameters.PlaceholderType = PlaceholderType.NoParameters;
-
-            foreach (var p in Parameters.InternalList)
-            {
-                Parameters.CalculatePlaceholderType(p);
-                p.Bind(connector.TypeMapper);
-            }
-
+            Parameters.ProcessParameters(connector.TypeMapper, validate: false);
             ProcessRawQuery(connector.SqlQueryParser, connector.UseConformingStrings, batchCommand: null);
 
             foreach (var batchCommand in InternalBatchCommands)
@@ -1335,9 +1319,9 @@ internal async ValueTask<NpgsqlDataReader> ExecuteReader(CommandBehavior behavio
 
                         if (IsWrappedByBatch)
                             foreach (var batchCommand in InternalBatchCommands)
-                                batchCommand.Parameters.ValidateAndBind(connector.TypeMapper);
+                                batchCommand.Parameters.ProcessParameters(connector.TypeMapper, validate: true);
                         else
-                            Parameters.ValidateAndBind(connector.TypeMapper);
+                            Parameters.ProcessParameters(connector.TypeMapper, validate: true);
 
                         NpgsqlEventSource.Log.CommandStartPrepared();
                         break;
@@ -1351,7 +1335,7 @@ internal async ValueTask<NpgsqlDataReader> ExecuteReader(CommandBehavior behavio
                             {
                                 var batchCommand = InternalBatchCommands[i];
 
-                                batchCommand.Parameters.ValidateAndBind(connector.TypeMapper);
+                                batchCommand.Parameters.ProcessParameters(connector.TypeMapper, validate: true);
                                 ProcessRawQuery(connector.SqlQueryParser, connector.UseConformingStrings, batchCommand);
 
                                 if (connector.Settings.MaxAutoPrepare > 0 && batchCommand.TryAutoPrepare(connector))
@@ -1360,7 +1344,7 @@ internal async ValueTask<NpgsqlDataReader> ExecuteReader(CommandBehavior behavio
                         }
                         else
                         {
-                            Parameters.ValidateAndBind(connector.TypeMapper);
+                            Parameters.ProcessParameters(connector.TypeMapper, validate: true);
                             ProcessRawQuery(connector.SqlQueryParser, connector.UseConformingStrings, batchCommand: null);
 
                             if (connector.Settings.MaxAutoPrepare > 0)
@@ -1452,13 +1436,13 @@ internal async ValueTask<NpgsqlDataReader> ExecuteReader(CommandBehavior behavio
                 {
                     foreach (var batchCommand in InternalBatchCommands)
                     {
-                        batchCommand.Parameters.ValidateAndBind(pool.MultiplexingTypeMapper!);
+                        batchCommand.Parameters.ProcessParameters(pool.MultiplexingTypeMapper!, validate: true);
                         ProcessRawQuery(null, standardConformingStrings: true, batchCommand);
                     }
                 }
                 else
                 {
-                    Parameters.ValidateAndBind(pool.MultiplexingTypeMapper!);
+                    Parameters.ProcessParameters(pool.MultiplexingTypeMapper!, validate: true);
                     ProcessRawQuery(null, standardConformingStrings: true, batchCommand: null);
                 }
 
diff --git a/src/Npgsql/NpgsqlParameterCollection.cs b/src/Npgsql/NpgsqlParameterCollection.cs
@@ -680,7 +680,7 @@ internal void CloneTo(NpgsqlParameterCollection other)
         }
     }
 
-    internal void ValidateAndBind(ConnectorTypeMapper typeMapper)
+    internal void ProcessParameters(ConnectorTypeMapper typeMapper, bool validate)
     {
         HasOutputParameters = false;
         PlaceholderType = PlaceholderType.NoParameters;
@@ -689,7 +689,25 @@ internal void ValidateAndBind(ConnectorTypeMapper typeMapper)
         {
             var p = InternalList[i];
 
-            CalculatePlaceholderType(p);
+            switch (PlaceholderType)
+            {
+            case PlaceholderType.NoParameters:
+                PlaceholderType = p.IsPositional ? PlaceholderType.Positional : PlaceholderType.Named;
+                break;
+            case PlaceholderType.Named:
+                if (p.IsPositional)
+                    PlaceholderType = PlaceholderType.Mixed;
+                break;
+            case PlaceholderType.Positional:
+                if (!p.IsPositional)
+                    PlaceholderType = PlaceholderType.Mixed;
+                break;
+            case PlaceholderType.Mixed:
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(
+                    nameof(PlaceholderType), $"Unknown {nameof(PlaceholderType)} value: {PlaceholderType}");
+            }
 
             switch (p.Direction)
             {
@@ -718,53 +736,11 @@ internal void ValidateAndBind(ConnectorTypeMapper typeMapper)
             }
 
             p.Bind(typeMapper);
-            p.LengthCache?.Clear();
-            p.ValidateAndGetLength();
-        }
-    }
-
-    internal void CalculatePlaceholderType(NpgsqlParameter p)
-    {
-        if (p.IsPositional)
-        {
-            switch (PlaceholderType)
-            {
-            case PlaceholderType.NoParameters:
-                PlaceholderType = PlaceholderType.Positional;
-                break;
-
-            case PlaceholderType.Named:
-                PlaceholderType = PlaceholderType.Mixed;
-                break;
 
-            case PlaceholderType.Positional:
-            case PlaceholderType.Mixed:
-                break;
-
-            default:
-                throw new ArgumentOutOfRangeException(
-                    nameof(PlaceholderType), $"Unknown {nameof(PlaceholderType)} value: {PlaceholderType}");
-            }
-        }
-        else
-        {
-            switch (PlaceholderType)
+            if (validate)
             {
-            case PlaceholderType.NoParameters:
-                PlaceholderType = PlaceholderType.Named;
-                break;
-
-            case PlaceholderType.Positional:
-                PlaceholderType = PlaceholderType.Mixed;
-                break;
-
-            case PlaceholderType.Named:
-            case PlaceholderType.Mixed:
-                break;
-
-            default:
-                throw new ArgumentOutOfRangeException(
-                    nameof(PlaceholderType), $"Unknown {nameof(PlaceholderType)} value: {PlaceholderType}");
+                p.LengthCache?.Clear();
+                p.ValidateAndGetLength();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -633,15 +633,7 @@ Task Prepare(bool async, CancellationToken cancellationToken = default)`
`633`	`633`	`{`
`634`	`634`	`foreach (var batchCommand in InternalBatchCommands)`
`635`	`635`	`{`
`636`		`- batchCommand.Parameters.HasOutputParameters = false;`
`637`		`- batchCommand.Parameters.PlaceholderType = PlaceholderType.NoParameters;`
`638`		`-`
`639`		`- foreach (var p in batchCommand.Parameters.InternalList)`
`640`		`- {`
`641`		`- batchCommand.Parameters.CalculatePlaceholderType(p);`
`642`		`- p.Bind(connector.TypeMapper);`
`643`		`- }`
`644`		`-`
	`636`	`+ batchCommand.Parameters.ProcessParameters(connector.TypeMapper, validate: false);`
`645`	`637`	`ProcessRawQuery(connector.SqlQueryParser, connector.UseConformingStrings, batchCommand);`
`646`	`638`
`647`	`639`	`needToPrepare = batchCommand.ExplicitPrepare(connector) \|\| needToPrepare;`
`@@ -652,15 +644,7 @@ Task Prepare(bool async, CancellationToken cancellationToken = default)`
`652`	`644`	`}`
`653`	`645`	`else`
`654`	`646`	`{`
`655`		`- Parameters.HasOutputParameters = false;`
`656`		`- Parameters.PlaceholderType = PlaceholderType.NoParameters;`
`657`		`-`
`658`		`- foreach (var p in Parameters.InternalList)`
`659`		`- {`
`660`		`- Parameters.CalculatePlaceholderType(p);`
`661`		`- p.Bind(connector.TypeMapper);`
`662`		`- }`
`663`		`-`
	`647`	`+ Parameters.ProcessParameters(connector.TypeMapper, validate: false);`
`664`	`648`	`ProcessRawQuery(connector.SqlQueryParser, connector.UseConformingStrings, batchCommand: null);`
`665`	`649`
`666`	`650`	`foreach (var batchCommand in InternalBatchCommands)`
`@@ -1335,9 +1319,9 @@ internal async ValueTask<NpgsqlDataReader> ExecuteReader(CommandBehavior behavio`
`1335`	`1319`
`1336`	`1320`	`if (IsWrappedByBatch)`
`1337`	`1321`	`foreach (var batchCommand in InternalBatchCommands)`
`1338`		`- batchCommand.Parameters.ValidateAndBind(connector.TypeMapper);`
	`1322`	`+ batchCommand.Parameters.ProcessParameters(connector.TypeMapper, validate: true);`
`1339`	`1323`	`else`
`1340`		`- Parameters.ValidateAndBind(connector.TypeMapper);`
	`1324`	`+ Parameters.ProcessParameters(connector.TypeMapper, validate: true);`
`1341`	`1325`
`1342`	`1326`	`NpgsqlEventSource.Log.CommandStartPrepared();`
`1343`	`1327`	`break;`
`@@ -1351,7 +1335,7 @@ internal async ValueTask<NpgsqlDataReader> ExecuteReader(CommandBehavior behavio`
`1351`	`1335`	`{`
`1352`	`1336`	`var batchCommand = InternalBatchCommands[i];`
`1353`	`1337`
`1354`		`- batchCommand.Parameters.ValidateAndBind(connector.TypeMapper);`
	`1338`	`+ batchCommand.Parameters.ProcessParameters(connector.TypeMapper, validate: true);`
`1355`	`1339`	`ProcessRawQuery(connector.SqlQueryParser, connector.UseConformingStrings, batchCommand);`
`1356`	`1340`
`1357`	`1341`	`if (connector.Settings.MaxAutoPrepare > 0 && batchCommand.TryAutoPrepare(connector))`
`@@ -1360,7 +1344,7 @@ internal async ValueTask<NpgsqlDataReader> ExecuteReader(CommandBehavior behavio`
`1360`	`1344`	`}`
`1361`	`1345`	`else`
`1362`	`1346`	`{`
`1363`		`- Parameters.ValidateAndBind(connector.TypeMapper);`
	`1347`	`+ Parameters.ProcessParameters(connector.TypeMapper, validate: true);`
`1364`	`1348`	`ProcessRawQuery(connector.SqlQueryParser, connector.UseConformingStrings, batchCommand: null);`
`1365`	`1349`
`1366`	`1350`	`if (connector.Settings.MaxAutoPrepare > 0)`
`@@ -1452,13 +1436,13 @@ internal async ValueTask<NpgsqlDataReader> ExecuteReader(CommandBehavior behavio`
`1452`	`1436`	`{`
`1453`	`1437`	`foreach (var batchCommand in InternalBatchCommands)`
`1454`	`1438`	`{`
`1455`		`- batchCommand.Parameters.ValidateAndBind(pool.MultiplexingTypeMapper!);`
	`1439`	`+ batchCommand.Parameters.ProcessParameters(pool.MultiplexingTypeMapper!, validate: true);`
`1456`	`1440`	`ProcessRawQuery(null, standardConformingStrings: true, batchCommand);`
`1457`	`1441`	`}`
`1458`	`1442`	`}`
`1459`	`1443`	`else`
`1460`	`1444`	`{`
`1461`		`- Parameters.ValidateAndBind(pool.MultiplexingTypeMapper!);`
	`1445`	`+ Parameters.ProcessParameters(pool.MultiplexingTypeMapper!, validate: true);`
`1462`	`1446`	`ProcessRawQuery(null, standardConformingStrings: true, batchCommand: null);`
`1463`	`1447`	`}`
`1464`	`1448`