Fix selecting referenced table for constraints (#1055).

Author: cincuranet

src/FirebirdSql.EntityFrameworkCore.Firebird/Scaffolding/Internal/FbDatabaseModelFactory.cs

@@ -68,7 +68,10 @@ public override DatabaseModel Create(DbConnection connection, DatabaseModelFacto
 			foreach (var table in tables)
 			{
 				table.Database = databaseModel;
-				databaseModel.Tables.Add(table);
+				if (tableFilter.Invoke(table))
+				{
+					databaseModel.Tables.Add(table);
+				}
 			}
 
 			return databaseModel;
@@ -87,9 +90,9 @@ private static string GetDefaultSchema(DbConnection connection)
 		return null;
 	}
 
-	private static Func<string, string, bool> GenerateTableFilter(IReadOnlyList<string> tables, IReadOnlyList<string> schemas)
+	private static Func<DatabaseTable, bool> GenerateTableFilter(IReadOnlyList<string> tables, IReadOnlyList<string> schemas)
 	{
-		return tables.Any() ? (s, t) => tables.Contains(t) : null;
+		return tables.Any() ? x => tables.Contains(x.Name) : _ => true;
 	}
 
 	private const string GetTablesQuery =
@@ -104,7 +107,7 @@ private static Func<string, string, bool> GenerateTableFilter(IReadOnlyList<stri
              ORDER BY
               r.RDB$RELATION_NAME";
 
-	private IEnumerable<DatabaseTable> GetTables(DbConnection connection, Func<string, string, bool> filter)
+	private IEnumerable<DatabaseTable> GetTables(DbConnection connection, Func<DatabaseTable, bool> filter)
 	{
 		using (var command = connection.CreateCommand())
 		{
@@ -126,10 +129,7 @@ private IEnumerable<DatabaseTable> GetTables(DbConnection connection, Func<strin
 					table.Name = name;
 					table.Comment = string.IsNullOrEmpty(comment) ? null : comment;
 
-					if (filter?.Invoke(table.Schema, table.Name) ?? true)
-					{
-						tables.Add(table);
-					}
+					tables.Add(table);
 				}
 			}
 
@@ -195,7 +195,7 @@ AND COALESCE(RF.RDB$SYSTEM_FLAG, 0) = 0
              ORDER BY
               RF.RDB$FIELD_POSITION;";
 
-	private void GetColumns(DbConnection connection, IReadOnlyList<DatabaseTable> tables, Func<string, string, bool> tableFilter)
+	private void GetColumns(DbConnection connection, IReadOnlyList<DatabaseTable> tables, Func<DatabaseTable, bool> tableFilter)
 	{
 		var identityType = MajorVersionNumber < 3 ? "null" : "rf.RDB$IDENTITY_TYPE";
 
@@ -318,7 +318,7 @@ GROUP BY
 	/// <remarks>
 	/// Primary keys are handled as in <see cref="GetConstraints"/>, not here
 	/// </remarks>
-	private void GetIndexes(DbConnection connection, IReadOnlyList<DatabaseTable> tables, Func<string, string, bool> tableFilter)
+	private void GetIndexes(DbConnection connection, IReadOnlyList<DatabaseTable> tables, Func<DatabaseTable, bool> tableFilter)
 	{
 		foreach (var table in tables)
 		{