Support for selectable SPs.

Author: cincuranet

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/Query/ElementaryTests.cs

@@ -132,14 +132,45 @@ public async Task SelectSkip()
 		[Test]
 		public async Task SelectTopLevelAny()
 		{
-			if (!await EnsureVersion(new Version(3, 0, 0, 0)))
-				return;
-
 			await using (var db = await GetDbContext<SelectContext>())
 			{
 				Assert.DoesNotThrowAsync(() => db.Set<MonAttachment>().AnyAsync(x => x.AttachmentId != 0));
 			}
 		}
+
+		[Test]
+		public async Task SelectableProcedureSimple()
+		{
+			await using (var db = await GetDbContext<SelectContext>())
+			{
+				db.CreateProcedures();
+				var query = db.Set<SelectableProcedure>();
+				Assert.DoesNotThrowAsync(() => query.LoadAsync());
+			}
+		}
+
+		[Test]
+		public async Task SelectableProcedureWithTable()
+		{
+			await using (var db = await GetDbContext<SelectContext>())
+			{
+				db.CreateProcedures();
+				var query = db.Set<MonAttachment>()
+					.Where(x => db.Set<SelectableProcedure>().Select(y => y.Value).Contains(x.AttachmentId));
+				Assert.DoesNotThrowAsync(() => query.LoadAsync());
+			}
+		}
+
+		[Test]
+		public async Task SelectableProcedureWithParam()
+		{
+			await using (var db = await GetDbContext<SelectContext>())
+			{
+				db.CreateProcedures();
+				var query = db.SelectableProcedureWithParam(10).Where(x => x.Value > 10);
+				Assert.DoesNotThrowAsync(() => query.LoadAsync());
+			}
+		}
 	}
 
 	class SelectContext : FbTestDbContext
@@ -203,6 +234,18 @@ protected override void OnTestModelCreating(ModelBuilder modelBuilder)
 			monAttachmentConf.Property(x => x.AttachmentName).HasColumnName("MON$ATTACHMENT_NAME");
 			monAttachmentConf.Property(x => x.Timestamp).HasColumnName("MON$TIMESTAMP");
 			monAttachmentConf.ToTable("MON$ATTACHMENTS");
+
+			var selectableProcedureConf = modelBuilder.Entity<SelectableProcedure>();
+			selectableProcedureConf.HasNoKey();
+			selectableProcedureConf.Property(x => x.Value).HasColumnName("VAL");
+			selectableProcedureConf.ToFunction("SELECTABLE_PROCEDURE");
+
+			var selectableProcedureWithParamConf = modelBuilder.Entity<SelectableProcedureWithParam>();
+			selectableProcedureWithParamConf.HasNoKey();
+			selectableProcedureWithParamConf.Property(x => x.Value).HasColumnName("VAL");
+			modelBuilder.HasDbFunction(typeof(SelectContext).GetMethod(nameof(SelectableProcedureWithParam)),
+				c => c.HasName("SELECTABLE_PROCEDURE"));
+
 		}
 
 		protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
@@ -214,6 +257,22 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 		}
 
 		public string LastCommandText => _lastCommandTextInterceptor.LastCommandText;
+
+		public IQueryable<SelectableProcedureWithParam> SelectableProcedureWithParam(int i) => FromExpression(() => SelectableProcedureWithParam(i));
+
+		public void CreateProcedures()
+		{
+			Database.ExecuteSqlRaw(
+@"recreate procedure selectable_procedure (i int = 6)
+returns (val int)
+as
+begin
+	val = i;
+	suspend;
+	val = i + 1;
+	suspend;
+end");
+		}
 	}
 
 	class MonAttachment
@@ -222,4 +281,13 @@ class MonAttachment
 		public string AttachmentName { get; set; }
 		public DateTime Timestamp { get; set; }
 	}
+
+	class SelectableProcedure
+	{
+		public int Value { get; set; }
+	}
+	class SelectableProcedureWithParam
+	{
+		public int Value { get; set; }
+	}
 }

Provider/src/FirebirdSql.EntityFrameworkCore.Firebird/Query/Internal/FbQuerySqlGenerator.cs

@@ -244,6 +244,20 @@ protected override Expression VisitOrdering(OrderingExpression orderingExpressio
 			return orderingExpression;
 		}
 
+		protected override Expression VisitTableValuedFunction(TableValuedFunctionExpression tableValuedFunctionExpression)
+		{
+			Sql.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(tableValuedFunctionExpression.StoreFunction.Name));
+			if (tableValuedFunctionExpression.Arguments.Any())
+			{
+				Sql.Append("(");
+				GenerateList(tableValuedFunctionExpression.Arguments, e => Visit(e));
+				Sql.Append(")");
+			}
+			Sql.Append(AliasSeparator);
+			Sql.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(tableValuedFunctionExpression.Alias));
+			return tableValuedFunctionExpression;
+		}
+
 		public virtual Expression VisitSubstring(FbSubstringExpression substringExpression)
 		{
 			Sql.Append("SUBSTRING(");