Improvements to PostSharp.Samples.StoredProcedure.

Author: gfraiteur

Diff for: Framework/PostSharp.Samples.StoredProcedure/CreateDb.sql

@@ -1,3 +1,6 @@
+DROP TABLE IF EXISTS Speakers
+GO
+
 CREATE TABLE Speakers
 (
 Id int NOT NULL PRIMARY KEY,
@@ -19,6 +22,8 @@ INSERT INTO Speakers ( Id, Name, IsActive ) VALUES ( 4, 'Alexander Arvidsson', 0
 GO
 
 
+DROP PROCEDURE IF EXISTS SetSpeakerStatus
+GO
 
 CREATE PROCEDURE SetSpeakerStatus
 	@Id int,
@@ -29,8 +34,22 @@ AS
 
 GO
 
+DROP PROCEDURE IF EXISTS GetActiveSpeakers
+GO
+
+
 CREATE PROCEDURE GetActiveSpeakers
 AS
 	SELECT * FROM Speakers WHERE IsActive = 1;
 
+GO
+
+DROP PROCEDURE IF EXISTS GetSpeakers
+GO
+
+
+CREATE PROCEDURE GetSpeakers
+AS
+	SELECT * FROM Speakers;
+
 GO

Diff for: Framework/PostSharp.Samples.StoredProcedure/Program.cs

@@ -16,18 +16,17 @@ public static async Task Main(string[] args)
 
         SpeakerApi api = new SpeakerApi(connection);
 
-        api.SetSpeakerStatus(1, true);
-        api.SetSpeakerStatus(2, true);
 
-        // Try the async API.
-        foreach (var speaker in api.GetActiveSpeakers())
+        Console.WriteLine("All speakers:");
+        foreach (var speaker in api.GetSpeakers())
         {
           Console.WriteLine(speaker);
         }
 
-        await api.SetSpeakerStatusAsync(1, true);
-        await api.SetSpeakerStatusAsync(2, false);
+        Console.WriteLine("Disable speaker 1...");
+        await api.SetSpeakerStatusAsync(1, false);
 
+        Console.WriteLine("Active speakers:");
         foreach (var speaker in api.GetActiveSpeakers())
         {
           Console.WriteLine(speaker);

Diff for: Framework/PostSharp.Samples.StoredProcedure/SpeakerApi.cs

@@ -11,15 +11,25 @@ public SpeakerApi(SqlConnection connection, SqlTransaction transaction = null) :
     {
     }
 
+
+    // Sync methods.
     [MethodImpl(MethodImplOptions.InternalCall)]
     public extern IEnumerable<Speaker> GetActiveSpeakers();
 
+    [MethodImpl(MethodImplOptions.InternalCall)]
+    public extern IEnumerable<Speaker> GetSpeakers();
+
     [MethodImpl(MethodImplOptions.InternalCall)]
     public extern void SetSpeakerStatus(int id, bool isActive);
 
+
+    // Async variants of the same methods.
     [MethodImpl(MethodImplOptions.InternalCall)]
     public extern IAsyncEnumerable<Speaker> GetActiveSpeakersAsync();
 
+    [MethodImpl(MethodImplOptions.InternalCall)]
+    public extern IAsyncEnumerable<Speaker> GetSpeakersAsync();
+
     [MethodImpl(MethodImplOptions.InternalCall)]
     public extern Task SetSpeakerStatusAsync(int id, bool isActive);
   }

Diff for: Framework/PostSharp.Samples.StoredProcedure/StoredProcedureAttribute.cs

@@ -12,6 +12,7 @@
 namespace PostSharp.Samples.StoredProcedure
 {
   [PSerializable]
+  [MulticastAttributeUsage( MulticastTargets.Method, TargetMemberAttributes =MulticastAttributes.Instance)]
   internal class StoredProcedureAttribute : MethodInterceptionAspect
   {
     MethodInfo mapDataReaderMethod;
@@ -27,12 +28,19 @@ public override bool CompileTimeValidate(MethodBase method)
     {
       if (method.MethodImplementationFlags != MethodImplAttributes.InternalCall)
       {
-        // We transform only extern methods.
+        // We silently ignore any non-extern method.
         return false;
       }
 
       var methodInfo =  (MethodInfo) method;
 
+      // Validate the base type.
+      if (!typeof(BaseDbApi).IsAssignableFrom(methodInfo.DeclaringType))
+        {
+        Message.Write(method, SeverityType.Error, "SP003", "Cannot apply the [StoredProcedure] aspect to {0} because the method is not declared in a type derived from BaseDbApi.", method);
+        return false;
+      }
+
 
       // Validate the parameter types.
       var success = true;