some other tries

DapperLib · Jul 21, 2024 · a95b6ff · a95b6ff
1 parent 44e37d0
commit a95b6ff
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 17 deletions.
diff --git a/src/Dapper.AOT.Analyzers/CodeAnalysis/DapperInterceptorGenerator.cs b/src/Dapper.AOT.Analyzers/CodeAnalysis/DapperInterceptorGenerator.cs
@@ -312,6 +312,8 @@ internal void Generate(in GenerateState ctx)
                 resultType = grp.First().ResultType!;
                 sb.Append("// returns data: ").Append(resultType).NewLine();
             }
+
+            sb.Append($"throw new global::System.Exception(\"my test\");").NewLine();
 
             // assertions
             var commandTypeMode = flags & (OperationFlags.Text | OperationFlags.StoredProcedure | OperationFlags.TableDirect);

diff --git a/src/Dapper.AOT.Analyzers/InGeneration/DapperHelpers.cs b/src/Dapper.AOT.Analyzers/InGeneration/DapperHelpers.cs
@@ -12,6 +12,8 @@ public static void ConfigureDbStringDbParameter(
             global::System.Data.Common.DbParameter dbParameter,
             global::Dapper.DbString? dbString)
         {
+            throw new global::System.Exception("qwe");
+
             if (dbString is null)
             {
                 dbParameter.Value = global::System.DBNull.Value;

diff --git a/test/Dapper.AOT.Test.Integration/Dapper.AOT.Test.Integration.csproj b/test/Dapper.AOT.Test.Integration/Dapper.AOT.Test.Integration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net48</TargetFrameworks>
+        <TargetFrameworks>net8.0;net48</TargetFrameworks>
         <RootNamespace>Dapper.AOT.Test.Integration</RootNamespace>
         <DefineConstants>$(DefineConstants);DAPPERAOT_INTERNAL</DefineConstants>
     </PropertyGroup>

diff --git a/test/Dapper.AOT.Test.Integration/InterceptionExecutables/DbString.cs b/test/Dapper.AOT.Test.Integration/InterceptionExecutables/DbString.cs
@@ -18,19 +18,24 @@ public static Poco Execute(IDbConnection dbConnection)
 
         public static async Task<Poco> ExecuteAsync(IDbConnection dbConnection)
         {
-            var results = await dbConnection.QueryAsync<Poco>("select * from dbStringTestsTable where id = @Id and Name = @Name", new
-            {
-                Name = new DbString
-                {
-                    Value = "me testing!",
-                    IsFixedLength = false,
-                    Length = 11
-                },
-
-                Id = 1,
-            });
-
-            return results.First();
+            var a = GetValue();
+            return new Poco() { Id = 1, Name = a };
+
+            // var results = await dbConnection.QueryAsync<Poco>("select * from dbStringTestsTable where id = @Id and Name = @Name", new
+            // {
+            //     Name = new DbString
+            //     {
+            //         Value = "me testing!",
+            //         IsFixedLength = false,
+            //         Length = 11
+            //     },
+            //     
+            //     Id = 1,
+            // });
+            //
+            // return results.First();
         }
+
+        public static string GetValue() => "my-data";
     }
 }
diff --git a/test/Dapper.AOT.Test.Integration/Setup/InterceptedCodeExecutionTestsBase.cs b/test/Dapper.AOT.Test.Integration/Setup/InterceptedCodeExecutionTestsBase.cs
@@ -68,13 +68,40 @@ protected T BuildAndExecuteInterceptedUserCode<T>(
         Log($$"""
             Generated code:
             ---
-            {{results.GeneratedSources.First().SourceText}}
+            {{results.GeneratedSources.FirstOrDefault().SourceText}}
             ---
         """);
+
+        compilation = compilation.AddSyntaxTrees(RoslynTestHelpers.CreateSyntaxTree("""
+            namespace System.Runtime.CompilerServices
+            {
+                [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+                public sealed class InterceptsLocationAttribute(string path, int lineNumber, int columnNumber) : Attribute
+                {
+                }
+            }
+            """, "attribute.cs"));
+
+        compilation = compilation.AddSyntaxTrees(RoslynTestHelpers.CreateSyntaxTree($$"""
+                                                              using System;
+
+                                                              namespace Dapper.AOT
+                                                              {
+                                                                 public static class D
+                                                                 {
+                                                                     [System.Runtime.CompilerServices.InterceptsLocation(path: "Program.cs", lineNumber: 21, columnNumber: 21)]
+                                                                     internal static string GetValue()
+                                                                     {
+                                                                         return "changed-string";
+                                                                     }
+                                                                 }  
+
+                                                              }
+                                                             """, "intercepted!"));
 
         Assert.NotNull(compilation);
         Assert.True(errorCount == 0, $"Compilation errors: {diagnosticsOutputStringBuilder}");
-
+        
         var assembly = Compile(compilation!);
         var type = assembly.GetTypes().Single(t => t.FullName == $"InterceptionExecutables.{className}");
         var mainMethod = type.GetMethod(methodName, BindingFlags.Public | BindingFlags.Static);

diff --git a/test/Dapper.AOT.Test/TestCommon/RoslynTestHelpers.cs b/test/Dapper.AOT.Test/TestCommon/RoslynTestHelpers.cs
@@ -14,6 +14,7 @@
 using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
+using Docker.DotNet.Models;
 
 namespace Dapper.TestCommon;
 
@@ -44,7 +45,10 @@ public static class RoslynTestHelpers
         "RELEASE",
 #endif
     })
-    .WithFeatures([ DapperInterceptorGenerator.FeatureKeys.InterceptorsPreviewNamespacePair ]);
+    .WithFeatures([
+        new KeyValuePair<string, string>(DapperInterceptorGenerator.FeatureKeys.InterceptorsPreviewNamespaces, $"{DapperInterceptorGenerator.FeatureKeys.CodegenNamespace};InterceptionExecutables"),
+        new KeyValuePair<string, string>("LangVersion", "preview"),
+    ]);
 
     public static SyntaxTree CreateSyntaxTree(string source, string fileName)
         => CSharpSyntaxTree.ParseText(source, ParseOptionsLatestLangVer, encoding: Encoding.UTF8).WithFilePath(fileName);