Revert "Fix View Indexes not Scaffolded in Sql Server (#37607)" (#37634)

AndriySvyryd · web-flow · commit d816afe261d7 · 2026-02-05T18:25:32.000Z
This reverts commit 69eaf15.
diff --git a/src/EFCore.SqlServer/Scaffolding/Internal/SqlServerDatabaseModelFactory.cs b/src/EFCore.SqlServer/Scaffolding/Internal/SqlServerDatabaseModelFactory.cs
@@ -1039,13 +1039,6 @@ private void GetIndexes(DbConnection connection, IReadOnlyList<DatabaseTable> ta
     {
         using var command = connection.CreateCommand();
         var commandText = @"
-WITH [TablesAndViews] AS (
-    SELECT [object_id], [schema_id], [name], [type], [is_ms_shipped], [temporal_type] 
-    FROM [sys].[tables]
-    UNION ALL
-    SELECT [object_id], [schema_id], [name], [type], [is_ms_shipped], 0 AS [temporal_type] 
-    FROM [sys].[views]
-)
 SELECT
     SCHEMA_NAME([t].[schema_id]) AS [table_schema],
     [t].[name] AS [table_name],
@@ -1061,7 +1054,7 @@ FROM [sys].[views]
     [ic].[is_descending_key],
     [ic].[is_included_column]
 FROM [sys].[indexes] AS [i]
-JOIN [TablesAndViews] AS [t] ON [i].[object_id] = [t].[object_id]
+JOIN [sys].[tables] AS [t] ON [i].[object_id] = [t].[object_id]
 JOIN [sys].[index_columns] AS [ic] ON [i].[object_id] = [ic].[object_id] AND [i].[index_id] = [ic].[index_id]
 JOIN [sys].[columns] AS [c] ON [ic].[object_id] = [c].[object_id] AND [ic].[column_id] = [c].[column_id]
 WHERE [i].[is_hypothetical] = 0
diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/SqlServerDatabaseModelFactoryTest.cs
@@ -2012,74 +2012,6 @@ IndexProperty int
             },
             "DROP TABLE IndexTable;");
 
-    [ConditionalFact]
-    public void Create_indexes_on_views()
-    => Test(
-        @"
-CREATE TABLE dbo.BaseTable (
-    Id int NOT NULL,
-    Name int NOT NULL
-);
-
--- Use EXEC to ensure CREATE VIEW is the start of its own batch
-EXEC('
-    CREATE VIEW dbo.TestView
-    WITH SCHEMABINDING
-    AS
-    SELECT
-        Id,
-        Name,
-        COUNT_BIG(*) AS C
-    FROM dbo.BaseTable
-    GROUP BY Id, Name;
-');
-
-CREATE UNIQUE CLUSTERED INDEX IX_TestView_Id
-ON dbo.TestView (Id);
-",
-        [],
-        [],
-        (dbModel, scaffoldingFactory) =>
-        {
-            var view = dbModel.Tables.Single(t => t.Name == "TestView");
-
-            Assert.Single(view.Indexes);
-
-            var index = view.Indexes.Single();
-            Assert.True(index.IsUnique);
-            Assert.Collection(
-                index.Columns,
-                c => Assert.Equal("Id", c.Name));
-
-            var model = scaffoldingFactory.Create(dbModel, new ModelReverseEngineerOptions());
-
-            var viewEntity = model.GetEntityTypes()
-                .Single(e => e.Name == "TestView");
-
-            var properties = viewEntity.GetProperties().ToList();
-            Assert.Contains(properties, p => p.Name == "Id");
-            Assert.Contains(properties, p => p.Name == "Name");
-
-            Assert.Empty(viewEntity.GetKeys());
-
-            Assert.Collection(
-                viewEntity.GetIndexes(),
-                i =>
-                {
-                    Assert.True(i.IsUnique);
-                    Assert.Collection(
-                        i.Properties,
-                        p => Assert.Equal("Id", p.Name));
-                });
-
-            Assert.Empty(viewEntity.GetForeignKeys());
-            Assert.Empty(viewEntity.GetNavigations());
-            Assert.Empty(viewEntity.GetSkipNavigations());
-        },
-        @"
-DROP VIEW dbo.TestView;
-DROP TABLE dbo.BaseTable;");
-
     [ConditionalFact]
     public void Create_foreign_keys()
         => Test(
