Merge pull request #17 from henrik-m/fix-crash-on-functions-with-defaults

Fix crash on functions with defaults

Author: fknx

DynamicLinqPadPostgreSqlDriver.Tests/DynamicAssemblyGeneration/InputParameterTestData.cs

@@ -0,0 +1,19 @@
+namespace DynamicLinqPadPostgreSqlDriver.Tests.DynamicAssemblyGeneration
+{
+   /// <summary>
+   /// Test data for testing different signatures on pgsql functions
+   /// </summary>
+   public class InputParameterTestData
+   {
+      public string Name { get; }
+      public string PgSqlType { get; }
+      public object Default { get; }
+
+      public InputParameterTestData(string name, string pgSqlType, object defaultValue = null)
+      {
+         Name = name;
+         PgSqlType = pgSqlType;
+         Default = defaultValue;
+      }
+   }
+}

DynamicLinqPadPostgreSqlDriver.Tests/DynamicAssemblyGeneration/TestBase.cs

@@ -62,6 +62,19 @@ public void TestSimpleTypeArrayInputParameter<T>(string pgTypeName, T[] values)
          }
       }
 
+      public void TestInputParametersWithDefault(params InputParameterTestData[] testData)
+      {
+         var parameterDeclaration = string.Join(",", testData.Select(x => $"IN p_{x.Name} {x.PgSqlType}{(x.Default != null ? " DEFAULT " + x.Default : "")}"));
+         var returnTableDeclaration = string.Join(",", testData.Select(x => $"{x.Name} {x.PgSqlType}"));
+         var selectColumns = string.Join(",", testData.Select(x => $"p_{x.Name}"));
+
+         // This crashes with an NpgsqlException when the argument defaults are not handled separately. Npgsql seems to be unable to determine the type.
+         ArrangeDataContext(db =>
+         {
+            DBConnection.Execute($"CREATE FUNCTION public.echo_params({parameterDeclaration}) RETURNS TABLE({returnTableDeclaration}) AS 'SELECT {selectColumns};' LANGUAGE SQL;");
+         });
+      }
+
       public TypedDataContextBase ArrangeDataContext(Action<IDbConnection> prepareDatabase)
       {
          prepareDatabase(DBConnection);

DynamicLinqPadPostgreSqlDriver.Tests/DynamicAssemblyGeneration/TestPostgreSqlFunctions.cs

@@ -148,5 +148,20 @@ public void TestReturnJson()
          dynamic record = result[0];
          Assert.Equal("[[1,5],[99,100]]", record.get_json);
       }
+
+      [Fact]
+      public void TestSimpleParameterWithDefault()
+      {
+         TestInputParametersWithDefault(new InputParameterTestData("id", "integer", 0));
+      }
+
+      [Fact]
+      public void TestMultipleParametersWithDefault()
+      {
+         TestInputParametersWithDefault(
+            new InputParameterTestData("txt", "text", "'comma,separated,text'"),
+            new InputParameterTestData("id", "integer", 0),
+            new InputParameterTestData("arr", "int[]", "'{1,2}'"));
+      }
    }
 }

DynamicLinqPadPostgreSqlDriver.Tests/DynamicLinqPadPostgreSqlDriver.Tests.csproj

@@ -88,6 +88,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DynamicAssemblyGeneration\DatabaseFixture.cs" />
+    <Compile Include="DynamicAssemblyGeneration\InputParameterTestData.cs" />
     <Compile Include="DynamicAssemblyGeneration\TestBase.cs" />
     <Compile Include="DynamicAssemblyGeneration\TestPostgreSqlFunctions.cs" />
     <Compile Include="TestAdvancedTypeMappings.cs" />

DynamicLinqPadPostgreSqlDriver/FunctionData.cs

@@ -7,7 +7,7 @@ internal class FunctionData
       public int ArgumentCount { get; set; }
       public string[] ArgumentNames { get; set; }
       public int[] ArgumentTypeOids { get; set; }
-      public object[] ArgumentDefaults { get; set; }
+      public string ArgumentDefaults { get; set; }
       public bool IsMultiValueReturn { get; set; }
    }
 }

DynamicLinqPadPostgreSqlDriver/SQL/QueryFunctions.sql

@@ -4,7 +4,7 @@
 	, pronargs AS "ArgumentCount"
 	, proargnames AS "ArgumentNames"
 	, proargtypes AS "ArgumentTypeOids"
-	, proargdefaults AS "ArgumentDefaults"
+	, pg_get_expr(proargdefaults, 0) AS "ArgumentDefaults"
 	, proretset AS "IsMultiValueReturn"
 from 
     pg_proc